diff --git a/flake/formatter.nix b/flake/formatter.nix
index c3feeac..c3f4c72 100644
--- a/flake/formatter.nix
+++ b/flake/formatter.nix
@@ -11,7 +11,7 @@
             prettier.enable = true;
             just.enable = true;
           };
-          settings.formatter.nixfmt.excludes = [ "modules/home/shell/aliases.nix" ];
+          settings.formatter.nixfmt.excludes = [ "modules/home/programs/shell/aliases.nix" ];
         }).config.build.wrapper;
     };
 }
diff --git a/justfile b/justfile
index 7869d76..0b054ec 100644
--- a/justfile
+++ b/justfile
@@ -28,5 +28,5 @@ install host destination='root@installer':
 repair:
     nix-store --verify --check-contents --repair
 
-repl hostname='$(hostname)':
-    nix repl .#nixosConfigurations.{{ hostname }}
+repl host='$(hostname)':
+    nix repl .#nixosConfigurations.{{ host }}
diff --git a/modules/home/shell/aliases.nix b/modules/home/programs/shell/aliases.nix
similarity index 100%
rename from modules/home/shell/aliases.nix
rename to modules/home/programs/shell/aliases.nix
diff --git a/modules/home/shell/default.nix b/modules/home/programs/shell/default.nix
similarity index 100%
rename from modules/home/shell/default.nix
rename to modules/home/programs/shell/default.nix
diff --git a/modules/home/shell/p10k/default.nix b/modules/home/programs/shell/p10k/default.nix
similarity index 100%
rename from modules/home/shell/p10k/default.nix
rename to modules/home/programs/shell/p10k/default.nix
diff --git a/modules/home/shell/p10k/p10k.zsh b/modules/home/programs/shell/p10k/p10k.zsh
similarity index 100%
rename from modules/home/shell/p10k/p10k.zsh
rename to modules/home/programs/shell/p10k/p10k.zsh
diff --git a/modules/system/services/forgejo/default.nix b/modules/system/services/forgejo/default.nix
index 2c26d84..ad1dae4 100644
--- a/modules/system/services/forgejo/default.nix
+++ b/modules/system/services/forgejo/default.nix
@@ -28,7 +28,7 @@ in
       settings = {
         server = {
           DOMAIN = cfg.domain;
-          ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}/";
+          ROOT_URL = "https://${cfg.domain}/";
           HTTP_PORT = cfg.port;
           LANDING_PAGE = "explore";
         };
@@ -40,7 +40,11 @@ in
         database.SQLITE_JOURNAL_MODE = "WAL";
         cache = {
           ADAPTER = "twoqueue";
-          HOST = ''{"size":100, "recent_ratio":0.25, "ghost_ratio":0.5}'';
+          HOST = builtins.toJSON {
+            size = 100;
+            recent_ratio = 0.25;
+            ghost_ratio = 0.5;
+          };
         };
         "repository.signing".DEFAULT_TRUST_MODEL = "committer";
         security.LOGIN_REMEMBER_DAYS = 365;
diff --git a/modules/system/services/forgejo/ssh.nix b/modules/system/services/forgejo/ssh.nix
index 6d1eeac..77d5e0a 100644
--- a/modules/system/services/forgejo/ssh.nix
+++ b/modules/system/services/forgejo/ssh.nix
@@ -10,8 +10,6 @@
         KbdInteractiveAuthentication = false;
         PermitRootLogin = "no";
         AllowUsers = [ config.users.users.forgejo.name ];
-        # https://forgejo.org/docs/latest/admin/recommendations/#git-over-ssh
-        AcceptEnv = "GIT_PROTOCOL";
       };
     };
   };
diff --git a/users/shared-home.nix b/users/shared-home.nix
index e9c953c..5b14faa 100644
--- a/users/shared-home.nix
+++ b/users/shared-home.nix
@@ -1,15 +1,13 @@
-{ self, ... }:
+{ config, self, ... }:
 {
   imports = [ self.homeManagerModules.default ];
 
-  systemd.user.startServices = "sd-switch";
-
   xdg = {
     enable = true;
     userDirs = {
       enable = true;
       createDirectories = true;
-      extraConfig.XDG_SCREENSHOTS_DIR = "$HOME/Pictures/Screenshots";
+      extraConfig.XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
     };
   };
 }