zaphyra's git: nixfiles

config/nixos/modules/users/zaphyra: add `niri` graphical session

diff --git a/config/home/zaphyra/configure/gnome.nix b/config/home/zaphyra/configure/gnome.nix
@@ -1,4 +1,5 @@
 {
+  config,
   inputs,
   lib,
   pkgs,

@@ -13,30 +14,25 @@ in
 
   manual.html.enable = true;
 
-  home.sessionVariables = {
-    QT_QPA_PLATFORMTHEME = "gnome";
-  };
+  imports = with homeManagerModules.zaphyra; [
+    services.gnome-keyring
+  ];
 
-  home.persistence."/nix/persist/home/zaphyra".directories = [
+  home.persistence."/nix/persist/home/${config.home.username}".directories = [
     "dconf/.config/dconf"
-    "keyring/.local/share/keyrings"
-    "evolution-data-server/.local/share/evolution"
-    "gnome-online-accounts/.config/goa-1.0"
     "gnome/.local/share/gnome-shell"
   ];
 
+  home.sessionVariables = {
+    QT_QPA_PLATFORMTHEME = "gnome";
+  };
+
   home.packages =
     with pkgs;
     [
-      gnome-calendar
-      gnome-text-editor
-      gnome-podcasts
-      gnome-obfuscate
       gnome-power-manager
-      loupe
-      cozy
-
       refine
+
       xdg-utils
       qgnomeplatform
       wl-clipboard-x11

diff --git a/config/nixos/modules/users/zaphyra.nix b/config/nixos/modules/users/zaphyra.nix
@@ -32,12 +32,11 @@ in
           description = "Katja";
           hashedPasswordFile = config.sops.secrets.zaphyraPassword.path;
           isNormalUser = true;
-          extraGroups =
-            [
-              "ssh"
-              "wheel"
-              "networkmanager"
-            ];
+          extraGroups = [
+            "ssh"
+            "wheel"
+            "networkmanager"
+          ];
           openssh.authorizedKeys.keys = [
             (builtins.readFile "${pkgs.zaphyra-website}/ssh_pubkey.asc")
             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnNyOCX+PopTHuNrfBwEmPM7FC6oM7nFgW/2tvW7ddT"

@@ -69,24 +68,32 @@ in
               programs.yt-dlp
               programs.phockup
               programs.bitwarden-cli
-
-              programs.nautilus
+              programs.chaosctl
 
               programs.firefox
               programs.thunderbird
+
               programs.errands
+              programs.gnome-calendar
 
               programs.fractal
+              programs.dino
+              programs.gajim
               programs.tuba
 
+              programs.nautilus
+
               programs.typst
               programs.ocrmypdf
               programs.papers
               programs.pdfarranger
               programs.libreoffice
               programs.apostrophe
+              programs.gnome-text-editor
 
               programs.celluloid
+              programs.loupe
+              programs.gnome-obfuscate
 
               programs.javascript
             ]

@@ -106,6 +113,13 @@ in
               gnomeExtensions.bluetoothBatteryMeter
             ]
           ))
+
+          (lib.optionals (config.modules.presets.graphical.type == "niri") (
+            with homeManagerModules.zaphyra;
+            [
+              configure.niri
+            ]
+          ))
         ];
       })
     ]