Update to nixos 25.11

3 files changed, 25 insertions, 17 deletions

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;
   };
 }