hm/common.nix

@@ -172,8 +172,7 @@ in
         enable = true;
         enableAutosuggestions = true;
         enableCompletion = true;
-        enableSyntaxHighlighting = true;
-        # syntaxHighlighting.enable = true; # 23.11 syntax
+        syntaxHighlighting.enable = true;
         historySubstringSearch.enable = true;
         initExtra = lib.strings.concatLines [
           commonRc
@@ -350,6 +349,7 @@ in
           ];
           extraConfig = builtins.readFile ./tmux.conf + "source-file ${themepack}/share/tmux-plugins/tmux-themepack/powerline/default/green.tmuxtheme\n";
         };
+      translate-shell.enable = true; # TODO Cool config?
     };
   services = {
     gpg-agent = {
@@ -423,7 +423,6 @@ in
       man
       # nodePackages.insect # FIXME Don't install on aarch64
       # TODO Use whatever replaces insect
-      translate-shell
       unzip
       unrar
       p7zip

hm/vim.nix

@@ -4,7 +4,7 @@ let
     url = "https://github.com/nix-community/nixvim";
     ref = "nixos-23.11";
   });
-  vim-shot-f = pkgs.vimUtils.buildVimPluginFrom2Nix {
+  vim-shot-f = pkgs.vimUtils.buildVimPlugin {
     pname = "vim-shot-f";
     version = "2016-02-05";
     src = pkgs.fetchFromGitHub {
@@ -15,7 +15,7 @@ let
     };
     meta.homepage = "https://github.com/deris/vim-shot-f";
   };
-  quick-scope = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
+  quick-scope = pkgs.vimUtils.buildVimPlugin rec {
     pname = "quick-scope";
     version = "2.6.1";
     src = pkgs.fetchFromGitHub {
@@ -286,14 +286,14 @@ in
 
       # Language-specific
       tcomment_vim # Language-aware (un)commenting
-  ] ++ lib.optionals config.frogeye.extra [
+    ] ++ lib.optionals config.frogeye.extra [
       vim-LanguageTool # Check grammar for human languages
-  ] ++ lib.optionals config.programs.pandoc.enable [
+    ] ++ lib.optionals config.programs.pandoc.enable [
       vim-pandoc # Pandoc-specific stuff because there's no LSP for it
       vim-pandoc-syntax
-  ] ++ lib.optionals config.frogeye.dev.c [
+    ] ++ lib.optionals config.frogeye.dev.c [
       nvim-dap # Debug Adapter Protocol client
-  ] ++ lib.optionals config.frogeye.dev.ansible [
+    ] ++ lib.optionals config.frogeye.dev.ansible [
       ansible-vim # FIXME See if it doesn't require to do ./UltiSnips/generate.sh
     ];
     extraConfigLua = lib.strings.concatMapStringsSep "\n" (f: builtins.readFile f) [
@@ -354,54 +354,53 @@ in
       # TODO Is not working, options is set to nil even though it shouldn't
     };
 
-    # 23.11: Use keymaps, seems better
-    maps = {
+    keymaps = [
       # GENERAL
 
       # Allow saving of files as sudo when I forgot to start vim using sudo.
       # From https://stackoverflow.com/a/7078429
-      command."w!!" = { action = "w !sudo tee > /dev/null %"; };
+      { mode = "c"; key = "w!!"; action = "w !sudo tee > /dev/null %"; }
 
-      insert."jk" = { action = "<Esc>"; };
-      visual."<Enter>" = { action = "<Esc>"; };
-      normal."<Enter>" = { action = "o<Esc>"; };
+      { mode = "i"; key = "jk"; action = "<Esc>"; }
+      { mode = "v"; key = "<Enter>"; action = "<Esc>"; }
+      { key = "<Enter>"; action = "o<Esc>"; }
 
-      # normal."<C-H>" = { action = ":bp<CR>"; };
-      # normal."<C-L>" = { action = ":bn<CR>"; };
-      normal."<C-K>" = { action = "kkkkkkkkkkkkkkkkkkkkk"; };
-      normal."<C-J>" = { action = "jjjjjjjjjjjjjjjjjjjjj"; };
+      # { key = "<C-H>"; action = ":bp<CR>"; }
+      # { key = "<C-L>"; action = ":bn<CR>"; }
+      { key = "<C-K>"; action = "kkkkkkkkkkkkkkkkkkkkk"; }
+      { key = "<C-J>"; action = "jjjjjjjjjjjjjjjjjjjjj"; }
 
       # \s to replace globally the word under the cursor
-      normal."<Leader>s" = { action = ":%s/\\<<C-r><C-w>\\>/"; };
+      { key = "<Leader>s"; action = ":%s/\\<<C-r><C-w>\\>/"; }
 
       # PLUGINS
 
       # barbar
-      normal."<C-H>" = { action = "<Cmd>BufferPrevious<CR>"; silent = true; };
-      normal."<C-L>" = { action = "<Cmd>BufferNext<CR>"; silent = true; };
+      { 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/
-      normal."<Space><C-H>" = { action = "<Cmd>BufferMovePrevious<CR>"; silent = true; };
-      normal."<Space><C-L>" = { action = "<Cmd>BufferMoveNext<CR>"; silent = true; };
+      { 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
-      normal."<C-1>" = { action = "<Cmd>BufferGoto 1<CR>"; silent = true; };
-      normal."<C-2>" = { action = "<Cmd>BufferGoto 2<CR>"; silent = true; };
-      normal."<C-3>" = { action = "<Cmd>BufferGoto 3<CR>"; silent = true; };
-      normal."<C-4>" = { action = "<Cmd>BufferGoto 4<CR>"; silent = true; };
-      normal."<C-5>" = { action = "<Cmd>BufferGoto 5<CR>"; silent = true; };
-      normal."<C-6>" = { action = "<Cmd>BufferGoto 6<CR>"; silent = true; };
-      normal."<C-7>" = { action = "<Cmd>BufferGoto 7<CR>"; silent = true; };
-      normal."<C-8>" = { action = "<Cmd>BufferGoto 8<CR>"; silent = true; };
-      normal."<C-9>" = { action = "<Cmd>BufferGoto 9<CR>"; silent = true; };
-      normal."<C-0>" = { action = "<Cmd>BufferLast<CR>"; silent = true; };
-      normal."gb" = { action = "<Cmd>BufferPick<CR>"; silent = true; };
+      { 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
-      normal."<Space>s" = { action = "<Cmd>SymbolsOutline<CR>"; silent = true; };
+      { key = "<Space>s"; action = "<Cmd>SymbolsOutline<CR>"; options = { silent = true; }; }
 
       # undotree
-      normal."<Space>u" = { action = "<Cmd>UndotreeToggle<CR>"; silent = true; };
+      { key = "<Space>u"; action = "<Cmd>UndotreeToggle<CR>"; options = { silent = true; }; }
 
-    };
+    ];
   };
 }

pindakaas_sd/hybrid

@@ -1 +0,0 @@
-/nix/store/bz6nqy0ky5l33rfrkb6k66bzkgw18k90-nixos-system-pindakaas_sd-23.05.4981.5b528f99f73c