24.05 Fixed terminal, vim, lix and stuff

Also "fixed" display link, but turned out that the display cable wasn't
plugged in correctly anymore...

flake.lock

@@ -116,7 +116,7 @@
     },
     "devshell": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
@@ -259,24 +259,6 @@
       "inputs": {
         "systems": "systems_2"
       },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
       "locked": {
         "lastModified": 1701680307,
         "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
@@ -291,21 +273,6 @@
         "type": "github"
       }
     },
-    "flakey-profile": {
-      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -450,49 +417,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1714955862,
-        "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
-        "ref": "refs/tags/2.90-beta.1",
-        "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
-        "revCount": 15501,
-        "type": "git",
-        "url": "https://git@git.lix.systems/lix-project/lix"
-      },
-      "original": {
-        "ref": "refs/tags/2.90-beta.1",
-        "type": "git",
-        "url": "https://git@git.lix.systems/lix-project/lix"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "flakey-profile": "flakey-profile",
-        "lix": [
-          "lix"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1715353627,
-        "narHash": "sha256-bt/KZsPUlQV1lOZU8vM3QT/05jHftCz88tA9+bXk83s=",
-        "ref": "fix-prefetch-npm-deps",
-        "rev": "1cb0b0434d83719d73946b4516475e5ca31a2f2d",
-        "revCount": 76,
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      },
-      "original": {
-        "ref": "fix-prefetch-npm-deps",
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -727,8 +651,6 @@
         "disko": "disko",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "lix": "lix",
-        "lix-module": "lix-module",
         "nix-on-droid": "nix-on-droid",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
@@ -813,21 +735,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [

hm/desktop/terminal/default.nix

@@ -43,7 +43,7 @@ in
               }
             ];
           };
