chore(users): restructure

hosts/radix-balthica/default.nix

@@ -19,7 +19,7 @@
     # Source: https://nixos.wiki/wiki/ZFS
     boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
 
-    users.users.nixos.openssh.authorizedKeys.keyFiles = [../../users/malte/yubikey.pub];
+    users.users.nixos.openssh.authorizedKeys.keyFiles = [../../secrets/pub/yubikey.pub];
 
     environment.systemPackages = with pkgs; [
       # For special computers

modules/base-system.nix

@@ -97,7 +97,7 @@ in {
       useDefaultShell = true;
       group = config.users.groups.hydra-minion.name;
       openssh.authorizedKeys.keyFiles = [
-        ../users/malte/yubikey.pub
+        ../secrets/pub/yubikey.pub
         ../secrets/hydra-overseer.pub
       ];
     };
@@ -118,7 +118,7 @@ in {
     # Tailscale exit node seem to have a problem with strict checking
     networking.firewall.checkReversePath = "loose";
     # Add yubikey for root authentication
-    users.users.root.openssh.authorizedKeys.keyFiles = [../users/malte/yubikey.pub];
+    users.users.root.openssh.authorizedKeys.keyFiles = [../secrets/pub/yubikey.pub];
     # Enable mosh for some SSH superpower
     programs.mosh.enable = pkgs.lib.mkDefault true;
 

modules/deck.nix

@@ -35,7 +35,7 @@ in {
       # Yes, use the best, please
       shell = pkgs.fish;
       # Allow my yubikey everywhere
-      openssh.authorizedKeys.keyFiles = [../users/malte/yubikey.pub];
+      openssh.authorizedKeys.keyFiles = [../secrets/pub/yubikey.pub];
     };
 
     # include the sd card, if any is inserted
@@ -49,7 +49,7 @@ in {
       };
     };
 
-    home-manager.users.deck.imports = [../users/deck/home.nix inputs.nix-colors.homeManagerModule inputs.hyprland.homeManagerModules.default];
+    home-manager.users.deck.imports = [../users/deck/default.nix inputs.nix-colors.homeManagerModule inputs.hyprland.homeManagerModules.default];
     programs.fish.enable = true;
 
     services.flatpak.enable = true;

modules/malte.nix

@@ -34,11 +34,11 @@ in {
       # Yes, use the best, please
       shell = pkgs.fish;
       # Allow my yubikey everywhere
-      openssh.authorizedKeys.keyFiles = [../users/malte/yubikey.pub];
+      openssh.authorizedKeys.keyFiles = [../secrets/pub/yubikey.pub];
     };
     users.groups.adbusers = {};
 
-    home-manager.users.malte.imports = [../users/malte/home.nix inputs.nix-colors.homeManagerModule inputs.hyprland.homeManagerModules.default];
+    home-manager.users.malte.imports = [../users/malte/default.nix inputs.nix-colors.homeManagerModule inputs.hyprland.homeManagerModules.default];
     programs.fish.enable = true;
 
     services.udev.packages = [

modules/marie.nix

@@ -27,7 +27,7 @@ in {
     };
 
     programs.fish.enable = true;
-    home-manager.users.marie.imports = [../users/marie/home.nix];
+    home-manager.users.marie.imports = [../users/marie/default.nix];
 
     sops.secrets = let
       sopsFile = ../secrets/users/marie/secrets.yaml;

users/malte/default.nix

@@ -103,19 +103,19 @@
   };
 in {
   imports = [
-    ./git.nix
+    ./modules/git.nix
-    ./shell.nix
+    ./modules/shell.nix
-    ./kitty.nix
+    ./modules/kitty.nix
-    ./gpg.nix
+    ./modules/gpg.nix
-    ./mail.nix
+    ./modules/mail.nix
-    ./pass.nix
+    ./modules/pass.nix
-    ./zathura.nix
+    ./modules/zathura.nix
-    ./scarlett-solo.nix
+    ./modules/scarlett-solo.nix
-    ./helix.nix
+    ./modules/helix.nix
-    ./mpv.nix
+    ./modules/mpv.nix
-    ./broot.nix
+    ./modules/broot.nix
-    ./hypr.nix
+    ./modules/hypr.nix
-    ./notes.nix
+    ./modules/notes.nix
     ../modules/restic-backup.nix
     ../modules/colors.nix
     ../modules/profiles-cleanup.nix

users/malte/modules/hypr.nix

@@ -7,8 +7,8 @@
 }: let
   cfg = config.settings.hyprland;
 
-  bemenu = pkgs.callPackage ../../pkgs/bemenu-configured.nix {color = config.colorsDark.colors;};
+  bemenu = pkgs.callPackage ../../../pkgs/bemenu-configured.nix {color = config.colorsDark.colors;};
-  doNotDisturb = pkgs.callPackage ../../pkgs/do-not-disturb.nix {};
+  doNotDisturb = pkgs.callPackage ../../../pkgs/do-not-disturb.nix {};
 
   hyprpaperConfig = ''
     preload   = ~/Downloads/wallpaper.jpg

users/malte/modules/mail.nix

@@ -24,7 +24,7 @@
   notmuchNew = pkgs.writeShellApplication {
     name = "notmuch-new";
     runtimeInputs = with pkgs; [notmuch];
-    text = builtins.readFile ../../scripts/notmuch-new.sh;
+    text = builtins.readFile ../../../scripts/notmuch-new.sh;
   };
 
   # Quote the given string

users/malte/modules/mako.nix

@@ -4,7 +4,7 @@
   ...
 }: let
   colDark = name: "#${config.colorsDark.colors.${name}}";
-  doNotDisturb = pkgs.callPackage ../../pkgs/do-not-disturb.nix {};
+  doNotDisturb = pkgs.callPackage ../../../pkgs/do-not-disturb.nix {};
 in {
   services.mako = {
     enable = true;

users/malte/modules/notes.nix

@@ -9,7 +9,7 @@
       pkgs.ncurses
       pkgs.git
     ];
-    text = builtins.readFile ../../scripts/note.sh;
+    text = builtins.readFile ../../../scripts/note.sh;
   };
 in {
   home.packages = [note];

users/malte/modules/pass.nix

@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  bemenuConfigured = pkgs.callPackage ../../pkgs/bemenu-configured.nix {
+  bemenuConfigured = pkgs.callPackage ../../../pkgs/bemenu-configured.nix {
     color = config.colorsDark.colors;
     cmd = "bemenu";
   };

users/malte/modules/waybar.nix

@@ -11,7 +11,7 @@
   doNotDisturbJson = pkgs.writeShellApplication {
     name = "do-not-disturb-json";
     runtimeInputs = [
-      (pkgs.callPackage ../../pkgs/do-not-disturb.nix {})
+      (pkgs.callPackage ../../../pkgs/do-not-disturb.nix {})
       pkgs.coreutils
       pkgs.jq
     ];