From d66317fa973c04315b1c7873b9d94dcc9beb281c Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 12 Aug 2025 10:54:48 -0700 Subject: move profile for home-manager under programs --- .../aarch64-darwin/HQ-KWNY2VH41P/default.nix | 2 +- machines/darwin/aarch64-darwin/mba-m2/default.nix | 2 +- machines/nixos/x86_64-linux/do-rproxy/default.nix | 2 +- .../nixos/x86_64-linux/synology-vm/default.nix | 2 +- profiles/home-manager.nix | 36 ---------------------- profiles/programs/home-manager.nix | 36 ++++++++++++++++++++++ 6 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 profiles/home-manager.nix create mode 100644 profiles/programs/home-manager.nix diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix index 17d09dc..2ffe2cb 100644 --- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix +++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix @@ -7,7 +7,7 @@ { imports = [ - "${self}/profiles/home-manager.nix" + "${self}/profiles/programs/home-manager.nix" "${self}/profiles/darwin/desktop.nix" "${self}/profiles/darwin/keyboard.nix" "${self}/profiles/darwin/nix.nix" diff --git a/machines/darwin/aarch64-darwin/mba-m2/default.nix b/machines/darwin/aarch64-darwin/mba-m2/default.nix index 28b6834..e897cf0 100644 --- a/machines/darwin/aarch64-darwin/mba-m2/default.nix +++ b/machines/darwin/aarch64-darwin/mba-m2/default.nix @@ -15,7 +15,7 @@ }; imports = [ - "${self}/profiles/home-manager.nix" + "${self}/profiles/programs/home-manager.nix" "${self}/profiles/nix/remote-builder.nix" "${self}/profiles/darwin/desktop.nix" "${self}/profiles/darwin/keyboard.nix" diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix index cba3ce5..7281b81 100644 --- a/machines/nixos/x86_64-linux/do-rproxy/default.nix +++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix @@ -19,7 +19,7 @@ (modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/virtualisation/digital-ocean-config.nix") ./disks.nix - "${self}/profiles/home-manager.nix" + "${self}/profiles/programs/home-manager.nix" "${self}/profiles/admin-user/user.nix" "${self}/profiles/admin-user/home-manager.nix" "${self}/profiles/core/boot.nix" diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix index 67dbb56..398b374 100644 --- a/machines/nixos/x86_64-linux/synology-vm/default.nix +++ b/machines/nixos/x86_64-linux/synology-vm/default.nix @@ -32,7 +32,7 @@ imports = [ ./disks.nix ./hardware.nix - "${self}/profiles/home-manager.nix" + "${self}/profiles/programs/home-manager.nix" "${self}/profiles/admin-user/user.nix" "${self}/profiles/admin-user/home-manager.nix" "${self}/profiles/core/boot.nix" diff --git a/profiles/home-manager.nix b/profiles/home-manager.nix deleted file mode 100644 index 78ef3c0..0000000 --- a/profiles/home-manager.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - self, - hostName, - inputs, - config, - adminUser, - ... -}: -{ - home-manager.extraSpecialArgs = { - inherit - self - hostName - inputs - adminUser - ; - } - // { - mainConfig = config; - configPath = "${self}/configs/users/fcuny"; - }; - - home-manager.sharedModules = [ - inputs.agenix.homeManagerModules.default - "${self}/home/modules/userinfo.nix" - "${self}/home/modules/onepassword.nix" - { - nixpkgs.overlays = [ - inputs.agenix.overlays.default - inputs.emacs-overlay.overlay - self.overlays.default - ]; - nixpkgs.config.allowUnfree = true; - } - ]; -} diff --git a/profiles/programs/home-manager.nix b/profiles/programs/home-manager.nix new file mode 100644 index 0000000..78ef3c0 --- /dev/null +++ b/profiles/programs/home-manager.nix @@ -0,0 +1,36 @@ +{ + self, + hostName, + inputs, + config, + adminUser, + ... +}: +{ + home-manager.extraSpecialArgs = { + inherit + self + hostName + inputs + adminUser + ; + } + // { + mainConfig = config; + configPath = "${self}/configs/users/fcuny"; + }; + + home-manager.sharedModules = [ + inputs.agenix.homeManagerModules.default + "${self}/home/modules/userinfo.nix" + "${self}/home/modules/onepassword.nix" + { + nixpkgs.overlays = [ + inputs.agenix.overlays.default + inputs.emacs-overlay.overlay + self.overlays.default + ]; + nixpkgs.config.allowUnfree = true; + } + ]; +} -- cgit v1.2.3