risky business

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

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;

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

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;