modules/*: Fix various name mistakes and other issues

5 files changed, 26 insertions, 29 deletions

diff --git a/modules/common/default.nix b/modules/common/soispha/default.nix
index facc9e9f..9d6038cb 100644
--- a/modules/common/default.nix
+++ b/modules/common/soispha/default.nix
@@ -17,19 +17,34 @@
 }: {
   # 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;
-      stateVersion = "23.05";
-      enableNixpkgsReleaseCheck = true;
+  home-manager.users.soispha.home = {
+    username = "soispha";
+    homeDirectory = config.users.users.soispha.home;
+    stateVersion = "23.05";
+    enableNixpkgsReleaseCheck = true;
+  };
+
+  vhack = {
+    postgresql.enable = false;
+    persist = {
+      enable = true;
+
+      directories = [
+        "/etc/nixos"
+        "/var/lib/systemd"
+        "/var/log"
+      ];
     };
 
-    root.home = {
-      username = "root";
-      homeDirectory = config.users.users.root.home;
-      stateVersion = "23.05";
-      enableNixpkgsReleaseCheck = true;
+    services.backup = {
+      storagebox = {
+        enable = lib.mkDefault true;
+        user = "u459143-sub1";
+        sshHostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs";
+      };
+      local = {
+        enable = lib.mkDefault true;
+      };
     };
   };
 
@@ -48,14 +63,6 @@
       enable = lib.mkDefault true;
     };
     home-manager.enable = true;
-    impermanence = {
-      enable = true;
-
-      directories = [
-        "/etc/nixos"
-        "/var/lib/systemd"
-      ];
-    };
 
     polkit.enable = true;
     xdg.enable = true;
@@ -65,15 +72,6 @@
         enable = true;
         user = "soispha";
       };
-      backup = {
-        storagebox = {
-          enable = lib.mkDefault true;
-          user = "u459143-sub1";
-        };
-        local = {
-          enable = lib.mkDefault true;
-        };
-      };
       fwupd.enable = true;
       mako.enable = true;
       mpd = {
@@ -92,7 +90,6 @@
         };
       };
       ollama.enable = false;
-      postgresql.enable = false;
       printing.enable = true;
       scanning.enable = true;
       snapper.enable = true;
diff --git a/modules/common/hooks/default.nix b/modules/common/soispha/hooks/default.nix
index 5b694039..5b694039 100644
--- a/modules/common/hooks/default.nix
+++ b/modules/common/soispha/hooks/default.nix
diff --git a/modules/common/hooks/scripts/sync-git-repo.sh b/modules/common/soispha/hooks/scripts/sync-git-repo.sh
index fe0d0085..fe0d0085 100755
--- a/modules/common/hooks/scripts/sync-git-repo.sh
+++ b/modules/common/soispha/hooks/scripts/sync-git-repo.sh
diff --git a/modules/common/projects.json b/modules/common/soispha/projects.json
index ea14d6e4..ea14d6e4 100644
--- a/modules/common/projects.json
+++ b/modules/common/soispha/projects.json
diff --git a/modules/common/projects.json.license b/modules/common/soispha/projects.json.license
index eae6a84c..eae6a84c 100644
--- a/modules/common/projects.json.license
+++ b/modules/common/soispha/projects.json.license