24.05: Fixed warnings

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

@@ -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.

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