From 3111ac4dce3c9edc2d468a003ef07130c6a3e987 Mon Sep 17 00:00:00 2001 From: Artem Sheremet Date: Mon, 20 Apr 2026 15:28:51 +0000 Subject: [PATCH] Use a standard color scheme and move ftplugin --- migrated/.vim/after/ftplugin/groovy.vim | 2 - migrated/.vim/after/ftplugin/java.vim | 2 - migrated/.vim/after/ftplugin/javascript.vim | 2 - migrated/.vim/after/ftplugin/json.vim | 2 - migrated/.vim/after/ftplugin/python.vim | 2 - migrated/.vim/after/ftplugin/ruby.vim | 2 - migrated/.vim/colors/mydark.vim | 61 --------------------- migrated/.vimrc | 22 ++++---- modules/home/common.nix | 4 -- 9 files changed, 12 insertions(+), 87 deletions(-) delete mode 100644 migrated/.vim/after/ftplugin/groovy.vim delete mode 100644 migrated/.vim/after/ftplugin/java.vim delete mode 100644 migrated/.vim/after/ftplugin/javascript.vim delete mode 100644 migrated/.vim/after/ftplugin/json.vim delete mode 100644 migrated/.vim/after/ftplugin/python.vim delete mode 100644 migrated/.vim/after/ftplugin/ruby.vim delete mode 100644 migrated/.vim/colors/mydark.vim diff --git a/migrated/.vim/after/ftplugin/groovy.vim b/migrated/.vim/after/ftplugin/groovy.vim deleted file mode 100644 index 5284eb6..0000000 --- a/migrated/.vim/after/ftplugin/groovy.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=4 -setlocal expandtab diff --git a/migrated/.vim/after/ftplugin/java.vim b/migrated/.vim/after/ftplugin/java.vim deleted file mode 100644 index 5284eb6..0000000 --- a/migrated/.vim/after/ftplugin/java.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=4 -setlocal expandtab diff --git a/migrated/.vim/after/ftplugin/javascript.vim b/migrated/.vim/after/ftplugin/javascript.vim deleted file mode 100644 index ad650e2..0000000 --- a/migrated/.vim/after/ftplugin/javascript.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=2 -setlocal expandtab diff --git a/migrated/.vim/after/ftplugin/json.vim b/migrated/.vim/after/ftplugin/json.vim deleted file mode 100644 index ad650e2..0000000 --- a/migrated/.vim/after/ftplugin/json.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=2 -setlocal expandtab diff --git a/migrated/.vim/after/ftplugin/python.vim b/migrated/.vim/after/ftplugin/python.vim deleted file mode 100644 index ad650e2..0000000 --- a/migrated/.vim/after/ftplugin/python.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=2 -setlocal expandtab diff --git a/migrated/.vim/after/ftplugin/ruby.vim b/migrated/.vim/after/ftplugin/ruby.vim deleted file mode 100644 index ad650e2..0000000 --- a/migrated/.vim/after/ftplugin/ruby.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal shiftwidth=2 -setlocal expandtab diff --git a/migrated/.vim/colors/mydark.vim b/migrated/.vim/colors/mydark.vim deleted file mode 100644 index a110bab..0000000 --- a/migrated/.vim/colors/mydark.vim +++ /dev/null @@ -1,61 +0,0 @@ -" My Dark GUI Theme -set background=dark -highlight clear -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let g:colors_name = "mydark" - -hi Normal guifg=grey guibg=#000010 gui=none ctermfg=grey ctermbg=none cterm=none -hi Cursor guibg=#FF00FF gui=none ctermbg=magenta -hi Visual guifg=white guibg=#101099 gui=none ctermfg=white ctermbg=blue cterm=none - -hi Comment guifg=#12AA12 gui=none ctermfg=darkgreen cterm=none - -hi Constant guifg=red gui=none ctermfg=red cterm=none -hi String guifg=red gui=none ctermfg=red cterm=none -hi Character guifg=red gui=none ctermfg=red cterm=none -hi Number guifg=yellow gui=none ctermfg=yellow cterm=none -hi Boolean guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none -hi Float guifg=yellow gui=none ctermfg=yellow cterm=none - -hi Identifier guifg=grey gui=none ctermfg=grey cterm=none -hi Function guifg=grey gui=none ctermfg=grey cterm=none - -hi Statement guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none -hi Conditional guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none -hi Repeat guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none -hi Label guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none -hi Operator guifg=#00FFFF gui=none ctermfg=cyan cterm=none -hi Keyword guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none -hi Exception guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none - -hi PreProc guifg=#008080 gui=none ctermfg=darkcyan cterm=none -hi Include guifg=#008080 gui=none ctermfg=darkcyan cterm=none -hi Define guifg=#008080 gui=none ctermfg=darkcyan cterm=none -hi Macro guifg=#008080 gui=none ctermfg=darkcyan cterm=none -hi PreCondit guifg=#008080 gui=none ctermfg=darkcyan cterm=none - -hi Type guifg=white gui=none ctermfg=white cterm=none -hi StorageClass guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none -hi Structure guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none -hi Typedef guifg=#FF8000 gui=none ctermfg=darkyellow cterm=none - -hi Pmenu ctermfg=black ctermbg=blue cterm=none guifg=black guibg=darkblue -hi PmenuSel ctermfg=white ctermbg=blue cterm=none guifg=white guibg=darkblue gui=none -hi PmenuSbar ctermbg=cyan guibg=cyan -hi PmenuThumb ctermfg=white guifg=white - -hi DiffAdd cterm=none ctermbg=darkgreen ctermfg=black -hi DiffChange cterm=none ctermbg=darkmagenta ctermfg=black -hi DiffText cterm=none ctermbg=cyan ctermfg=black -hi DiffDelete cterm=none ctermbg=darkred ctermfg=black - -hi NearColLimit gui=none guibg=yellow guifg=darkblue cterm=none ctermbg=yellow ctermfg=darkblue cterm=none cterm=none cterm=none cterm=none -hi OverColLimit gui=none guibg=red guifg=darkblue cterm=none ctermbg=red ctermfg=darkblue -hi ExtraWhitespace guibg=red ctermbg=red - -hi ColorColumn ctermbg=darkyellow diff --git a/migrated/.vimrc b/migrated/.vimrc index b046f56..a2adf31 100644 --- a/migrated/.vimrc +++ b/migrated/.vimrc @@ -42,7 +42,7 @@ set switchbuf+=usetab " Switch to existing tab; open a new tab for the new buf let mapleader="," set background=dark -colorscheme mydark +colorscheme torte " Configure plugins. @@ -66,22 +66,24 @@ let dart_format_on_save = 1 set viminfo='10,\"100,:100,n~/.viminfo " Line width limit hint. +set colorcolumn=80 augroup EditorWidth - " colorcolumn breaks copy from terminal, so we use this instead. au! - au BufEnter * highlight OverLength ctermbg=darkred - au BufEnter * match OverLength /\%81v./ - - au BufEnter *.go match OverLength /\%101v./ - au BufEnter *.java match OverLength /\%101v./ - - au BufEnter *.data match OverLength /$$/ - au BufEnter .vimrc match OverLength /$$/ + au BufEnter *.go setlocal colorcolumn=100 + au BufEnter *.java setlocal colorcolumn=100 + au BufEnter *.data setlocal colorcolumn=0 + au BufEnter .vimrc setlocal colorcolumn=0 augroup END " Custom filetypes. au BufNewFile,BufRead *.pi setf python +augroup FileTypeSettings + au! + au FileType groovy,java setlocal shiftwidth=4 expandtab + au FileType javascript,json,python,ruby setlocal shiftwidth=2 expandtab +augroup END + filetype indent off " Automatically insert the current comment leader after hitting in Insert mode. diff --git a/modules/home/common.nix b/modules/home/common.nix index fae54ef..7b0fd1a 100644 --- a/modules/home/common.nix +++ b/modules/home/common.nix @@ -45,10 +45,6 @@ ''; }; - # TODO: find a better way to configure colorscheme and filetype options. - home.file.".vim/colors".source = ./../../migrated/.vim/colors; - home.file.".vim/after/ftplugin".source = ./../../migrated/.vim/after/ftplugin; - programs.vim = { enable = true; plugins = with pkgs.vimPlugins; [