⬆️ [shared] Upgrade to NixOS 25.05

shared/base/home-manager/gpg.nix

@@ -5,6 +5,6 @@
   services.gpg-agent = {
     enable = true;
     enableFishIntegration = true;
-    pinentryPackage = pkgs.pinentry-curses;
+    pinentry.package = pkgs.pinentry-curses;
   };
 }

shared/base/home-manager/home-manager.nix

@@ -1,5 +1,4 @@
 {
-  outputs,
   systemConfig,
   common,
   ...
@@ -12,9 +11,6 @@
     stateVersion = systemConfig.version;
   };
 
-  # Adds pkgs.unstable in order to fetch packages from unstable repositories
-  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }

shared/base/modules/nixos.nix

@@ -21,5 +21,8 @@
     overlays = [ outputs.overlays.unstable-packages ];
   };
 
-  system.stateVersion = systemConfig.version;
+  system = {
+    rebuild.enableNg = true;
+    stateVersion = systemConfig.version;
+  };
 }

shared/desktop/home-manager/development/zed.nix

@@ -19,7 +19,7 @@
         fontSize = 14;
       in
       {
-        assistant = {
+        agent = {
           default_model = {
             provider = "ollama";
             model = "deepseek-r1:8b";

shared/desktop/home-manager/hyprland/hyprlock/default.nix

@@ -78,7 +78,7 @@
         fail_color = "${theme.redRgb}";
         fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
         capslock_color = "${theme.yellowRgb}";
-        position = "0, -47"; # TODO change to use % at 25.05
+        position = "0, -5%";
         halign = "center";
         valign = "center";
       };

shared/desktop/home-manager/hyprland/settings.nix

@@ -9,6 +9,11 @@ let
 in
 {
   wayland.windowManager.hyprland.settings = {
+    ecosystem = {
+      no_update_news = true;
+      no_donation_nag = true;
+    };
+
     monitor = [
       ", preferred, auto, 1"
     ];

shared/desktop/modules/fonts.nix

@@ -1,4 +1,4 @@
-{ pkgs, theme, ... }:
+{ pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
@@ -8,10 +8,7 @@
   fonts = {
     fontconfig.enable = true;
     packages = with pkgs; [
-      (nerdfonts.override { fonts = [ theme.nerdFont ]; })
-      jetbrains-mono
-      # The line below will replace the lines above in 25.05
-      # nerd-fonts.jetbrains-mono
+      nerd-fonts.jetbrains-mono
       font-awesome
     ];
   };

shared/desktop/modules/hardware/audio.nix

@@ -13,8 +13,6 @@
     spotify
   ];
 
-  hardware.pulseaudio.enable = false; # Will be moved to services in 25.05
-
   security.rtkit.enable = true; # Enable RealtimeKit for audio purposes
 
   services = {
@@ -28,6 +26,6 @@
       # Uncomment the following line if you want to use JACK applications
       # jack.enable = true;
     };
-    # pulseaudio.enable = false; # TODO uncommenct at 25.05
+    pulseaudio.enable = false; # Will be moved to services in 25.05
   };
 }

shared/desktop/modules/locale.nix

@@ -11,7 +11,7 @@ in
   # Select internationalisation properties.
   i18n = {
     defaultLocale = en;
-    supportedLocales = [
+    extraLocales = [
       "${en}/${utf-8}"
       "${nb}/${utf-8}"
     ];

shared/desktop/modules/office.nix

@@ -3,6 +3,6 @@
 {
   environment.systemPackages = with pkgs; [
     onlyoffice-desktopeditors
-    planify
+    # planify
   ];
 }