From 7ce5026e62c6a963d90c3b8c973d7319fa0f92a4 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Mon, 28 Apr 2025 21:03:00 +0100 Subject: [PATCH] users/jordan: nest common config --- users/jordan/{ => common}/git.nix | 0 users/jordan/{ => common}/gpg.nix | 0 .../jordan/{ => common}/graphical/default.nix | 0 .../jordan/{ => common}/graphical/firefox.nix | 0 users/jordan/{ => common}/graphical/gnome.nix | 0 .../graphical/hyprland/default.nix | 0 .../graphical/hyprland/hypridle.nix | 0 .../graphical/hyprland/hyprlock.nix | 0 .../graphical/hyprland/hyprpaper.nix | 0 .../graphical/hyprland/waybar.css | 0 .../graphical/hyprland/waybar.nix | 0 .../{ => common}/graphical/thunderbird.nix | 0 users/jordan/{ => common}/neovim.nix | 0 users/jordan/{ => common}/pass.nix | 0 users/jordan/{ => common}/shell.nix | 0 users/jordan/{ => common}/ssh.nix | 0 users/jordan/default.nix | 21 ++++++++++++------- 17 files changed, 13 insertions(+), 8 deletions(-) rename users/jordan/{ => common}/git.nix (100%) rename users/jordan/{ => common}/gpg.nix (100%) rename users/jordan/{ => common}/graphical/default.nix (100%) rename users/jordan/{ => common}/graphical/firefox.nix (100%) rename users/jordan/{ => common}/graphical/gnome.nix (100%) rename users/jordan/{ => common}/graphical/hyprland/default.nix (100%) rename users/jordan/{ => common}/graphical/hyprland/hypridle.nix (100%) rename users/jordan/{ => common}/graphical/hyprland/hyprlock.nix (100%) rename users/jordan/{ => common}/graphical/hyprland/hyprpaper.nix (100%) rename users/jordan/{ => common}/graphical/hyprland/waybar.css (100%) rename users/jordan/{ => common}/graphical/hyprland/waybar.nix (100%) rename users/jordan/{ => common}/graphical/thunderbird.nix (100%) rename users/jordan/{ => common}/neovim.nix (100%) rename users/jordan/{ => common}/pass.nix (100%) rename users/jordan/{ => common}/shell.nix (100%) rename users/jordan/{ => common}/ssh.nix (100%) diff --git a/users/jordan/git.nix b/users/jordan/common/git.nix similarity index 100% rename from users/jordan/git.nix rename to users/jordan/common/git.nix diff --git a/users/jordan/gpg.nix b/users/jordan/common/gpg.nix similarity index 100% rename from users/jordan/gpg.nix rename to users/jordan/common/gpg.nix diff --git a/users/jordan/graphical/default.nix b/users/jordan/common/graphical/default.nix similarity index 100% rename from users/jordan/graphical/default.nix rename to users/jordan/common/graphical/default.nix diff --git a/users/jordan/graphical/firefox.nix b/users/jordan/common/graphical/firefox.nix similarity index 100% rename from users/jordan/graphical/firefox.nix rename to users/jordan/common/graphical/firefox.nix diff --git a/users/jordan/graphical/gnome.nix b/users/jordan/common/graphical/gnome.nix similarity index 100% rename from users/jordan/graphical/gnome.nix rename to users/jordan/common/graphical/gnome.nix diff --git a/users/jordan/graphical/hyprland/default.nix b/users/jordan/common/graphical/hyprland/default.nix similarity index 100% rename from users/jordan/graphical/hyprland/default.nix rename to users/jordan/common/graphical/hyprland/default.nix diff --git a/users/jordan/graphical/hyprland/hypridle.nix b/users/jordan/common/graphical/hyprland/hypridle.nix similarity index 100% rename from users/jordan/graphical/hyprland/hypridle.nix rename to users/jordan/common/graphical/hyprland/hypridle.nix diff --git a/users/jordan/graphical/hyprland/hyprlock.nix b/users/jordan/common/graphical/hyprland/hyprlock.nix similarity index 100% rename from users/jordan/graphical/hyprland/hyprlock.nix rename to users/jordan/common/graphical/hyprland/hyprlock.nix diff --git a/users/jordan/graphical/hyprland/hyprpaper.nix b/users/jordan/common/graphical/hyprland/hyprpaper.nix similarity index 100% rename from users/jordan/graphical/hyprland/hyprpaper.nix rename to users/jordan/common/graphical/hyprland/hyprpaper.nix diff --git a/users/jordan/graphical/hyprland/waybar.css b/users/jordan/common/graphical/hyprland/waybar.css similarity index 100% rename from users/jordan/graphical/hyprland/waybar.css rename to users/jordan/common/graphical/hyprland/waybar.css diff --git a/users/jordan/graphical/hyprland/waybar.nix b/users/jordan/common/graphical/hyprland/waybar.nix similarity index 100% rename from users/jordan/graphical/hyprland/waybar.nix rename to users/jordan/common/graphical/hyprland/waybar.nix diff --git a/users/jordan/graphical/thunderbird.nix b/users/jordan/common/graphical/thunderbird.nix similarity index 100% rename from users/jordan/graphical/thunderbird.nix rename to users/jordan/common/graphical/thunderbird.nix diff --git a/users/jordan/neovim.nix b/users/jordan/common/neovim.nix similarity index 100% rename from users/jordan/neovim.nix rename to users/jordan/common/neovim.nix diff --git a/users/jordan/pass.nix b/users/jordan/common/pass.nix similarity index 100% rename from users/jordan/pass.nix rename to users/jordan/common/pass.nix diff --git a/users/jordan/shell.nix b/users/jordan/common/shell.nix similarity index 100% rename from users/jordan/shell.nix rename to users/jordan/common/shell.nix diff --git a/users/jordan/ssh.nix b/users/jordan/common/ssh.nix similarity index 100% rename from users/jordan/ssh.nix rename to users/jordan/common/ssh.nix diff --git a/users/jordan/default.nix b/users/jordan/default.nix index 09319e7..c7b7ef6 100644 --- a/users/jordan/default.nix +++ b/users/jordan/default.nix @@ -1,11 +1,16 @@ { inputs, + lib, config, pkgs, ... }: let + inherit (lib) + optional + ; name = "jordan"; + hostFile = ./. + "/${config.networking.hostName}.nix"; in { age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age"; @@ -31,14 +36,14 @@ in home-manager.users.${name} = { imports = [ - ./git.nix - ./gpg.nix - ./graphical - ./neovim.nix - ./pass.nix - ./shell.nix - ./ssh.nix - ]; + ./common/git.nix + ./common/gpg.nix + ./common/graphical + ./common/neovim.nix + ./common/pass.nix + ./common/shell.nix + ./common/ssh.nix + ] ++ optional (builtins.pathExists hostFile) hostFile; programs.nh.enable = true;