vim: Split out

hm/dev/c.nix

@@ -28,7 +28,7 @@
     programs.bash.shellAliases = {
       gdb = "gdb -x ${config.xdg.configHome}/gdbinit";
     };
-    programs.nixvim.extraPlugins = [ pkgs.vimPlugins.nvim-dap ]; # Debug Adapter Protocol client
+    programs.nixvim.plugins.dap.enable = true; # Debug Adapter Protocol client
     xdg.configFile = {
       "ccache.conf" = {
         text = "ccache_dir = ${config.xdg.cacheHome}/ccache";

hm/dev/common.nix

@@ -51,5 +51,18 @@
       yosys
       gtkwave
     ];
+
+    programs.nixvim.plugins.lsp.servers = {
+      ansiblels.enable = config.frogeye.dev.ansible; # Ansible
+      bashls.enable = true; # Bash
+      jsonls.enable = true; # JSON
+      lua-ls.enable = true; # Lua (for Neovim debugging)
+      perlpls.enable = config.frogeye.dev.perl; # Perl
+      phpactor.enable = config.frogeye.dev.php; # PHP
+      rnix-lsp.enable = true; # Nix
+      # TODO Something for SQL. sqls is deprecated, sqlls is not in Nixpkgs. Probably needs a DB connection configured anyways?
+      yamlls.enable = true; # YAML
+      # TODO Check out none-ls
+    };
   };
 }

hm/gaming/default.nix

@@ -11,6 +11,7 @@
         # TODO factorio
 
         steam # Common pitfall: https://github.com/NixOS/nixpkgs/issues/86506#issuecomment-623746883
