moved krita to programs folder

configurations/home-manager/eve/packages.nix

@@ -18,9 +18,7 @@ in {
     home.packages = lib.lists.optionals userConfig.isDesktopUser (
       with pkgs; [
         ungoogled-chromium
-        krita
         gnomeExtensions.dash-to-panel
-        (lib.mkIf hardware.piperMouse.enable piper)
       ]
     );
 
@@ -61,6 +59,8 @@ in {
         makemkv.enable = true;
         signal-desktop-bin.enable = true;
         steam.enable = true;
+        piper.enable = hardware.piperMouse.enable;
+        krita.enable = true;
       })
     ];
   };

configurations/home-manager/leyla/packages/default.nix

@@ -36,6 +36,7 @@ in {
           protonvpn-gui.enable = true;
           dbeaver-bin.enable = true;
           bruno.enable = true;
+          piper.enable = hardware.piperMouse.enable;
         })
         (lib.mkIf (hardware.directAccess.enable && config.user.isDesktopUser) {
           anki.enable = true;
@@ -48,6 +49,7 @@ in {
           vscode.enable = true;
           firefox.enable = true;
           steam.enable = true;
+          krita.enable = true;
         })
       ];
     }
@@ -76,7 +78,6 @@ in {
             libreoffice
             inkscape
             gimp
-            krita
             freecad
             # cura
             # kicad-small
@@ -105,7 +106,6 @@ in {
             noisetorch
 
             # hardware management tools
-            (lib.mkIf hardware.piperMouse.enable piper)
             (lib.mkIf hardware.openRGB.enable openrgb)
             (lib.mkIf hardware.viaKeyboard.enable via)
 

configurations/nixos/defiant/configuration.nix

@@ -296,7 +296,7 @@
       extensions = {
         sonos.enable = true;
         jellyfin.enable = true;
-        wyoming.enable = true;
+        wyoming.enable = false; # Temporarily disabled due to dependency conflict in wyoming-piper
       };
     };
 

configurations/nixos/emergent/nvidia-drivers.nix

@@ -27,7 +27,7 @@
     # Enable this if you have graphical corruption issues or application crashes after waking
     # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
     # of just the bare essentials.
-    powerManagement.enable = false;
+    powerManagement.enable = true;
 
     # Fine-grained power management. Turns off GPU when not in use.
     # Experimental and only works on modern Nvidia GPUs (Turing or newer).

configurations/nixos/twilight/nvidia-drivers.nix

@@ -21,7 +21,7 @@
       # Enable this if you have graphical corruption issues or application crashes after waking
       # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
       # of just the bare essentials.
-      powerManagement.enable = false;
+      powerManagement.enable = true;
 
       # Fine-grained power management. Turns off GPU when not in use.
       # Experimental and only works on modern Nvidia GPUs (Turing or newer).

flake.lock

@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755519972,
+        "lastModified": 1756733629,
-        "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=",
+        "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d",
+        "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1755921820,
+        "lastModified": 1756699417,
-        "narHash": "sha256-xTRXoaGtuIi4VvJNGuHC8DPHnEIJUqVtt7kqU8MdXes=",
+        "narHash": "sha256-rpRy5ae5ijEGaK+Cr66NqCQJ6ZeUE5Zi8gUWgKhesto=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "c43149f02063de9b0d75c2b45f54631bd82667b2",
+        "rev": "007b803d1eff595d25e7886e83054dbd038bf029",
         "type": "gitlab"
       },
       "original": {
@@ -118,11 +118,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755914636,
+        "lastModified": 1756734952,
-        "narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=",
+        "narHash": "sha256-H6jmduj4QIncLPAPODPSG/8ry9lpr1kRq6fYytU52qU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0",
+        "rev": "29ab63bbb3d9eee4a491f7ce701b189becd34068",
         "type": "github"
       },
       "original": {
@@ -217,11 +217,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755914146,
+        "lastModified": 1756692643,
-        "narHash": "sha256-ew98ilw4NTodKlILnr3ndsT0Aj9JhqC507JB3efa0pY=",
+        "narHash": "sha256-SVos3AYuLvF6bD8Y0b6EiLABoEaiAOa4M/fTCBe0FV8=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "ff42a421ff1d415caa0125e6af6f3bd82e642838",
+        "rev": "2f1d16db96f1ce8ee3c893ea9dc49c0035846988",
         "type": "github"
       },
       "original": {
@@ -232,11 +232,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1755330281,
+        "lastModified": 1756245047,
-        "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=",
+        "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0",
+        "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7",
         "type": "github"
       },
       "original": {
@@ -264,11 +264,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1755615617,
+        "lastModified": 1756542300,
-        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
         "type": "github"
       },
       "original": {

modules/home-manager-modules/openssh.nix

@@ -45,8 +45,13 @@
           services.ssh-agent.enable = true;
           programs.ssh = {
             enable = true;
+            enableDefaultConfig = false;
+            matchBlocks = {
+              "*" = {
                 compression = true;
                 addKeysToAgent = "confirm";
+              };
+            };
             extraConfig = lib.strings.concatLines (
               builtins.map (hostKey: "IdentityFile ~/.ssh/${hostKey.path}") config.programs.openssh.hostKeys
             );

modules/home-manager-modules/programs/default.nix

@@ -6,11 +6,13 @@
     ./makemkv.nix
     ./obs.nix
     ./anki.nix
+    ./piper.nix
     ./qbittorrent.nix
     ./discord.nix
     ./obsidian.nix
     ./prostudiomasters.nix
     ./idea.nix
+    ./krita.nix
     ./protonvpn.nix
     ./calibre.nix
     ./bruno.nix

modules/home-manager-modules/programs/krita.nix

@@ -0,0 +1,30 @@
+{
+  lib,
+  pkgs,
+  config,
+  osConfig,
+  ...
+}: {
+  options.programs.krita = {
+    enable = lib.mkEnableOption "enable krita";
+  };
+
+  config = lib.mkIf config.programs.krita.enable (lib.mkMerge [
+    {
+      home.packages = with pkgs; [
+        krita
+      ];
+    }
+    (
+      lib.mkIf osConfig.host.impermanence.enable {
+        home.persistence."/persist${config.home.homeDirectory}" = {
+          directories = [
+            "${config.xdg.configHome}/kritarc"
+            "${config.xdg.dataHome}/krita"
+          ];
+          allowOther = true;
+        };
+      }
+    )
+  ]);
+}

modules/home-manager-modules/programs/piper.nix

@@ -0,0 +1,17 @@
+{
+  lib,
+  pkgs,
+  config,
+  osConfig,
+  ...
+}: {
+  options.programs.piper = {
+    enable = lib.mkEnableOption "enable piper";
+  };
+
+  config = lib.mkIf config.programs.piper.enable {
+    home.packages = with pkgs; [
+      piper
+    ];
+  };
+}

modules/nixos-modules/server/forgejo.nix

@@ -19,6 +19,12 @@ in {
 
   config = lib.mkIf config.services.forgejo.enable (lib.mkMerge [
     {
+      assertions = [
+        {
+          assertion = config.services.forgejo.settings.server.BUILTIN_SSH_SERVER_USER == config.users.users.git.name;
+          message = "Forgejo BUILTIN_SSH_SERVER_USER hardcoded value does not match expected git user name";
+        }
+      ];
       host = {
         reverse_proxy.subdomains.${config.services.forgejo.subdomain} = {
           target = "http://localhost:${toString forgejoPort}";
@@ -52,7 +58,7 @@ in {
             START_SSH_SERVER = true;
             SSH_LISTEN_PORT = sshPort;
             SSH_PORT = 22;
-            BUILTIN_SSH_SERVER_USER = config.users.users.git.name;
+            BUILTIN_SSH_SERVER_USER = "git";
             ROOT_URL = "https://git.jan-leila.com";
           };
           service = {