1 files changed, 62 insertions, 33 deletions

diff --git a/modules/common/soispha/default.nix b/modules/common/soispha/default.nix
index 99970929..640c6e2f 100644
--- a/modules/common/soispha/default.nix
+++ b/modules/common/soispha/default.nix
@@ -15,8 +15,6 @@
   lib,
   ...
 }: {
-  # TODO(@bpeetz): Move this file to default options in their respective modules. <2025-05-31>
-
   home-manager.users.soispha.home = {
     username = "soispha";
     homeDirectory = config.users.users.soispha.home;
@@ -25,6 +23,7 @@
   };
 
   vhack = {
+    openssh.enable = true;
     persist = {
       enable = true;
 
@@ -34,43 +33,32 @@
         "/var/log"
       ];
     };
-
-    services.backup = {
-      storagebox = {
-        enable = true;
-        user = "u459143-sub1";
-        sshHostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs";
-        repositoryPassword =
-          ../../../hosts/by-name/apzu/secrets/storagebox/repository_password.age;
-        sshKey = ../../../hosts/by-name/apzu/secrets/storagebox/ssh_key.age;
-      };
-      local = {
-        enable = true;
-        repositoryPassword = ../../../hosts/by-name/apzu/secrets/local/repository_password.age;
+    services = {
+      mandb.enable = true;
+      backup = {
+        storagebox = {
+          enable = true;
+          user = "u459143-sub1";
+          sshHostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs";
+          repositoryPassword =
+            ../../../hosts/by-name/apzu/secrets/storagebox/repository_password.age;
+          sshKey = ../../../hosts/by-name/apzu/secrets/storagebox/ssh_key.age;
+        };
+        local = {
+          enable = true;
+          repositoryPassword = ../../../hosts/by-name/apzu/secrets/local/repository_password.age;
+        };
       };
     };
   };
 
   soispha = {
-    age.enable = true;
-    boot.enable = true;
-    cleanup.enable = true;
-    documentation.enable = true;
+    services = {
+      mpdpopm.enable = true;
+      dconf.enable = true;
 
-    fonts = {
-      enable = true;
-      enableEmoji = true;
-    };
+      ollama.enable = false;
 
-    hardware = {
-      enable = lib.mkDefault true;
-    };
-    home-manager.enable = true;
-
-    polkit.enable = true;
-    xdg.enable = true;
-
-    services = {
       adb = {
         enable = true;
         user = "soispha";
@@ -127,9 +115,29 @@
           "~/repos"
         ];
       };
-    };
 
+      pipewire.enable = true;
+      plymouth.enable = true;
+      sound.enable = true;
+    };
     programs = {
+      hledger.enable = true;
+
+      starship.enable = true;
+      rofi.enable = true;
+      nixos-option.enable = true;
+      swayidle.enable = true;
+      swaybg.enable = true;
+      foot.enable = true;
+      ausweisapp.enable = true;
+      signal.enable = true;
+      alacritty.enable = true;
+      cargo.enable = true;
+      calibre.enable = true;
+      iamb.enable = true;
+      mergiraf.enable = true;
+      lutris.enable = true;
+
       i3bar-river.enable = true;
       i3status-rust.enable = true;
 
@@ -238,6 +246,27 @@
       fish.enable = true;
     };
 
+    gtk.enable = true;
+    nix.enable = true;
+
+    age.enable = true;
+    boot.enable = true;
+    cleanup.enable = true;
+    documentation.enable = true;
+
+    fonts = {
+      enable = true;
+      enableEmoji = true;
+    };
+
+    hardware = {
+      enable = lib.mkDefault true;
+    };
+    home-manager.enable = true;
+
+    polkit.enable = true;
+    xdg.enable = true;
+
     version.enable = true;
   };
 }