+        itch
       ];
       sessionVariables = {
         BOOT9_PATH = "${config.xdg.dataHome}/citra-emu/sysdata/boot9.bin";

hm/vim/code.nix

@@ -0,0 +1,72 @@
+{ pkgs, lib, config, ... }:
+let
+  # UPST
+  vim-shot-f = pkgs.vimUtils.buildVimPlugin {
+    pname = "vim-shot-f";
+    version = "2016-02-05";
+    src = pkgs.fetchFromGitHub {
+      owner = "deris";
+      repo = "vim-shot-f";
+      rev = "eea71d2a1038aa87fe175de9150b39dc155e5e7f";
+      sha256 = "iAPvIs/lhW+w5kFTZKaY97D/kfCGtqKrJVFvZ8cHu+c=";
+    };
+    meta.homepage = "https://github.com/deris/vim-shot-f";
+  };
+  quick-scope = pkgs.vimUtils.buildVimPlugin rec {
+    pname = "quick-scope";
+    version = "2.6.1";
+    src = pkgs.fetchFromGitHub {
+      owner = "unblevable";
+      repo = "quick-scope";
+      rev = "v${version}";
+      sha256 = "TcA4jZIdnQd06V+JrXGiCMr0Yhm9gB6OMiTSdzMt/Qw=";
+    };
+    meta.homepage = "https://github.com/unblevable/quick-scope";
+  };
+in
+{
+  config = {
+    programs.nixvim = {
+      extraPlugins = with pkgs.vimPlugins; [
+        # f/F mode
+        vim-shot-f # Highlight relevant characters for f/F/t/T modes
+        quick-scope # Highlight relevant characters for f/F modes one per word but always
+      ];
+      options = {
+        # From https://www.hillelwayne.com/post/intermediate-vim/
+        scrolloff = 10;
+        lazyredraw = true; # Do not redraw screen in the middle of a macro. Makes them complete faster.
+        cursorcolumn = true;
+
+        # From http://stackoverflow.com/a/5004785/2766106
+        list = true;
+        listchars = "tab:╾╌,trail:·,extends:↦,precedes:↤,nbsp:_";
+        showbreak = "↪";
+      };
+      plugins = {
+        # Catches attention when cursor changed position
+        specs = {
+          enable = true;
+          min_jump = 5;
+          fader = { builtin = "pulse_fader"; };
+          resizer = { builtin = "shrink_resizer"; };
+        };
+
+        # Treesitter
+        treesitter = {
+          # Allows for better syntax highlighting
+          enable = true;
+          incrementalSelection = {
+            enable = true;
+          };
+          # indent = true; # Not very working last time I tried apparently
+        };
+        # TODO Investigate https://github.com/nvim-treesitter/nvim-treesitter-textobjects
+        indent-blankline.enable = true; # Show indent guides
+        rainbow-delimiters.enable = true; # Randomly colore paired brackets
+
+        nvim-colorizer.enable = true; # Display colors of color-codes
+      };
+    };
+  };
+}

hm/vim/decoration.nix

@@ -0,0 +1,49 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    programs.nixvim = {
+      autoCmd = [
+        # Turn off relativenumber only for insert mode
+        { event = "InsertEnter"; pattern = "*"; command = "set norelativenumber"; }
+        { event = "InsertLeave"; pattern = "*"; command = "set relativenumber"; }
+      ];
+      extraConfigLua = builtins.readFile ./feline.lua;
+      extraPlugins = with pkgs.vimPlugins; [
+        nvim-scrollview # Scroll bar
+        # Status line
+        feline-nvim # Customizable status line.
+        # TODO Abandonned. Maybe use lualine?
+      ];
+      keymaps = [
+        # barbar
+        { key = "<C-H>"; action = "<Cmd>BufferPrevious<CR>"; options = { silent = true; }; }
+        { key = "<C-L>"; action = "<Cmd>BufferNext<CR>"; options = { silent = true; }; }
+        # TODO https://www.reddit.com/r/neovim/comments/mbj8m5/how_to_setup_ctrlshiftkey_mappings_in_neovim_and/
+        { key = "<Space><C-H>"; action = "<Cmd>BufferMovePrevious<CR>"; options = { silent = true; }; }
+        { key = "<Space><C-L>"; action = "<Cmd>BufferMoveNext<CR>"; options = { silent = true; }; }
+        # TODO gotos don't work
+        { key = "<C-1>"; action = "<Cmd>BufferGoto 1<CR>"; options = { silent = true; }; }
+        { key = "<C-2>"; action = "<Cmd>BufferGoto 2<CR>"; options = { silent = true; }; }
+        { key = "<C-3>"; action = "<Cmd>BufferGoto 3<CR>"; options = { silent = true; }; }
+        { key = "<C-4>"; action = "<Cmd>BufferGoto 4<CR>"; options = { silent = true; }; }
+        { key = "<C-5>"; action = "<Cmd>BufferGoto 5<CR>"; options = { silent = true; }; }
+        { key = "<C-6>"; action = "<Cmd>BufferGoto 6<CR>"; options = { silent = true; }; }
+        { key = "<C-7>"; action = "<Cmd>BufferGoto 7<CR>"; options = { silent = true; }; }
+        { key = "<C-8>"; action = "<Cmd>BufferGoto 8<CR>"; options = { silent = true; }; }
+        { key = "<C-9>"; action = "<Cmd>BufferGoto 9<CR>"; options = { silent = true; }; }
+        { key = "<C-0>"; action = "<Cmd>BufferLast<CR>"; options = { silent = true; }; }
+        { key = "gb"; action = "<Cmd>BufferPick<CR>"; options = { silent = true; }; }
+        # TODO Other useful options?
+      ];
+      options = {
+        title = true;
+        number = true;
+        relativenumber = true;
+      };
+      plugins = {
+        # Tabline
+        barbar.enable = true;
+      };
+    };
+  };
+}

hm/vim/default.nix

@@ -1,29 +1,4 @@
 { pkgs, lib, config, ... }:
