Upgrade to 25.05

hm/common.nix

@@ -66,9 +66,13 @@
       enable = true;
       enableBashIntegration = true;
       enableZshIntegration = true;
+      # TODO enableXIntegration options might not be needed anymore
     };
     lsd = {
       enable = true;
+      # Don't want the default aliases
+      enableBashIntegration = false;
+      enableZshIntegration = false;
       settings = {
         size = "short";
       };

hm/desktop/browser/default.nix

@@ -20,9 +20,8 @@
             pkgs.tridactyl-native
           ];
         };
-
         profiles.hm = {
-          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+          extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
             (buildFirefoxXpiAddon {
               pname = "onetab";
               version = "0.1.0";
@@ -41,7 +40,7 @@
             ublock-origin
           ];
           search = {
-            default = "DuckDuckGo";
+            default = "ddg";
             engines = {
               # TODO Harmonize with qutebrowser search engines
               "Nix Packages" = {
@@ -65,12 +64,12 @@
               };
               "NixOS Wiki" = {
                 urls = [ { template = "https://nixos.wiki/index.php?search={searchTerms}"; } ];
-                iconUpdateURL = "https://nixos.wiki/favicon.png";
+                icon = "https://nixos.wiki/favicon.png";
                 updateInterval = 24 * 60 * 60 * 1000; # every day
                 definedAliases = [ "@nw" ];
               };
-              "Bing".metaData.hidden = true;
-              "Google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
+              "bing".metaData.hidden = true;
+              "google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
             };
             force = true;
           };
@@ -170,6 +169,7 @@
         };
       };
     };
+    stylix.targets.firefox.profileNames = [ "hm" ];
     xdg = {
       configFile."tridactyl/tridactylrc".source = ./tridactylrc; # TODO Improve that :)
       mimeApps = {

hm/gpg/default.nix

@@ -48,7 +48,7 @@
       # gnome3 is nicer, but requires gcr as a dbus package.
       # Which is in my NixOS config, and on non-NixOS too.
       # It will fall back to ncurses when running in non-graphics mode.
-      pinentryPackage = pkgs.pinentry-gnome3;
+      pinentry.package = pkgs.pinentry-gnome3;
       # If inactive, the key will be forgotten after this time
       defaultCacheTtl = 3600;
       defaultCacheTtlSsh = defaultCacheTtl;

hm/shell/default.nix

@@ -30,7 +30,7 @@ in
         enableCompletion = true;
         syntaxHighlighting.enable = true;
         historySubstringSearch.enable = true;
-        initExtra = builtins.readFile ./zshrc.sh;
+        initContent = builtins.readFile ./zshrc.sh;
         defaultKeymap = "viins";
         history = {
           size = cfg.historySize;

hm/theme/default.nix

@@ -11,15 +11,13 @@
       polarity = config.frogeye.polarity;
       fonts = {
         monospace = {
-          package = pkgs.nerdfonts.override {
-            fonts = [ "DejaVuSansMono" ]; # Choose from https://github.com/NixOS/nixpkgs/blob/6ba3207643fd27ffa25a172911e3d6825814d155/pkgs/data/fonts/nerdfonts/shas.nix
-          };
+          package = pkgs.nerd-fonts.dejavu-sans-mono;
           name = "DejaVuSansM Nerd Font";
         };
       };
     };
   };
   imports = [
-    stylix.homeManagerModules.stylix
+    stylix.homeModules.stylix
   ];
 }

hm/vim/code.nix

@@ -50,7 +50,7 @@ in
         # Underline all instances of the underlined word
         cursorline = {
           enable = true;
-          cursorline.enable = false;
+          settings.cursorline.enable = false;
         };
 
         # Catches attention when cursor changed position
@@ -74,7 +74,7 @@ in
         indent-blankline.enable = true; # Show indent guides
         rainbow-delimiters.enable = true; # Randomly colore paired brackets
 
-        nvim-colorizer.enable = true; # Display colors of color-codes
+        colorizer.enable = true; # Display colors of color-codes
       };
     };
   };

hm/vim/decoration.nix

@@ -155,7 +155,8 @@ in
                   lualine_x =
                     [
                       (
-                        (nv.listToUnkeyedAttrs [ ''(next(vim.lsp.buf_get_clients()) == nil) and "󰒲 " or ""'' ])
+                        (nv.listToUnkeyedAttrs [ ''(next(vim.lsp.get_clients()) == nil) and "󰒲 " or ""'' ])
+                        # TODO Not working (changed from vim.lsp.buf_get_clients())
                         // {
                           separator = {
                             left = "";