-          key_bindings = [
+          keyboard.bindings = [
             { mode = "~Search"; mods = "Alt|Control"; key = "Space"; action = "ToggleViMode"; }
             { mode = "Vi|~Search"; mods = "Control"; key = "K"; action = "ScrollHalfPageUp"; }
             { mode = "Vi|~Search"; mods = "Control"; key = "J"; action = "ScrollHalfPageDown"; }

hm/dev/common.nix

@@ -21,7 +21,7 @@
       traceroute
 
       # nix
-      nix
+      lix
 
       # Always on (graphical)
     ] ++ lib.optionals config.frogeye.desktop.xorg [

hm/nix/default.nix

@@ -14,7 +14,7 @@
       enableZshIntegration = true;
     };
     nix = {
-      package = lib.mkDefault pkgs.nixFlakes;
+      package = lib.mkDefault pkgs.lix;
       settings = {
         experimental-features = [ "nix-command" "flakes" ];
         warn-dirty = false;

hm/shell/default.nix

@@ -19,7 +19,7 @@ in
       };
       zsh = {
         enable = true;
-        enableAutosuggestions = true;
+        autosuggestion.enable = true;
         enableCompletion = true;
         syntaxHighlighting.enable = true;
         historySubstringSearch.enable = true;

hm/vim/code.nix

@@ -32,7 +32,7 @@ in
         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 = {
+      opts = {
         # 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.

hm/vim/decoration.nix

@@ -3,11 +3,11 @@
   config = {
     programs = {
       # https://www.reddit.com/r/neovim/comments/mbj8m5/how_to_setup_ctrlshiftkey_mappings_in_neovim_and/
-      alacritty.settings.key_bindings = [
+      alacritty.settings.keyboard.bindings = [
-        { key = "H"; mods = "Control|Shift"; chars = "\\x1b[72;5u"; }
+        { key = "H"; mods = "Control|Shift"; chars = "\\u001b[72;5u"; }
-        { key = "L"; mods = "Control|Shift"; chars = "\\x1b[76;5u"; }
+        { key = "L"; mods = "Control|Shift"; chars = "\\u001b[76;5u"; }
       ] ++ (map
-        (n: { key = "Key${builtins.toString n}"; mods = "Control"; chars = "\\x1b[${builtins.toString (48+n)};5u"; })
+        (n: { key = "Key${builtins.toString n}"; mods = "Control"; chars = "\\u001b[${builtins.toString (48+n)};5u"; })
         (lib.lists.range 0 9));
       # Ctrl+<number> doesn't get interpreted, but Ctrl+Shift+<number> does, so let's use that
       nixvim = {
@@ -34,7 +34,7 @@
           ] ++ (map
             (n: { key = "<C-${builtins.toString n}>"; action = "<Cmd>BufferGoto ${builtins.toString n}<CR>"; inherit options; })
             (lib.lists.range 1 9));
-        options = {
+        opts = {
           showmode = false;
           number = true;
           relativenumber = true;
@@ -151,7 +151,7 @@
           # Show context on top if scrolled out
           treesitter-context = {
             enable = true;
-            maxLines = 5;
+            settings.max_lines = 5;
           };
         };
       };

hm/vim/default.nix

@@ -13,7 +13,7 @@
     };
     programs.nixvim = {
       colorschemes.base16.setUpBar = false; # We want the custom theme for lualine, probably
-      options = {
+      opts = {
         ignorecase = true;
         smartcase = true;
         gdefault = true;
@@ -52,23 +52,27 @@
             gS = "search_history";
             gC = "commands";
           };
-          defaults = {
+          settings = {
-            vimgrep_arguments = [
+            defaults = {
-              "${pkgs.ripgrep}/bin/rg"
+              vimgrep_arguments = [
-              "--color=never"
+                "${pkgs.ripgrep}/bin/rg"
-              "--no-heading"
+                "--color=never"
-              "--with-filename"
+                "--no-heading"
-              "--line-number"
+                "--with-filename"
-              "--column"
+                "--line-number"
-              "--smart-case"
+                "--column"
-            ];
+                "--smart-case"
+              ];
+            };
           };
           extensions.fzf-native = {
             enable = true;
-            caseMode = "smart_case";
+            settings = {
-            fuzzy = true;
+              case_mode = "smart_case";
-            overrideFileSorter = true;
+              fuzzy = true;
-            overrideGenericSorter = true;
+              override_file_sorter = true;
+              override_generic_sorter = true;
+            };
           };
         };
         # TODO Go to any symbol in the current working directory, for when LSP doesn't support it.
@@ -94,6 +98,12 @@
         ansible-vim
         # Doesn't generate snippets, but those are for UltiSnip anyways
       ];
+      extraConfigLuaPre = lib.mkBefore ''
+        -- If terminal is detected to be light, background will be changed after base16 theme is applied.
+        -- Setting manually early to prevent hightlights having weird colors.
+        -- https://github.com/RRethy/base16-nvim/issues/77
+        vim.opt.background = "${config.stylix.polarity}";
+      '';
       extraConfigVim = ''
         " Avoid showing message extra message when using completion
         set shortmess+=c

hm/vim/lsp.nix

@@ -15,8 +15,7 @@
         {
           mode = "n";
           key = "<space>wl";
-          lua = true;
+          action.__raw = ''
-          action = ''
             function()
               print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
             end
@@ -26,8 +25,7 @@
         {
           mode = "n";
           key = "<space>f";
-          lua = true;
+          action.__raw = ''
-          action = ''
             function()
               vim.lsp.buf.format { async = true }
             end

os/desktop.nix

@@ -3,41 +3,43 @@
   config = lib.mkIf config.frogeye.desktop.xorg {
     services = {
       blueman.enable = true;
+      displayManager.defaultSession = "none+i3";
       xserver = {
         enable = true;
         windowManager.i3.enable = true;
-        displayManager.defaultSession = "none+i3";
 
         # Keyboard layout
-        extraLayouts.qwerty-fr = {
+        xkb = {
-          description = "QWERTY-fr";
+          extraLayouts.qwerty-fr = {
-          languages = [ "fr" ];
+            description = "QWERTY-fr";
-          symbolsFile = "${pkgs.stdenv.mkDerivation {
+            languages = [ "fr" ];
-          name = "qwerty-fr-keypad";
+            symbolsFile = "${pkgs.stdenv.mkDerivation {
-          src = builtins.fetchGit {
+              name = "qwerty-fr-keypad";
-            url = "https://github.com/qwerty-fr/qwerty-fr.git";
+              src = builtins.fetchGit {
-            rev = "3a4d13089e8ef016aa20baf6b2bf3ea53de674b8";
+                url = "https://github.com/qwerty-fr/qwerty-fr.git";
+                rev = "3a4d13089e8ef016aa20baf6b2bf3ea53de674b8";
+              };
+              patches = [ ./qwerty-fr-keypad.diff ];
+              # TODO This doesn't seem to be applied... it's the whole point of the derivation :(
+              installPhase = ''
+                runHook preInstall
+                mkdir -p $out/linux
+                cp $src/linux/us_qwerty-fr $out/linux
+                runHook postInstall
+              '';
+            }}/linux/us_qwerty-fr";
           };
-          patches = [ ./qwerty-fr-keypad.diff ];
+          layout = "qwerty-fr";
-          # TODO This doesn't seem to be applied... it's the whole point of the derivation :(
-          installPhase = ''
-            runHook preInstall
-            mkdir -p $out/linux
-            cp $src/linux/us_qwerty-fr $out/linux
-            runHook postInstall
-          '';
-      }}/linux/us_qwerty-fr";
         };
-        layout = "qwerty-fr";
       };
     };
 
     # Enable sound & bluetooth
     sound.enable = true;
     hardware = {
-        bluetooth.enable = true;
+      bluetooth.enable = true;
-        pulseaudio.enable = true;
+      pulseaudio.enable = true;
-        # TODO Try pipewire
+      # TODO Try pipewire
     };
 
     # So we can use gnome3 pinentry flavour

os/geoffrey.nix

@@ -41,7 +41,7 @@
     programs.dconf.enable = true;
 
     # Because everything is encrypted and I'm the only user, this is fine.
-    services.xserver.displayManager.autoLogin.user = "geoffrey";
+    services.displayManager.autoLogin.user = "geoffrey";
   };
   imports = [
     home-manager.nixosModules.home-manager

os/printing/default.nix

@@ -3,7 +3,7 @@
   config = lib.mkIf config.services.printing.enable {
     services.avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
       openFirewall = true;
     };
   };

result-buildable

@@ -0,0 +1 @@
+/nix/store/6887mr1xmcjgb99saw2ilv2mfjb8s2xq-nixos-system-curacao-24.05.20240531.805a384