diff --git a/README.md b/README.md index 4acb8eb..80e6894 100644 --- a/README.md +++ b/README.md @@ -19,26 +19,17 @@ │   ├── helix │   │   ├── helix-languages.toml │   │   └── helix.toml - │   ├── nvim - │   │   ├── init.lua - │   │   ├── LICENSE - │   │   ├── lua - │   │   │   ├── config - │   │   │   │   ├── autocmds.lua - │   │   │   │   ├── keymaps.lua - │   │   │   │   ├── lazy.lua - │   │   │   │   └── options.lua - │   │   │   └── plugins - │   │   │   └── example.lua - │   │   ├── README.md - │   │   └── stylua.toml │   └── vim - │   ├── vim-lisp - │   ├── vimrc - │   ├── vim-tab2 - │   ├── vim-tab4 - │   └── vim-tabs - └── home.nix + │   └── langs + │   ├── lisp.vim + │   ├── tab2.vim + │   ├── tab4.vim + │   └── tabs.vim + ├── dotfiles.nix + ├── home.nix + └── programs + ├── neovim.nix + └── vim.nix -13 directories, 27 files +11 directories, 20 files ``` diff --git a/users/coyote/dotfiles.nix b/users/coyote/dotfiles.nix index 6d77215..d7300fe 100644 --- a/users/coyote/dotfiles.nix +++ b/users/coyote/dotfiles.nix @@ -17,9 +17,9 @@ in { ".config/helix/languages.toml".source = ./dotfiles/helix/helix-languages.toml; } - (mkVim ./dotfiles/vim/langs/tab2.vim ["javascript" "typescript" "html" "css" "json" "nix" "vim"]) - (mkVim ./dotfiles/vim/langs/tab4.vim ["python" "rust" "java" "lua" "c" "cpp" "h" "hpp"]) - (mkVim ./dotfiles/vim/langs/tabs.vim ["go" "make"]) - (mkVim ./dotfiles/vim/langs/lisp.vim ["lisp" "scheme" "clojure" "racket"]) + (mkVim ./dotfiles/vim/tab2.vim ["javascript" "typescript" "html" "css" "json" "nix" "vim"]) + (mkVim ./dotfiles/vim/tab4.vim ["python" "rust" "java" "lua" "c" "cpp" "h" "hpp"]) + (mkVim ./dotfiles/vim/tabs.vim ["go" "make"]) + (mkVim ./dotfiles/vim/lisp.vim ["lisp" "scheme" "clojure" "racket"]) ]; } diff --git a/users/coyote/dotfiles/vim/langs/lisp.vim b/users/coyote/dotfiles/vim/lisp.vim similarity index 100% rename from users/coyote/dotfiles/vim/langs/lisp.vim rename to users/coyote/dotfiles/vim/lisp.vim diff --git a/users/coyote/dotfiles/vim/langs/tab2.vim b/users/coyote/dotfiles/vim/tab2.vim similarity index 100% rename from users/coyote/dotfiles/vim/langs/tab2.vim rename to users/coyote/dotfiles/vim/tab2.vim diff --git a/users/coyote/dotfiles/vim/langs/tab4.vim b/users/coyote/dotfiles/vim/tab4.vim similarity index 100% rename from users/coyote/dotfiles/vim/langs/tab4.vim rename to users/coyote/dotfiles/vim/tab4.vim diff --git a/users/coyote/dotfiles/vim/langs/tabs.vim b/users/coyote/dotfiles/vim/tabs.vim similarity index 100% rename from users/coyote/dotfiles/vim/langs/tabs.vim rename to users/coyote/dotfiles/vim/tabs.vim diff --git a/users/coyote/home.nix b/users/coyote/home.nix index 26b8d1c..ff052fb 100644 --- a/users/coyote/home.nix +++ b/users/coyote/home.nix @@ -1,6 +1,5 @@ { pkgs, - lib, ... }: let programsDir = ./programs; diff --git a/users/coyote/programs/vim.nix b/users/coyote/programs/vim.nix index b76c10e..ba6a321 100644 --- a/users/coyote/programs/vim.nix +++ b/users/coyote/programs/vim.nix @@ -1,6 +1,5 @@ { pkgs, - lib, ... }: { programs.vim = { @@ -8,17 +7,13 @@ packageConfigurable = pkgs.unstable.vim-full; plugins = with pkgs.unstable.vimPlugins; [ gruvbox - vim-surround - vim-commentary - vim-easymotion - vim-visual-multi - fzf-vim - vim-signify - vim-airline rainbow + vim-indent-guides ]; defaultEditor = true; extraConfig = '' + let g:terminal_ansi_colors = ['#282828', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2'] + set nocompatible set encoding=utf-8 set backspace=indent,eol,start @@ -31,7 +26,7 @@ set ruler set showcmd set showmode - set laststatus=2 + set laststatus=3 set wildmenu set wildmode=longest,list,full set ttyfast @@ -50,50 +45,18 @@ set incsearch set ignorecase set smartcase - set showmatch " gruvbox set termguicolors set background=dark colorscheme gruvbox - " airline - let g:airline_powerline_fonts = 1 - let g:airline_theme = 'gruvbox' - let g:airline_section_a = ''' - let g:airline_section_y = ''' - - let g:airline#extensions#tabline#enabled = 1 - let g:airline#extensions#whitespace#enabled = 1 - let g:airline#extensions#signify#enabled = 1 - let g:airline#extensions#term#enabled = 0 - - let g:airline#extensions#tabline#formatter = 'unique_tail_improved' - let g:airline#extensions#tabline#show_splits = 0 - let g:airline#extensions#tabline#show_tabs = 0 - - let g:airline#extensions#empty_sections = 1 - " rainbow let g:rainbow_active = 1 - " fzf - let $COLORTERM = 'truecolor' - let $FZF_DEFAULT_OPTS='--reverse --info=inline' - let g:fzf_colors = {} - let g:fzf_colors["fg"] = ["fg", "Normal"] - let g:fzf_colors["bg"] = ["bg", "Normal"] - let g:fzf_colors["hl"] = ["fg", "Comment"] - let g:fzf_colors["fg+"] = ["fg", "CursorLine", "CursorColumn", "Normal"] - let g:fzf_colors["bg+"] = ["bg", "CursorLine", "CursorColumn"] - let g:fzf_colors["hl+"] = ["fg", "Statement"] - let g:fzf_colors["info"] = ["fg", "PreProc"] - let g:fzf_colors["border"] = ["fg", "Ignore"] - let g:fzf_colors["prompt"] = ["fg", "Conditional"] - let g:fzf_colors["pointer"] = ["fg", "Exception"] - let g:fzf_colors["marker"] = ["fg", "Keyword"] - let g:fzf_colors["spinner"] = ["fg", "Label"] - let g:fzf_colors["header"] = ["fg", "Comment"] + " vim-indent-guides + let g:indent_guides_enable_on_vim_startup = 1 + let g:indent_guides_start_level = 2 ''; }; }