risky business

flake.nix

@@ -54,10 +54,7 @@
               users = {
 
                 till = {
-                  imports = [
+                  imports = [ ./home ];
-                  ./home
-                  ./users/till-home.nix
-                  ];
                 };
 
                 alt = { imports = [ ./home/alt.nix ]; };

home/default.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 
 {
-
   home.username = "till";
   home.homeDirectory = "/home/till";
 

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

home/gpg.nix

@@ -7,7 +7,9 @@
     enableSshSupport = true;
   };
 
-  programs.gpg.settings = {
+  programs.gpg = {
+    homedir = "${config.xdg.dataHome}/gnupg";
+    settings = {
       no-emit-version = true;
       no-comments = true;
       keyserver = "hkps://keys.openpgp.org/";
@@ -20,12 +22,5 @@
       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";
   };
 }

home/guest.nix

@@ -3,55 +3,32 @@
 {
   home.username = "guest";
   home.homeDirectory = "/home/guest";
-  home.stateVersion = "22.11";
 
-  nixpkgs = {
+  imports = [
-    config = {
+    ./minimal.nix
-      allowUnfree = true;
-      allowUnfreePredicate = (_: true);
-    };
-  };
 
-  programs.home-manager.enable = true;
+    ./firefox.nix
-
+    ./fish.nix
-  xdg.userDirs = {
+    ./fonts.nix
-    enable = true;
+    ./foot.nix
-    createDirectories = true;
+    ./gnome
-    download = "${config.home.homeDirectory}/tmp";
+    ./nvim
-    music = "${config.home.homeDirectory}/media/music";
+    ./tmux
-    pictures = "${config.home.homeDirectory}/media/img";
+    ./user-dirs.nix
-    videos = "${config.home.homeDirectory}/media/vid";
+  ];
-    documents = "${config.home.homeDirectory}/misc";
-    templates = "${config.xdg.dataHome}/templates";
-  };
 
   home.packages = with pkgs; [
-    fzf
+    ffmpeg
-    silver-searcher
+    keepassxc
-    tmux
+    mpv
-    nodejs
-    wl-clipboard
     qbittorrent
     vlc
-    mpv
+    wl-clipboard
-    ffmpeg
     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;

home/mail/default.nix

@@ -227,6 +227,8 @@
         };
         passwordCommand = "pass other/ksh_systemli";
       };
+    };
+  };
 
     programs.neovim.plugins = with pkgs.vimPlugins; [ lazy-nvim ];
 
@@ -239,6 +241,5 @@
         }
       }
     '';
-    };
+
-  };
 }

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";
+  };
 }

home/ssh.nix

@@ -47,7 +47,7 @@ in
         identityFile = certs.personal;
       };
 
-      "homer fernseher" = {
+      "homer homer.fritz.box" = {
         hostname = "homer";
         user = "till";
         identityFile = certs.personal;

hosts/homer/default.nix

@@ -5,12 +5,13 @@
 
   imports = [
     ./hardware.nix
-    ../system
+    ../../system
-    ../system/desktop
+    ../../system/desktop
-    ../system/desktop/gnome.nix
+    ../../system/desktop/gnome.nix
-    ../system/desktop/steam.nix
+    ../../system/desktop/steam.nix
-    ../system/desktop/remote-desktop.nix
+    ../../system/desktop/remote-desktop.nix
-    ../system/media-server.nix
+    ../../system/desktop/media-server.nix
-    ../users/guest.nix
+    ../../users/till.nix
+    ../../users/guest.nix
   ];
 }

system/desktop/media-server.nix

@@ -5,6 +5,7 @@
     enable = true;
     group = "media";
   };
+
   services.radarr = {
     enable = true;
     group = "media";