From d008138896b2724366f1a8250b742befa78f8e98 Mon Sep 17 00:00:00 2001 From: Malte Tammena Date: Sun, 10 Mar 2024 17:11:16 +0100 Subject: [PATCH] chore(users): restructure --- hosts/radix-balthica/default.nix | 2 +- modules/base-system.nix | 4 +-- modules/deck.nix | 4 +-- modules/malte.nix | 4 +-- modules/marie.nix | 2 +- {users/malte => secrets/pub}/yubikey.pub | 0 users/deck/{home.nix => default.nix} | 0 users/malte/{home.nix => default.nix} | 26 ++++++++++---------- users/malte/{ => modules}/broot.nix | 0 users/malte/{ => modules}/conf.nix | 0 users/malte/{ => modules}/git.nix | 0 users/malte/{ => modules}/gpg.nix | 0 users/malte/{ => modules}/gruvbox_dark.conf | 0 users/malte/{ => modules}/gruvbox_light.conf | 0 users/malte/{ => modules}/gtk.nix | 0 users/malte/{ => modules}/helix.nix | 0 users/malte/{ => modules}/hypr.nix | 4 +-- users/malte/{ => modules}/kanshi.nix | 0 users/malte/{ => modules}/kitty.nix | 0 users/malte/{ => modules}/mail.nix | 2 +- users/malte/{ => modules}/mako.nix | 2 +- users/malte/{ => modules}/mpv.nix | 0 users/malte/{ => modules}/notes.nix | 2 +- users/malte/{ => modules}/pass.nix | 2 +- users/malte/{ => modules}/qt.nix | 0 users/malte/{ => modules}/scarlett-solo.nix | 0 users/malte/{ => modules}/shell.nix | 0 users/malte/{ => modules}/unison.nix | 0 users/malte/{ => modules}/waybar.nix | 2 +- users/malte/{ => modules}/zathura.nix | 0 users/marie/{home.nix => default.nix} | 0 31 files changed, 28 insertions(+), 28 deletions(-) rename {users/malte => secrets/pub}/yubikey.pub (100%) rename users/deck/{home.nix => default.nix} (100%) rename users/malte/{home.nix => default.nix} (95%) rename users/malte/{ => modules}/broot.nix (100%) rename users/malte/{ => modules}/conf.nix (100%) rename users/malte/{ => modules}/git.nix (100%) rename users/malte/{ => modules}/gpg.nix (100%) rename users/malte/{ => modules}/gruvbox_dark.conf (100%) rename users/malte/{ => modules}/gruvbox_light.conf (100%) rename users/malte/{ => modules}/gtk.nix (100%) rename users/malte/{ => modules}/helix.nix (100%) rename users/malte/{ => modules}/hypr.nix (98%) rename users/malte/{ => modules}/kanshi.nix (100%) rename users/malte/{ => modules}/kitty.nix (100%) rename users/malte/{ => modules}/mail.nix (99%) rename users/malte/{ => modules}/mako.nix (96%) rename users/malte/{ => modules}/mpv.nix (100%) rename users/malte/{ => modules}/notes.nix (82%) rename users/malte/{ => modules}/pass.nix (94%) rename users/malte/{ => modules}/qt.nix (100%) rename users/malte/{ => modules}/scarlett-solo.nix (100%) rename users/malte/{ => modules}/shell.nix (100%) rename users/malte/{ => modules}/unison.nix (100%) rename users/malte/{ => modules}/waybar.nix (99%) rename users/malte/{ => modules}/zathura.nix (100%) rename users/marie/{home.nix => default.nix} (100%) diff --git a/hosts/radix-balthica/default.nix b/hosts/radix-balthica/default.nix index abbc25e..081ecb7 100644 --- a/hosts/radix-balthica/default.nix +++ b/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 diff --git a/modules/base-system.nix b/modules/base-system.nix index 6da1168..65874f8 100644 --- a/modules/base-system.nix +++ b/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; diff --git a/modules/deck.nix b/modules/deck.nix index 66f1615..6ea73ed 100644 --- a/modules/deck.nix +++ b/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; diff --git a/modules/malte.nix b/modules/malte.nix index 42ddc34..1cd9045 100644 --- a/modules/malte.nix +++ b/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 = [ diff --git a/modules/marie.nix b/modules/marie.nix index 2e36afe..e3526bd 100644 --- a/modules/marie.nix +++ b/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; diff --git a/users/malte/yubikey.pub b/secrets/pub/yubikey.pub similarity index 100% rename from users/malte/yubikey.pub rename to secrets/pub/yubikey.pub diff --git a/users/deck/home.nix b/users/deck/default.nix similarity index 100% rename from users/deck/home.nix rename to users/deck/default.nix diff --git a/users/malte/home.nix b/users/malte/default.nix similarity index 95% rename from users/malte/home.nix rename to users/malte/default.nix index 607e9ff..f5c1b83 100644 --- a/users/malte/home.nix +++ b/users/malte/default.nix @@ -103,19 +103,19 @@ }; in { imports = [ - ./git.nix - ./shell.nix - ./kitty.nix - ./gpg.nix - ./mail.nix - ./pass.nix - ./zathura.nix - ./scarlett-solo.nix - ./helix.nix - ./mpv.nix - ./broot.nix - ./hypr.nix - ./notes.nix + ./modules/git.nix + ./modules/shell.nix + ./modules/kitty.nix + ./modules/gpg.nix + ./modules/mail.nix + ./modules/pass.nix + ./modules/zathura.nix + ./modules/scarlett-solo.nix + ./modules/helix.nix + ./modules/mpv.nix + ./modules/broot.nix + ./modules/hypr.nix + ./modules/notes.nix ../modules/restic-backup.nix ../modules/colors.nix ../modules/profiles-cleanup.nix diff --git a/users/malte/broot.nix b/users/malte/modules/broot.nix similarity index 100% rename from users/malte/broot.nix rename to users/malte/modules/broot.nix diff --git a/users/malte/conf.nix b/users/malte/modules/conf.nix similarity index 100% rename from users/malte/conf.nix rename to users/malte/modules/conf.nix diff --git a/users/malte/git.nix b/users/malte/modules/git.nix similarity index 100% rename from users/malte/git.nix rename to users/malte/modules/git.nix diff --git a/users/malte/gpg.nix b/users/malte/modules/gpg.nix similarity index 100% rename from users/malte/gpg.nix rename to users/malte/modules/gpg.nix diff --git a/users/malte/gruvbox_dark.conf b/users/malte/modules/gruvbox_dark.conf similarity index 100% rename from users/malte/gruvbox_dark.conf rename to users/malte/modules/gruvbox_dark.conf diff --git a/users/malte/gruvbox_light.conf b/users/malte/modules/gruvbox_light.conf similarity index 100% rename from users/malte/gruvbox_light.conf rename to users/malte/modules/gruvbox_light.conf diff --git a/users/malte/gtk.nix b/users/malte/modules/gtk.nix similarity index 100% rename from users/malte/gtk.nix rename to users/malte/modules/gtk.nix diff --git a/users/malte/helix.nix b/users/malte/modules/helix.nix similarity index 100% rename from users/malte/helix.nix rename to users/malte/modules/helix.nix diff --git a/users/malte/hypr.nix b/users/malte/modules/hypr.nix similarity index 98% rename from users/malte/hypr.nix rename to users/malte/modules/hypr.nix index 4d9c4e5..cb6e060 100644 --- a/users/malte/hypr.nix +++ b/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;}; - doNotDisturb = pkgs.callPackage ../../pkgs/do-not-disturb.nix {}; + bemenu = pkgs.callPackage ../../../pkgs/bemenu-configured.nix {color = config.colorsDark.colors;}; + doNotDisturb = pkgs.callPackage ../../../pkgs/do-not-disturb.nix {}; hyprpaperConfig = '' preload = ~/Downloads/wallpaper.jpg diff --git a/users/malte/kanshi.nix b/users/malte/modules/kanshi.nix similarity index 100% rename from users/malte/kanshi.nix rename to users/malte/modules/kanshi.nix diff --git a/users/malte/kitty.nix b/users/malte/modules/kitty.nix similarity index 100% rename from users/malte/kitty.nix rename to users/malte/modules/kitty.nix diff --git a/users/malte/mail.nix b/users/malte/modules/mail.nix similarity index 99% rename from users/malte/mail.nix rename to users/malte/modules/mail.nix index bc200ee..4128048 100644 --- a/users/malte/mail.nix +++ b/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 diff --git a/users/malte/mako.nix b/users/malte/modules/mako.nix similarity index 96% rename from users/malte/mako.nix rename to users/malte/modules/mako.nix index a2772b4..bd78287 100644 --- a/users/malte/mako.nix +++ b/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; diff --git a/users/malte/mpv.nix b/users/malte/modules/mpv.nix similarity index 100% rename from users/malte/mpv.nix rename to users/malte/modules/mpv.nix diff --git a/users/malte/notes.nix b/users/malte/modules/notes.nix similarity index 82% rename from users/malte/notes.nix rename to users/malte/modules/notes.nix index 8fb1e21..d79b18c 100644 --- a/users/malte/notes.nix +++ b/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]; diff --git a/users/malte/pass.nix b/users/malte/modules/pass.nix similarity index 94% rename from users/malte/pass.nix rename to users/malte/modules/pass.nix index 6aa0234..b871eb5 100644 --- a/users/malte/pass.nix +++ b/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"; }; diff --git a/users/malte/qt.nix b/users/malte/modules/qt.nix similarity index 100% rename from users/malte/qt.nix rename to users/malte/modules/qt.nix diff --git a/users/malte/scarlett-solo.nix b/users/malte/modules/scarlett-solo.nix similarity index 100% rename from users/malte/scarlett-solo.nix rename to users/malte/modules/scarlett-solo.nix diff --git a/users/malte/shell.nix b/users/malte/modules/shell.nix similarity index 100% rename from users/malte/shell.nix rename to users/malte/modules/shell.nix diff --git a/users/malte/unison.nix b/users/malte/modules/unison.nix similarity index 100% rename from users/malte/unison.nix rename to users/malte/modules/unison.nix diff --git a/users/malte/waybar.nix b/users/malte/modules/waybar.nix similarity index 99% rename from users/malte/waybar.nix rename to users/malte/modules/waybar.nix index 6319d06..d83a58e 100644 --- a/users/malte/waybar.nix +++ b/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 ]; diff --git a/users/malte/zathura.nix b/users/malte/modules/zathura.nix similarity index 100% rename from users/malte/zathura.nix rename to users/malte/modules/zathura.nix diff --git a/users/marie/home.nix b/users/marie/default.nix similarity index 100% rename from users/marie/home.nix rename to users/marie/default.nix