diff --git a/flake.nix b/flake.nix
index 22a9c7d..f7d214e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,10 +54,7 @@
               users = {
 
                 till = {
-                  imports = [
-                  ./home
-                  ./users/till-home.nix
-                  ];
+                  imports = [ ./home ];
                 };
 
                 alt = { imports = [ ./home/alt.nix ]; };
diff --git a/home/default.nix b/home/default.nix
index 3d1df82..5ab1e4f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }:
 
 {
-
   home.username = "till";
   home.homeDirectory = "/home/till";
 
diff --git a/home/gnome/default.nix b/home/gnome/default.nix
index e1f5fef..4103a84 100644
--- a/home/gnome/default.nix
+++ b/home/gnome/default.nix
@@ -7,8 +7,6 @@
     size = 32;
   };
 
-  services.gnome-keyring.enable = false;
-
   home.packages = with pkgs.gnomeExtensions; [
     run-or-raise
     removable-drive-menu
diff --git a/home/gpg.nix b/home/gpg.nix
index fc8c0a4..330bd85 100644
--- a/home/gpg.nix
+++ b/home/gpg.nix
@@ -7,25 +7,20 @@
     enableSshSupport = true;
   };
 
-  programs.gpg.settings = {
-    no-emit-version = true;
-    no-comments = true;
-    keyserver = "hkps://keys.openpgp.org/";
-    keyserver-options = [
-      "no-honor-keyserver-url"
-      "include-revoked"
-    ];
-    personal-cipher-preferences = "AES256 AES192 AES CAST5";
-    personal-digest-preferences = "SHA512 SHA384 SHA256 SHA224";
-    cert-digest-algo = "SHA512";
-    default-preference-list = "SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed";
-  };
-
-  xdg.configFile."scdaemon" = {
-    text = ''
-      disable-ccid
-      pcsc-shared
-    '';
-    target = "../.gnupg/scdaemon.conf";
+  programs.gpg = {
+    homedir = "${config.xdg.dataHome}/gnupg";
+    settings = {
+      no-emit-version = true;
+      no-comments = true;
+      keyserver = "hkps://keys.openpgp.org/";
+      keyserver-options = [
+        "no-honor-keyserver-url"
+        "include-revoked"
+      ];
+      personal-cipher-preferences = "AES256 AES192 AES CAST5";
+      personal-digest-preferences = "SHA512 SHA384 SHA256 SHA224";
+      cert-digest-algo = "SHA512";
+      default-preference-list = "SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed";
+    };
   };
 }
diff --git a/home/guest.nix b/home/guest.nix
index bd0d8f1..429f738 100644
--- a/home/guest.nix
+++ b/home/guest.nix
@@ -3,55 +3,32 @@
 {
   home.username = "guest";
   home.homeDirectory = "/home/guest";
-  home.stateVersion = "22.11";
 
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-      allowUnfreePredicate = (_: true);
-    };
-  };
+  imports = [
+    ./minimal.nix
 
-  programs.home-manager.enable = true;
-
-  xdg.userDirs = {
-    enable = true;
-    createDirectories = true;
-    download = "${config.home.homeDirectory}/tmp";
-    music = "${config.home.homeDirectory}/media/music";
-    pictures = "${config.home.homeDirectory}/media/img";
-    videos = "${config.home.homeDirectory}/media/vid";
-    documents = "${config.home.homeDirectory}/misc";
-    templates = "${config.xdg.dataHome}/templates";
-  };
+    ./firefox.nix
+    ./fish.nix
+    ./fonts.nix
+    ./foot.nix
+    ./gnome
+    ./nvim
+    ./tmux
+    ./user-dirs.nix
+  ];
 
   home.packages = with pkgs; [
-    fzf
-    silver-searcher
-    tmux
-    nodejs
-    wl-clipboard
+    ffmpeg
+    keepassxc
+    mpv
     qbittorrent
     vlc
-    mpv
-    ffmpeg
+    wl-clipboard
     yt-dlp
-    libnotify
-    keepassxc
   ];
 
   services.syncthing.enable = true;
 
-  imports = [
-    ./gnome
-    ./firefox.nix
-    ./foot.nix
-    ./fish.nix
-    ./tmux
-    ./nvim
-    ./fonts.nix
-  ];
-
   programs.nix-index = {
     enable = true;
     enableFishIntegration = true;
diff --git a/home/mail/default.nix b/home/mail/default.nix
index 0335383..a623ced 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -227,18 +227,19 @@
         };
         passwordCommand = "pass other/ksh_systemli";
       };
-
-      programs.neovim.plugins = with pkgs.vimPlugins; [ lazy-nvim ];
-
-      xdg.configFile."nvim/lua/woof-vim.lua".text = ''
-        return {
-          "woof-vim",
-          name = "woof-vim",
-          dev = {
-            path = "~/devel"
-          }
-        }
-      '';
     };
   };
+
+    programs.neovim.plugins = with pkgs.vimPlugins; [ lazy-nvim ];
+
+    xdg.configFile."nvim/lua/woof-vim.lua".text = ''
+      return {
+        "woof-vim",
+        name = "woof-vim",
+        dev = {
+          path = "~/devel"
+        }
+      }
+    '';
+
 }
diff --git a/home/password-store.nix b/home/password-store.nix
index d9ba727..8839f20 100644
--- a/home/password-store.nix
+++ b/home/password-store.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 
 {
+  services.gnome-keyring.enable = false;
 
   programs.password-store = {
     enable = true;
@@ -21,4 +22,11 @@
     pinentry-all
   ];
 
+  xdg.configFile."scdaemon" = {
+    text = ''
+      disable-ccid
+      pcsc-shared
+    '';
+    target = "../.gnupg/scdaemon.conf";
+  };
 }
diff --git a/home/ssh.nix b/home/ssh.nix
index 6e5a1cf..bb71569 100644
--- a/home/ssh.nix
+++ b/home/ssh.nix
@@ -47,7 +47,7 @@ in
         identityFile = certs.personal;
       };
 
-      "homer fernseher" = {
+      "homer homer.fritz.box" = {
         hostname = "homer";
         user = "till";
         identityFile = certs.personal;
diff --git a/hosts/homer/default.nix b/hosts/homer/default.nix
index 0182d7a..1f81a32 100644
--- a/hosts/homer/default.nix
+++ b/hosts/homer/default.nix
@@ -5,12 +5,13 @@
 
   imports = [
     ./hardware.nix
-    ../system
-    ../system/desktop
-    ../system/desktop/gnome.nix
-    ../system/desktop/steam.nix
-    ../system/desktop/remote-desktop.nix
-    ../system/media-server.nix
-    ../users/guest.nix
+    ../../system
+    ../../system/desktop
+    ../../system/desktop/gnome.nix
+    ../../system/desktop/steam.nix
+    ../../system/desktop/remote-desktop.nix
+    ../../system/desktop/media-server.nix
+    ../../users/till.nix
+    ../../users/guest.nix
   ];
 }
diff --git a/system/desktop/media.nix b/system/desktop/media-server.nix
similarity index 99%
rename from system/desktop/media.nix
rename to system/desktop/media-server.nix
index cdd99db..63023b5 100644
--- a/system/desktop/media.nix
+++ b/system/desktop/media-server.nix
@@ -5,6 +5,7 @@
     enable = true;
     group = "media";
   };
+
   services.radarr = {
     enable = true;
     group = "media";