diff --git a/flake.nix b/flake.nix index 189d340..bc06b5a 100644 --- a/flake.nix +++ b/flake.nix @@ -245,7 +245,7 @@ # Internet ungoogled-chromium # games - osu-lazer-bin + osu-lazer-bin pcsx2 # emulation # (unstable.bottles.override {removeWarningPopup = true;}) # devel @@ -363,10 +363,9 @@ }; in with pkgs.unstable.vimPlugins; [ - gruvbox rainbow literate-vim + gruvbox rainbow literate-vim undotree ]; vim.extraConfig = '' - # coyote-home-manager-programs-vim-vimrc set nocompatible set encoding=utf-8 set backspace=indent,eol,start @@ -374,7 +373,7 @@ set mouse=a set history=1000 set updatetime=300 - + syntax on set ruler set showcmd @@ -384,7 +383,7 @@ set wildmode=longest,list,full set ttyfast set lazyredraw - + filetype plugin indent on set autoindent set smartindent @@ -393,7 +392,7 @@ set tabstop=4 set shiftwidth=4 set softtabstop=4 - + set hlsearch set incsearch set ignorecase @@ -404,7 +403,6 @@ colorscheme gruvbox let g:terminal_ansi_colors = ['#282828', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2'] let g:rainbow_active = 1 - ''; # coyote-home-manager-programs-fastfetch diff --git a/nixos.html b/nixos.html index 38b1051..6d6ea16 100644 --- a/nixos.html +++ b/nixos.html @@ -796,7 +796,7 @@ home.packages = with pkgs; [ # Internet ungoogled-chromium # games - osu-lazer-bin + osu-lazer-bin pcsx2 # emulation # (unstable.bottles.override {removeWarningPopup = true;}) # devel @@ -904,65 +904,54 @@ vim.plugins = let }; in with pkgs.unstable.vimPlugins; [ - gruvbox rainbow literate-vim + gruvbox rainbow literate-vim undotree ]; -

.vimrc moment... +

.vimrc moment...

+

+

there's really not much, starting with bog-standard Vimscript for sensible +options,

{coyote-home-manager-programs-vim 8} +=
 vim.extraConfig = ''
-  {coyote-home-manager-programs-vim-vimrc, 8}
-'';
-
+ set nocompatible + set encoding=utf-8 + set backspace=indent,eol,start + set clipboard=unnamedplus + set mouse=a + set history=1000 + set updatetime=300 + syntax on + set ruler + set showcmd + set showmode + set laststatus=1 + set wildmenu + set wildmode=longest,list,full + set ttyfast + set lazyredraw + filetype plugin indent on + set autoindent + set smartindent + set expandtab + set smarttab + set tabstop=4 + set shiftwidth=4 + set softtabstop=4 -
-

there's really not much, starting with bog-standard Vimscript for sensible -options, -

- -
-{coyote-home-manager-programs-vim-vimrc 8} -
-set nocompatible
-set encoding=utf-8
-set backspace=indent,eol,start
-set clipboard=unnamedplus
-set mouse=a
-set history=1000
-set updatetime=300
-
-syntax on
-set ruler
-set showcmd
-set showmode
-set laststatus=1
-set wildmenu
-set wildmode=longest,list,full
-set ttyfast
-set lazyredraw
-
-filetype plugin indent on
-set autoindent
-set smartindent
-set expandtab
-set smarttab
-set tabstop=4
-set shiftwidth=4
-set softtabstop=4
-
-set hlsearch
-set incsearch
-set ignorecase
-set smartcase
+  set hlsearch
+  set incsearch
+  set ignorecase
+  set smartcase
 
@@ -973,9 +962,9 @@ set smartcase

-{coyote-home-manager-programs-vim-vimrc 8} += +{coyote-home-manager-programs-vim 8} +=
-inoremap <C-l> 位
+  inoremap <C-l> 位
 
