diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json deleted file mode 100644 index 4ccd0c0..0000000 --- a/.config/nvim/coc-settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "suggest.noselect": false, - "suggest.enablePreselect": true -} diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100755 index a6c79bd..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,84 +0,0 @@ -call plug#begin() - -Plug 'semanser/vim-outdated-plugins' - -" Show trailing whitespaces (this could also easily be achieved by settings, -" but the plugin is very neat) -Plug 'ntpeters/vim-better-whitespace' -Plug 'vim-airline/vim-airline' -Plug 'w0rp/ale' -Plug 'AndrewRadev/bufferize.vim' -Plug 'airblade/vim-gitgutter' -Plug 'hashivim/vim-terraform' -Plug 'tpope/vim-fugitive' -Plug 'tpope/vim-rhubarb' -Plug 'neoclide/coc.nvim', {'branch': 'release'} - - -"Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} -call plug#end() -"lua require'nvim-treesitter.configs'.setup{highlight={enable=true}} - -" Explicitely set legacy colorscheme to overwrite the new neovim default -" colorscheme until I find the time to configure colors properly -colorscheme vim -set notermguicolors - -" Add a set of commands that will make the 80th column of a document visible -highlight ColorColumn ctermbg=244 guibg=lightgrey -command Col let &colorcolumn=join(range(81,100),",") -command NoCol set colorcolumn= -Col - -" Disable line wrapping and use some Unicode characters to signify overflow -" instead. This might obviously cause problems. Also make tabs and -" non-breaking spaces visible. Tab visibility may be toggled using ShowTabs -" and HideTabs. -set nowrap -set list -set showbreak=❱ -set listchars=tab:╾─,extends:❱,precedes:❰,nbsp:␣ -command ShowTabs set listchars-=tab:\ \ -command HideTabs set listchars+=tab:\ \ -set sidescroll=1 -set sidescrolloff=8 -set scrolloff=2 - -" Tweak the neovim popup-style(pum) wildmenu for file selection. Slightly -" alter the behaviour when you press the tab key and rotate the axis of the -" arrow keys. https://vi.stackexchange.com/a/22628 -" FIXME: Pressing left during file selection moves up 2 levels in the dir -" tree. This is a problem with the wildmenu file selector in general. -set wildmode=longest:full,full -set wildcharm= -cnoremap wildmenumode() ? "\" : "\" -cnoremap wildmenumode() ? "\" : "\" -cnoremap wildmenumode() ? "\" : "\" -cnoremap wildmenumode() ? " \\" : "\" - -" Rebind Redo to U -nnoremap U - -" Classic -set number -set nofoldenable - -" If this is not set, neovim will hide tabs instead of closing them, resulting -" in errors if you close a file as tab in one vim instance and subsecuently -" try to open it in another instance. I have not checked if this has other -" side effects. -set nohidden - -" Yaml Indent -autocmd BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml foldmethod=indent -autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab indentkeys-=0# indentkeys-=<:> - -" Treat .hcl files like terraform files (used by hashivim/vim-terraform) -autocmd BufNewFile,BufReadPost *.hcl set filetype=terraform - -" Overwrite airblade/vim-gitgutter highlight colors. -" https://vi.stackexchange.com/questions/10897/how-do-i-customize-vimdiff-colors -hi DiffAdd gui=none guifg=NONE guibg=#bada9f -hi DiffChange gui=none guifg=NONE guibg=#e5d5ac -hi DiffDelete gui=bold guifg=#ff8080 guibg=#ffb0b0 -hi DiffText gui=none guifg=NONE guibg=#8cbee2 diff --git a/.dotfiles/.zsh_functions/autosource.sh b/.dotfiles/.zsh_functions/autosource.sh deleted file mode 100644 index c0b8128..0000000 --- a/.dotfiles/.zsh_functions/autosource.sh +++ /dev/null @@ -1,25 +0,0 @@ -function autosource { - local zsh_function_dirs zsh_function_dir - - # Check for required argument - if (( $# == 0 )); then - echo "autosource: basename of a file in ZSH_FUNC_PATH required" - echo "autosource: usage: autosource basename [arguments]" - return 1 - fi - - # Split ZSH_FUNC_PATH into an array - IFS=':' read -rA zsh_function_dirs <<< "${ZSH_FUNC_PATH}" - - # Search each dir for a matching .zsh file - for zsh_function_dir in "${zsh_function_dirs[@]}"; do - if [[ -r "${zsh_function_dir}/${1}.zsh" ]]; then - source "${zsh_function_dir}/${1}.zsh" "${@:2}" - return - fi - done - - echo "autosource: no ${1} in (${ZSH_FUNC_PATH})" - return 1 -} - diff --git a/.dotfiles/.zsh_functions/test.zsh b/.dotfiles/.zsh_functions/test.zsh deleted file mode 100644 index 541d587..0000000 --- a/.dotfiles/.zsh_functions/test.zsh +++ /dev/null @@ -1 +0,0 @@ -echo test autosourced diff --git a/.environment.d/dotfiles.env b/.environment.d/dotfiles.env deleted file mode 100644 index b35818b..0000000 --- a/.environment.d/dotfiles.env +++ /dev/null @@ -1,4 +0,0 @@ -DOTFILES_ACTIVE=true -DOTFILES_DIR="${HOME}/.dotfiles" -DOTFILES_GITDIR="${HOME}/.dotgit" -ZSH_FUNC_PATH="${HOME}/.zsh_functions:${DOTFILES_DIR}/.zsh_functions" diff --git a/.environment.d/nas.env b/.environment.d/nas.env deleted file mode 100644 index f4fdb3b..0000000 --- a/.environment.d/nas.env +++ /dev/null @@ -1,3 +0,0 @@ -NAS_IP="192.168.84.3" -NAS_USER="janolehuebner" -NAS_TOKEN_NAME_IN_STORE="sudo-lana" diff --git a/.environment.d/path.env b/.environment.d/path.env deleted file mode 100644 index 95d194a..0000000 --- a/.environment.d/path.env +++ /dev/null @@ -1,6 +0,0 @@ -# Add directories to PATH -export PATH="/opt/homebrew/bin:$PATH" -export PATH="$HOME/.local/bin:$PATH" -export PATH="$HOME/Library/Python/3.9/bin:$PATH" -export PATH="$HOME/.cargo/bin:$PATH" -export PATH="$HOME/bin:$PATH" diff --git a/.environment.d/youtube.env b/.environment.d/youtube.env deleted file mode 100644 index cf2c388..0000000 --- a/.environment.d/youtube.env +++ /dev/null @@ -1 +0,0 @@ -TUBE_TOKEN_NAME_IN_STORE="tube.lan" diff --git a/.zshrc b/.zshrc deleted file mode 100755 index 4f22c1e..0000000 --- a/.zshrc +++ /dev/null @@ -1,28 +0,0 @@ -# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi - -# Load a function that allows us to import other function definitions from -# the ZSH_FUNC_PATH without providing their exact location -source "$DOTFILES_DIR/.zsh_functions/autosource.sh" - -# Load the rest of the zsh configs in ~/.zshrc.d/ -setopt allexport -for file in ~/.zshrc.d/*.zsh(.N); do - source "$file" -done - -unset file -unsetopt allexport - -autosource youtube -autosource milan -autosource nas -autosource fuck - -test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" - - diff --git a/.zshrc.d/aliases.zsh b/.zshrc.d/aliases.zsh deleted file mode 100644 index 3c8e267..0000000 --- a/.zshrc.d/aliases.zsh +++ /dev/null @@ -1,12 +0,0 @@ -# Aliases -alias d="$HOME/dev/bin/mdl" -alias vim="nvim" -alias vi="nvim" -alias nano="nvim" -alias tg="terragrunt" -alias tf="tofu" -alias terraform="tofu" -alias pip="pip3" -alias python="python3" -alias cookies="open $HOME/Library/Containers/com.apple.Safari/Data/Library/Cookies/" -alias dotfiles="git --work-tree=$HOME --git-dir=$HOME/.dotgit " diff --git a/.zshrc.d/install_dotfiles.zsh b/.zshrc.d/install_dotfiles.zsh deleted file mode 100644 index 91ae7b6..0000000 --- a/.zshrc.d/install_dotfiles.zsh +++ /dev/null @@ -1,22 +0,0 @@ -install_dotfiles () { - echo "Installing stuff..." - # vim-plug - if ! [[ -f ~/.local/share/nvim/site/autoload/plug.vim ]]; then - echo "Dotfiles: Downloading vim-plug..." - if curl \ - --fail \ - --location \ - --retry 5 \ - --retry-delay 1 \ - --create-dirs \ - --progress-bar \ - --output ~/.local/share/nvim/site/autoload/plug.vim \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - then - echo "Dotfiles: Done" - else - echo "Dotfiles: Error downloading vim-plug" - dotfiles_install_error="yes" - fi - fi -} diff --git a/.zshrc.d/p10k.zsh b/.zshrc.d/p10k.zsh deleted file mode 100644 index 30b7277..0000000 --- a/.zshrc.d/p10k.zsh +++ /dev/null @@ -1,112 +0,0 @@ -# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi - -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH - -# Path to your oh-my-zsh installation. -export ZSH="$HOME/.oh-my-zsh" - -#------ -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="powerlevel10k/powerlevel10k" - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment one of the following lines to change the auto-update behavior -# zstyle ':omz:update' mode disabled # disable automatic updates -# zstyle ':omz:update' mode auto # update automatically without asking -# zstyle ':omz:update' mode reminder # just remind me to update when it's time - -# Uncomment the following line to change how often to auto-update (in days). -# zstyle ':omz:update' frequency 13 - -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# You can also set it to another string to have that shown instead of the default red dots. -# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" -# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? -# Standard plugins can be found in $ZSH/plugins/ -# Custom plugins may be added to $ZSH_CUSTOM/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=(git) - -source $ZSH/oh-my-zsh.sh - -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh