artem/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a standard color scheme and move ftplugin

Browse Source
This commit is contained in:
Artem Sheremet
2026-04-20 15:28:51 +00:00
parent 5212277efe
commit 3111ac4dce
9 changed files with 12 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
migrated/.vim/after/ftplugin/groovy.vim
View File

@@ -1,2 +0,0 @@
setlocal shiftwidth=4
setlocal expandtab

2
migrated/.vim/after/ftplugin/java.vim
View File

@@ -1,2 +0,0 @@
setlocal shiftwidth=4
setlocal expandtab

2
migrated/.vim/after/ftplugin/javascript.vim
View File

@@ -1,2 +0,0 @@
setlocal shiftwidth=2
setlocal expandtab

2
migrated/.vim/after/ftplugin/json.vim
View File

@@ -1,2 +0,0 @@
setlocal shiftwidth=2
setlocal expandtab

2
migrated/.vim/after/ftplugin/python.vim
View File

@@ -1,2 +0,0 @@
setlocal shiftwidth=2
setlocal expandtab

2
migrated/.vim/after/ftplugin/ruby.vim
View File

@@ -1,2 +0,0 @@
setlocal shiftwidth=2
setlocal expandtab

61
migrated/.vim/colors/mydark.vim
View File

@@ -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

22
migrated/.vimrc
View File

@@ -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 <Enter> in Insert mode.

4
modules/home/common.nix
View File

@@ -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; [