From f5d3189de7f0ed107a81d62bf9d513d179cc83bd Mon Sep 17 00:00:00 2001 From: Ryan Reed Date: Sat, 14 May 2022 10:07:37 -0400 Subject: [PATCH] Moving VIM to XDG location --- {dot_vim => dot_config/vim}/README.md | 0 .../vim}/UltiSnips/python.snippets | 0 .../vim}/after/ftplugin/gitcommit.vim | 0 .../vim}/after/ftplugin/go.vim | 0 .../vim}/after/ftplugin/json.vim | 0 .../vim}/after/ftplugin/make.vim | 0 .../vim}/after/ftplugin/markdown.vim | 0 .../vim}/after/ftplugin/php.vim | 0 .../vim}/after/ftplugin/python.vim | 0 .../vim}/after/ftplugin/yaml.vim | 0 .../vim}/autoload/pathogen.vim | 0 dot_config/vim/spell/.keep | 0 {dot_vim => dot_config/vim}/vimrc | 27 +++++++++++++++++++ dot_zshenv | 3 +++ 14 files changed, 30 insertions(+) rename {dot_vim => dot_config/vim}/README.md (100%) rename {dot_vim => dot_config/vim}/UltiSnips/python.snippets (100%) rename {dot_vim => dot_config/vim}/after/ftplugin/gitcommit.vim (100%) rename {dot_vim => dot_config/vim}/after/ftplugin/go.vim (100%) rename {dot_vim => dot_config/vim}/after/ftplugin/json.vim (100%) rename {dot_vim => dot_config/vim}/after/ftplugin/make.vim (100%) rename {dot_vim => dot_config/vim}/after/ftplugin/markdown.vim (100%) rename {dot_vim => dot_config/vim}/after/ftplugin/php.vim (100%) rename {dot_vim => dot_config/vim}/after/ftplugin/python.vim (100%) rename {dot_vim => dot_config/vim}/after/ftplugin/yaml.vim (100%) rename {dot_vim => dot_config/vim}/autoload/pathogen.vim (100%) create mode 100644 dot_config/vim/spell/.keep rename {dot_vim => dot_config/vim}/vimrc (89%) diff --git a/dot_vim/README.md b/dot_config/vim/README.md similarity index 100% rename from dot_vim/README.md rename to dot_config/vim/README.md diff --git a/dot_vim/UltiSnips/python.snippets b/dot_config/vim/UltiSnips/python.snippets similarity index 100% rename from dot_vim/UltiSnips/python.snippets rename to dot_config/vim/UltiSnips/python.snippets diff --git a/dot_vim/after/ftplugin/gitcommit.vim b/dot_config/vim/after/ftplugin/gitcommit.vim similarity index 100% rename from dot_vim/after/ftplugin/gitcommit.vim rename to dot_config/vim/after/ftplugin/gitcommit.vim diff --git a/dot_vim/after/ftplugin/go.vim b/dot_config/vim/after/ftplugin/go.vim similarity index 100% rename from dot_vim/after/ftplugin/go.vim rename to dot_config/vim/after/ftplugin/go.vim diff --git a/dot_vim/after/ftplugin/json.vim b/dot_config/vim/after/ftplugin/json.vim similarity index 100% rename from dot_vim/after/ftplugin/json.vim rename to dot_config/vim/after/ftplugin/json.vim diff --git a/dot_vim/after/ftplugin/make.vim b/dot_config/vim/after/ftplugin/make.vim similarity index 100% rename from dot_vim/after/ftplugin/make.vim rename to dot_config/vim/after/ftplugin/make.vim diff --git a/dot_vim/after/ftplugin/markdown.vim b/dot_config/vim/after/ftplugin/markdown.vim similarity index 100% rename from dot_vim/after/ftplugin/markdown.vim rename to dot_config/vim/after/ftplugin/markdown.vim diff --git a/dot_vim/after/ftplugin/php.vim b/dot_config/vim/after/ftplugin/php.vim similarity index 100% rename from dot_vim/after/ftplugin/php.vim rename to dot_config/vim/after/ftplugin/php.vim diff --git a/dot_vim/after/ftplugin/python.vim b/dot_config/vim/after/ftplugin/python.vim similarity index 100% rename from dot_vim/after/ftplugin/python.vim rename to dot_config/vim/after/ftplugin/python.vim diff --git a/dot_vim/after/ftplugin/yaml.vim b/dot_config/vim/after/ftplugin/yaml.vim similarity index 100% rename from dot_vim/after/ftplugin/yaml.vim rename to dot_config/vim/after/ftplugin/yaml.vim diff --git a/dot_vim/autoload/pathogen.vim b/dot_config/vim/autoload/pathogen.vim similarity index 100% rename from dot_vim/autoload/pathogen.vim rename to dot_config/vim/autoload/pathogen.vim diff --git a/dot_config/vim/spell/.keep b/dot_config/vim/spell/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_vim/vimrc b/dot_config/vim/vimrc similarity index 89% rename from dot_vim/vimrc rename to dot_config/vim/vimrc index b3f2404..19ef397 100644 --- a/dot_vim/vimrc +++ b/dot_config/vim/vimrc @@ -3,6 +3,33 @@ " :w ++ff=unix """""""" +" 00 - XDG Support + if empty($MYVIMRC) | let $MYVIMRC = expand(':p') | endif + + if empty($XDG_CACHE_HOME) | let $XDG_CACHE_HOME = $HOME."/.cache" | endif + if empty($XDG_CONFIG_HOME) | let $XDG_CONFIG_HOME = $HOME."/.config" | endif + if empty($XDG_DATA_HOME) | let $XDG_DATA_HOME = $HOME."/.local/share" | endif + if empty($XDG_STATE_HOME) | let $XDG_STATE_HOME = $HOME."/.local/state" | endif + + set runtimepath^=$XDG_CONFIG_HOME/vim + set runtimepath+=$XDG_DATA_HOME/vim + set runtimepath+=$XDG_CONFIG_HOME/vim/after + + set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim + set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after + + let g:netrw_home = $XDG_DATA_HOME."/vim" + call mkdir($XDG_DATA_HOME."/vim/spell", 'p', 0700) + + set backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p', 0700) + set directory=$XDG_STATE_HOME/vim/swap | call mkdir(&directory, 'p', 0700) + set undodir=$XDG_STATE_HOME/vim/undo | call mkdir(&undodir, 'p', 0700) + set viewdir=$XDG_STATE_HOME/vim/view | call mkdir(&viewdir, 'p', 0700) + + if !has('nvim') " Neovim has its own special location + set viminfofile=$XDG_STATE_HOME/vim/viminfo + endif + " 01 - General filetype plugin on " Enable filetype-specific plugins diff --git a/dot_zshenv b/dot_zshenv index 56b3647..1bd967e 100644 --- a/dot_zshenv +++ b/dot_zshenv @@ -8,6 +8,9 @@ export XDG_STATE_HOME="$HOME"/.local/state export ZDOTDIR="$XDG_CONFIG_HOME"/zsh export HISTFILE="$XDG_STATE_HOME"/zsh/history +# Define other XDG location +export VIMINIT="set nocp | source ${XDG_CONFIG_HOME:-$HOME/.config}/vim/vimrc" + # Taken from https://github.com/thoughtbot/dotfiles/blob/master/zshenv