-let
-  # UPST
-  vim-shot-f = pkgs.vimUtils.buildVimPlugin {
-    pname = "vim-shot-f";
-    version = "2016-02-05";
-    src = pkgs.fetchFromGitHub {
-      owner = "deris";
-      repo = "vim-shot-f";
-      rev = "eea71d2a1038aa87fe175de9150b39dc155e5e7f";
-      sha256 = "iAPvIs/lhW+w5kFTZKaY97D/kfCGtqKrJVFvZ8cHu+c=";
-    };
-    meta.homepage = "https://github.com/deris/vim-shot-f";
-  };
-  quick-scope = pkgs.vimUtils.buildVimPlugin rec {
-    pname = "quick-scope";
-    version = "2.6.1";
-    src = pkgs.fetchFromGitHub {
-      owner = "unblevable";
-      repo = "quick-scope";
-      rev = "v${version}";
-      sha256 = "TcA4jZIdnQd06V+JrXGiCMr0Yhm9gB6OMiTSdzMt/Qw=";
-    };
-    meta.homepage = "https://github.com/unblevable/quick-scope";
-  };
-in
 {
   # config = lib.mkIf config.programs.nixvim.enable { # Somehow this is infinite recursion?
   config = {
@@ -42,14 +17,6 @@ in
       # polarity.
       colorschemes.base16.colorscheme = "solarized-${config.frogeye.polarity}";
       options = {
-        # From https://www.hillelwayne.com/post/intermediate-vim/
-        title = true;
-        number = true;
-        relativenumber = true;
-        scrolloff = 10;
-        lazyredraw = true; # Do not redraw screen in the middle of a macro. Makes them complete faster.
-        cursorcolumn = true;
-
         ignorecase = true;
         smartcase = true;
         gdefault = true;
@@ -64,11 +31,6 @@ in
         updatetime = 250;
         undofile = true;
 
-        # From http://stackoverflow.com/a/5004785/2766106
-        list = true;
-        listchars = "tab:╾╌,trail:·,extends:↦,precedes:↤,nbsp:_";
-        showbreak = "↪";
-
         wildmode = "longest:full,full";
         wildmenu = true;
       };
@@ -76,19 +38,6 @@ in
         netrw_fastbrowse = 0; # Close the file explorer once you select a file
       };
       plugins = {
-        # Catches attention when cursor changed position
-        # TODO Unmapped, do I still want to use it?
-        specs = {
-          enable = true;
-          min_jump = 5;
-          fader = { builtin = "pulse_fader"; };
-          resizer = { builtin = "shrink_resizer"; };
-        };
-
-        # Tabline
-        barbar.enable = true;
-
-
         # Go to whatever
         telescope = {
           enable = true;
@@ -136,84 +85,14 @@ in
         # Surrounding pairs
         surround.enable = true; # Change surrounding pairs (e.g. brackets, quotes)
 
-        # Language Server
-        lsp = {
-          enable = true;
-          keymaps = {
-            silent = true;
-            diagnostic = {
-              "<Space>e" = "open_float";
-              "[e" = "goto_prev";
-              "]e" = "goto_next";
-            };
-            lspBuf = {
-              "gD" = "declaration";
-              "K" = "hover";
-              "gi" = "implementation";
-              "<C-S-k>" = "signature_help";
-              "<space>wa" = "add_workspace_folder";
-              "<space>wr" = "remove_workspace_folder";
-              # "<space>wl" = "list_workspace_folder";
-              # TODO Full thing was function() print(vim.inspect(vim.lsp.buf.list_workspace_folder())) end but not sure I'm ever really using this
-              # Also makes nvim crash like this, so uncommented
-              "<space>D" = "type_definition";
-              "<space>rn" = "rename";
-              "<space>f" = "format";
-              # TODO Full thing was function() vim.lsp.buf.format { async = true } end, so async while this isn't
-              # Maybe replace this with lsp-format?
-            };
-          };
-          servers = {
-            ansiblels.enable = config.frogeye.dev.ansible; # Ansible
-            bashls.enable = true; # Bash
-            jsonls.enable = true; # JSON
-            lua-ls.enable = true; # Lua (for Neovim debugging)
-            perlpls.enable = config.frogeye.dev.perl; # Perl
-            phpactor.enable = config.frogeye.dev.php; # PHP
-            rnix-lsp.enable = true; # Nix
-            # TODO Something for SQL. sqls is deprecated, sqlls is not in Nixpkgs. Probably needs a DB connection configured anyways?
-            yamlls.enable = true; # YAML
-            # TODO Check out none-ls
-          };
-        };
-        nvim-lightbulb = {
-          # Shows a lightbulb whenever a codeAction is available under the cursor
-          enable = true;
-          autocmd.enabled = true;
-        };
-
-        # Treesitter
-        treesitter = {
-          # Allows for better syntax highlighting
-          enable = true;
-          incrementalSelection = {
-            enable = true;
-          };
-          # indent = true; # Not very working last time I tried apparently
-        };
-        # TODO Investigate https://github.com/nvim-treesitter/nvim-treesitter-textobjects
-
-        rainbow-delimiters.enable = true; # Randomly colore paired brackets
-
-        indent-blankline.enable = true; # Show indent guides
-
         undotree.enable = true; # Navigate edition history
 
         # Git
         fugitive.enable = true; # Git basics
         gitsigns.enable = true; # Show changed lines in the gutter
 
-        # Language-specific
-        # dap.enable = true; # Debug Adapter Protocol client # 23.11
-        nvim-colorizer.enable = true; # Display colors of color-codes
       };
       extraPlugins = with pkgs.vimPlugins; [
-        nvim-scrollview # Scroll bar
-
-        # Status line
-        feline-nvim # Customizable status line.
-        # TODO Abandonned. Maybe use lualine?
-
         # Search/replace
         vim-abolish # Regex for words, with case in mind
         vim-easy-align # Aligning lines around a certain character
@@ -221,10 +100,6 @@ in
         # Surrounding pairs
         targets-vim # Better interaction with surrounding pairs
 
-        # f/F mode
-        vim-shot-f # Highlight relevant characters for f/F/t/T modes
-        quick-scope # Highlight relevant characters for f/F modes one per word but always
-
         # Registers
         registers-nvim # Show register content when pressing "
         # TODO Doesn't work. Didn't work on Arch either
@@ -234,9 +109,6 @@ in
         symbols-outline-nvim # Show a symbol panel on the right
         # TODO Fails on startup. Same on Arch. Config issue?
 
-        # Language server
-        lsp_signature-nvim # Show argument definition when typing a function
-
         # Git
         fugitive-gitlab-vim # Open files in GitLab
         # TODO Connect it!
@@ -251,11 +123,7 @@ in
       ] ++ lib.optionals config.frogeye.dev.ansible [
         ansible-vim # TODO Doesn't have snippets
       ];
-      extraConfigLua = lib.strings.concatMapStringsSep "\n" (f: builtins.readFile f) [
+      extraConfigLua = builtins.readFile ./symbols-outline-nvim.lua;
-        ./feline.lua
-        ./symbols-outline-nvim.lua
-        ./lsp_signature-nvim.lua
-      ];
       extraConfigVim = ''
         " GENERAL
 
@@ -281,10 +149,6 @@ in
 
       '';
       autoCmd = [
-        # Turn off relativenumber only for insert mode
-        { event = "InsertEnter"; pattern = "*"; command = "set norelativenumber"; }
-        { event = "InsertLeave"; pattern = "*"; command = "set relativenumber"; }
-
         # vim-easy-align: Align Markdown tables
         { event = "FileType"; pattern = "markdown"; command = "vmap <Bar> :EasyAlign*<Bar><Enter>"; }
       ];
@@ -315,26 +179,6 @@ in
 
         # PLUGINS
 
-        # barbar
-        { key = "<C-H>"; action = "<Cmd>BufferPrevious<CR>"; options = { silent = true; }; }
-        { key = "<C-L>"; action = "<Cmd>BufferNext<CR>"; options = { silent = true; }; }
-        # TODO https://www.reddit.com/r/neovim/comments/mbj8m5/how_to_setup_ctrlshiftkey_mappings_in_neovim_and/
-        { key = "<Space><C-H>"; action = "<Cmd>BufferMovePrevious<CR>"; options = { silent = true; }; }
-        { key = "<Space><C-L>"; action = "<Cmd>BufferMoveNext<CR>"; options = { silent = true; }; }
-        # TODO gotos don't work
-        { key = "<C-1>"; action = "<Cmd>BufferGoto 1<CR>"; options = { silent = true; }; }
-        { key = "<C-2>"; action = "<Cmd>BufferGoto 2<CR>"; options = { silent = true; }; }
-        { key = "<C-3>"; action = "<Cmd>BufferGoto 3<CR>"; options = { silent = true; }; }
-        { key = "<C-4>"; action = "<Cmd>BufferGoto 4<CR>"; options = { silent = true; }; }
-        { key = "<C-5>"; action = "<Cmd>BufferGoto 5<CR>"; options = { silent = true; }; }
-        { key = "<C-6>"; action = "<Cmd>BufferGoto 6<CR>"; options = { silent = true; }; }
-        { key = "<C-7>"; action = "<Cmd>BufferGoto 7<CR>"; options = { silent = true; }; }
-        { key = "<C-8>"; action = "<Cmd>BufferGoto 8<CR>"; options = { silent = true; }; }
-        { key = "<C-9>"; action = "<Cmd>BufferGoto 9<CR>"; options = { silent = true; }; }
-        { key = "<C-0>"; action = "<Cmd>BufferLast<CR>"; options = { silent = true; }; }
-        { key = "gb"; action = "<Cmd>BufferPick<CR>"; options = { silent = true; }; }
-        # TODO Other useful options?
-
         # symbols-outline-nvim
         { key = "<Space>s"; action = "<Cmd>SymbolsOutline<CR>"; options = { silent = true; }; }
 
@@ -346,6 +190,9 @@ in
   };
 
   imports = [
+    ./code.nix
     ./completion.nix
+    ./decoration.nix
+    ./lsp.nix
   ];
 }