@@ -985,12 +974,12 @@ inoremap <C-l> 位

-{coyote-home-manager-programs-vim-vimrc 8} += +{coyote-home-manager-programs-vim 8} +=
-set termguicolors
-set background=dark
-colorscheme gruvbox
-let g:terminal_ansi_colors = ['#282828', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2']
+  set termguicolors
+  set background=dark
+  colorscheme gruvbox
+  let g:terminal_ansi_colors = ['#282828', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2']
 
@@ -1000,9 +989,10 @@ let g:terminal_ansi_colors = ['#282828', '#cc241d', '#98971a', '#d79921', '#4585

-{coyote-home-manager-programs-vim-vimrc 8} += +{coyote-home-manager-programs-vim 8} +=
-let g:rainbow_active = 1
+  let g:rainbow_active = 1
+'';
 
diff --git a/nixos.lit b/nixos.lit index f00bc68..38b4b75 100644 --- a/nixos.lit +++ b/nixos.lit @@ -547,7 +547,7 @@ home.packages = with pkgs; [ # Internet ungoogled-chromium # games - osu-lazer-bin + osu-lazer-bin pcsx2 # emulation # (unstable.bottles.override {removeWarningPopup = true;}) # devel @@ -637,75 +637,71 @@ vim.plugins = let }; in with pkgs.unstable.vimPlugins; [ - gruvbox rainbow literate-vim + gruvbox rainbow literate-vim undotree ]; --- -`.vimrc` moment... - ---- coyote-home-manager-programs-vim += -vim.extraConfig = '' - @{coyote-home-manager-programs-vim-vimrc} -''; ---- +`.vimrc` moment...

there's really not much, starting with bog-standard Vimscript for sensible options, ---- coyote-home-manager-programs-vim-vimrc -set nocompatible -set encoding=utf-8 -set backspace=indent,eol,start -set clipboard=unnamedplus -set mouse=a -set history=1000 -set updatetime=300 +--- coyote-home-manager-programs-vim += +vim.extraConfig = '' + set nocompatible + set encoding=utf-8 + set backspace=indent,eol,start + set clipboard=unnamedplus + set mouse=a + set history=1000 + set updatetime=300 -syntax on -set ruler -set showcmd -set showmode -set laststatus=1 -set wildmenu -set wildmode=longest,list,full -set ttyfast -set lazyredraw + syntax on + set ruler + set showcmd + set showmode + set laststatus=1 + set wildmenu + set wildmode=longest,list,full + set ttyfast + set lazyredraw -filetype plugin indent on -set autoindent -set smartindent -set expandtab -set smarttab -set tabstop=4 -set shiftwidth=4 -set softtabstop=4 + filetype plugin indent on + set autoindent + set smartindent + set expandtab + set smarttab + set tabstop=4 + set shiftwidth=4 + set softtabstop=4 -set hlsearch -set incsearch -set ignorecase -set smartcase + set hlsearch + set incsearch + set ignorecase + set smartcase --- and you gotta map a keybind to output lambda to live out that Lisp/Scheme vibe 馃槑 (i barely can even code in them) ---- coyote-home-manager-programs-vim-vimrc += -inoremap 位 +--- coyote-home-manager-programs-vim += + inoremap 位 --- i love Gruvbox... (hi Vimjoyer) ---- coyote-home-manager-programs-vim-vimrc += -set termguicolors -set background=dark -colorscheme gruvbox -let g:terminal_ansi_colors = ['#282828', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2'] +--- coyote-home-manager-programs-vim += + set termguicolors + set background=dark + colorscheme gruvbox + let g:terminal_ansi_colors = ['#282828', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2'] --- finally, plugin configs! there's only one... ---- coyote-home-manager-programs-vim-vimrc += -let g:rainbow_active = 1 +--- coyote-home-manager-programs-vim += + let g:rainbow_active = 1 +''; --- this part is kinda... bodgy, but, it's the only way i've found to consistently