Update to nixos 25.11

6 files changed, 59 insertions, 48 deletions

diff --git a/flake.lock b/flake.lock
index 46fe11c..12285a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -95,16 +95,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1763992789,
-        "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
+        "lastModified": 1764398914,
+        "narHash": "sha256-YPrpwlVQidzQlMh0OnquaJR+58rKe9YNnuRis293Ilo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
+        "rev": "d0c5fdc48db6f19471b8adc954eca09194e68036",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -125,16 +125,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764316264,
-        "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
+        "lastModified": 1764406085,
+        "narHash": "sha256-CYbMp8hwuOf4umokSNp+t1s4Hjd4vxXq4S5CD+xvgNs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
+        "rev": "9561691c9f450fad7c3526916e1c4f44be0d1192",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 5ecc52e..9708d53 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,10 @@
 {
   description = "Petri's system";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     agenix = {
diff --git a/home/default.nix b/home/default.nix
index 6e38f47..85f511c 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -249,11 +249,14 @@
       };
     };
     ssh = {
+      enableDefaultConfig = false;
       enable = true;
-      compression = true;
-      serverAliveInterval = 10;
-      controlMaster = "auto";
-      controlPersist = "10m";
+      matchBlocks."*" = {
+        serverAliveInterval = 1;
+        compression = true;
+        controlMaster = "auto";
+        controlPersist = "10m";
+      };
     };
 
     chromium = {
@@ -384,7 +387,7 @@
       yazi # file manager
 
       # gui
-      bitwarden # password maanger
+      bitwarden-desktop # password mananger
       ghostty # terminal emulator
       hypridle
       hyprlock
@@ -441,10 +444,9 @@
       jq # commandline json parser
       kramdown-asciidoc # command to convert markdown to asciidoc
       minio-client
-      moar # less replacement
+      moor # less replacement
       ntfy-sh # notifications
       nvimpager # use neovim as pager
-      openai-whisper-cpp
       pistol # file preview
       pkg-config # needed for compilation
       pkgs-unstable.goose-cli # llm cli
@@ -459,6 +461,7 @@
       slurp # screen are capture
       sqlite # simple database
       timg # show image in shell
+      whisper-cpp # tts
       wlogout # logout helper
       xdg-utils
       xh # curl replacement
diff --git a/home/fish/default.nix b/home/fish/default.nix
index 08bb295..4b60092 100644
--- a/home/fish/default.nix
+++ b/home/fish/default.nix
@@ -37,7 +37,7 @@
       import = ''
         ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" $argv
       '';
-      readdoc = "${pkgs.reader}/bin/reader $argv --markdown-output | ${pkgs.moar}/bin/moar --wrap --lang markdown";
+      readdoc = "${pkgs.reader}/bin/reader $argv --markdown-output | ${pkgs.moor}/bin/moor --wrap --lang markdown";
       extract = ''
         		function extract
         	    switch $argv[1]
diff --git a/home/git/default.nix b/home/git/default.nix
index 6d975e3..7fe4f41 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -1,15 +1,20 @@
 { pkgs, ... }:
 {
+  programs.diff-so-fancy = {
+    enable = true;
+    enableGitIntegration = true;
+  };
   programs.git = {
     enable = true;
-    aliases = {
-      lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-    };
-    diff-so-fancy.enable = true;
-    maintenance.enable = true;
-    userEmail = "petri.hienonen@gmail.com";
-    userName = "Petri Hienonen";
-    extraConfig = {
+    settings = {
+      alias = {
+        lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
+      };
+      user = {
+        email = "petri.hienonen@gmail.com";
+        name = "Petri Hienonen";
+        signingkey = "76028181DD730D0C";
+      };
       core = {
         editor = "${pkgs.neovim}/bin/nvim";
         hooksPath = ".githooks/";
@@ -21,7 +26,7 @@
       merge.conflictStyle = "diff3";
       pull.rebase = true;
       tag.gpgSign = true;
-      user.signingkey = "76028181DD730D0C";
     };
+    maintenance.enable = true;
   };
 }
diff --git a/roles/shared.nix b/roles/shared.nix
index b156d6c..2eddf0f 100644
--- a/roles/shared.nix
+++ b/roles/shared.nix
@@ -59,17 +59,17 @@
       keep-derivations = true
     '';
   };
-  system.switch = {
-    enable = false;
-    enableNg = true;
-  };
-
-  system.activationScripts.diff = {
-    supportsDryActivation = true;
-    text = ''
-      ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff \
-           /run/current-system "$systemConfig"
-    '';
+  system = {
+    switch = {
+      enable = true;
+    };
+    activationScripts.diff = {
+      supportsDryActivation = true;
+      text = ''
+        ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff \
+             /run/current-system "$systemConfig"
+      '';
+    };
   };
 
   zramSwap = {
@@ -183,10 +183,10 @@
     services = {
       "systemd-networkd".environment.SYSTEMD_LOG_LEVEL = "debug";
     };
-    extraConfig = ''
-      DefaultTimeoutStopSec=10
-      DefaultLimitNOFILE=2048
-    '';
+    settings.Manager = {
+      DefaultTimeoutStopSec = 10;
+      DefaultLimitNOFILE = 2048;
+    };
     # watchdog = {
     #  device = "/dev/watchdog";
     #  runtimeTime = "30s";
@@ -298,17 +298,17 @@
       alsa-utils
       blis
       bluez
-      bluez-tools
       bluez-alsa
+      bluez-tools
       glfw
       glm
-      glxinfo
       gotop
       libva
       libva-utils
+      mesa-demos
       nixfmt-rfc-style
-      shaderc.static
       shaderc.dev
+      shaderc.static
       vulkan-headers
       vulkan-loader
       vulkan-tools
@@ -323,6 +323,10 @@
   };
 
   environment = {
+    pathsToLink = [
+      "/share/xdg-desktop-portal"
+      "/share/applications"
+    ];
     systemPackages = with pkgs; [
       agenix.packages.${system}.default
       clinfo
@@ -331,7 +335,7 @@
       git
       gnumake
       gnupg
-      greetd.tuigreet
+      tuigreet
       linux-firmware
       lm_sensors
       mimalloc
@@ -736,7 +740,6 @@
     };
     greetd = {
       enable = true;
-      vt = 1;
       restart = true;
       settings = {
         initial_session = {
@@ -744,7 +747,7 @@
           user = "${vars.user}";
         };
         default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd /etc/greetd/hyprland-wrapper.sh";
+          command = "${pkgs.tuigreet}/bin/tuigreet --cmd /etc/greetd/hyprland-wrapper.sh";
         };
       };
     };