hm/vim/feline_test.vim

@@ -1,9 +0,0 @@
-source ~/.config/vim/plug.vim
-call plug#begin('~/.cache/nvim/plugged')
-Plug 'RRethy/nvim-base16'
-call plug#end()
-
-colorscheme base16-solarized-dark
-lua << EOF
-a = require('base16-colorscheme').colors.base00
-EOF

hm/vim/lsp.nix

@@ -0,0 +1,72 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    programs.nixvim = {
+      extraConfigLua = ''
+        require'lsp_signature'.on_attach({
+            hint_enable = false,
+        })
+      '';
+      extraPlugins = with pkgs.vimPlugins; [
+        # Language server
+        lsp_signature-nvim # Show argument definition when typing a function
+      ];
+      keymaps = [
+        # barbar
+        { key = "<C-H>"; action = "<Cmd>BufferPrevious<CR>"; options = { silent = true; }; }
+        { key = "<C-L>"; action = "<Cmd>BufferNext<CR>"; options = { silent = true; }; }
+        # TODO https://www.reddit.com/r/neovim/comments/mbj8m5/how_to_setup_ctrlshiftkey_mappings_in_neovim_and/
+        { key = "<Space><C-H>"; action = "<Cmd>BufferMovePrevious<CR>"; options = { silent = true; }; }
+        { key = "<Space><C-L>"; action = "<Cmd>BufferMoveNext<CR>"; options = { silent = true; }; }
+        # TODO gotos don't work
+        { key = "<C-1>"; action = "<Cmd>BufferGoto 1<CR>"; options = { silent = true; }; }
+        { key = "<C-2>"; action = "<Cmd>BufferGoto 2<CR>"; options = { silent = true; }; }
+        { key = "<C-3>"; action = "<Cmd>BufferGoto 3<CR>"; options = { silent = true; }; }
+        { key = "<C-4>"; action = "<Cmd>BufferGoto 4<CR>"; options = { silent = true; }; }
+        { key = "<C-5>"; action = "<Cmd>BufferGoto 5<CR>"; options = { silent = true; }; }
+        { key = "<C-6>"; action = "<Cmd>BufferGoto 6<CR>"; options = { silent = true; }; }
+        { key = "<C-7>"; action = "<Cmd>BufferGoto 7<CR>"; options = { silent = true; }; }
+        { key = "<C-8>"; action = "<Cmd>BufferGoto 8<CR>"; options = { silent = true; }; }
+        { key = "<C-9>"; action = "<Cmd>BufferGoto 9<CR>"; options = { silent = true; }; }
+        { key = "<C-0>"; action = "<Cmd>BufferLast<CR>"; options = { silent = true; }; }
+        { key = "gb"; action = "<Cmd>BufferPick<CR>"; options = { silent = true; }; }
+        # TODO Other useful options?
+      ];
+      plugins = {
+        # Language Server
+        lsp = {
+          enable = true;
+          keymaps = {
+            silent = true;
+            diagnostic = {
+              "<Space>e" = "open_float";
+              "[e" = "goto_prev";
+              "]e" = "goto_next";
+            };
+            lspBuf = {
+              "gD" = "declaration";
+              "K" = "hover";
+              "gi" = "implementation";
+              "<C-S-k>" = "signature_help";
+              "<space>wa" = "add_workspace_folder";
+              "<space>wr" = "remove_workspace_folder";
+              # "<space>wl" = "list_workspace_folder";
+              # TODO Full thing was function() print(vim.inspect(vim.lsp.buf.list_workspace_folder())) end but not sure I'm ever really using this
+              # Also makes nvim crash like this, so uncommented
+              "<space>D" = "type_definition";
+              "<space>rn" = "rename";
+              "<space>f" = "format";
+              # TODO Full thing was function() vim.lsp.buf.format { async = true } end, so async while this isn't
+              # Maybe replace this with lsp-format?
+            };
+          };
+        };
+        nvim-lightbulb = {
+          # Shows a lightbulb whenever a codeAction is available under the cursor
+          enable = true;
+          autocmd.enabled = true;
+        };
+      };
+    };
+  };
+}

hm/vim/lsp_signature-nvim.lua

@@ -1,3 +0,0 @@
-require'lsp_signature'.on_attach({
-    hint_enable = false,
-})