From 5a38227e6883bf7639fd49801718a57a663feb9b Mon Sep 17 00:00:00 2001 From: willemml Date: Mon, 13 Nov 2023 02:48:41 -0800 Subject: [PATCH] Moves /nixos/modules/users to /nixos/users --- nixos/hosts/nixbox.nix | 2 +- nixos/hosts/vms/aarch64-darwin-host/home-console.nix | 2 +- nixos/hosts/vms/aarch64-darwin-host/minimal.nix | 2 +- nixos/profiles/default.nix | 2 +- nixos/{modules => }/users/willem/default.nix | 0 nixos/{modules => }/users/willem/home.nix | 2 +- nixos/{modules => }/users/willem/vm.nix | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename nixos/{modules => }/users/willem/default.nix (100%) rename nixos/{modules => }/users/willem/home.nix (85%) rename nixos/{modules => }/users/willem/vm.nix (100%) diff --git a/nixos/hosts/nixbox.nix b/nixos/hosts/nixbox.nix index dba6fd6..4a68e92 100644 --- a/nixos/hosts/nixbox.nix +++ b/nixos/hosts/nixbox.nix @@ -9,7 +9,7 @@ (modulesPath + "/installer/scan/not-detected.nix") ../profiles/hyprland.nix ../profiles/default.nix - ../modules/users/willem/home.nix + ../users/willem/home.nix ../modules/zerotier.nix ]; diff --git a/nixos/hosts/vms/aarch64-darwin-host/home-console.nix b/nixos/hosts/vms/aarch64-darwin-host/home-console.nix index 9ecf653..9bb160e 100644 --- a/nixos/hosts/vms/aarch64-darwin-host/home-console.nix +++ b/nixos/hosts/vms/aarch64-darwin-host/home-console.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ../../../modules/users/willem/home.nix + ../../../users/willem/home.nix ./minimal.nix ]; } diff --git a/nixos/hosts/vms/aarch64-darwin-host/minimal.nix b/nixos/hosts/vms/aarch64-darwin-host/minimal.nix index 969b2d1..56da6e8 100644 --- a/nixos/hosts/vms/aarch64-darwin-host/minimal.nix +++ b/nixos/hosts/vms/aarch64-darwin-host/minimal.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ../../../modules/users/willem/vm.nix + ../../../users/willem/vm.nix ../../../modules/vm/headless.nix ../../../modules/vm/aarch64-darwin-host.nix ../../../profiles/default.nix diff --git a/nixos/profiles/default.nix b/nixos/profiles/default.nix index d5fe8e9..e3b0694 100644 --- a/nixos/profiles/default.nix +++ b/nixos/profiles/default.nix @@ -7,7 +7,7 @@ imports = [ ../../common/system.nix ../modules/nix/use-flake-pkgs.nix - ../modules/users/willem/default.nix + ../users/willem/default.nix inputs.nix-index-database.nixosModules.nix-index ]; diff --git a/nixos/modules/users/willem/default.nix b/nixos/users/willem/default.nix similarity index 100% rename from nixos/modules/users/willem/default.nix rename to nixos/users/willem/default.nix diff --git a/nixos/modules/users/willem/home.nix b/nixos/users/willem/home.nix similarity index 85% rename from nixos/modules/users/willem/home.nix rename to nixos/users/willem/home.nix index 640a233..27c145b 100644 --- a/nixos/modules/users/willem/home.nix +++ b/nixos/users/willem/home.nix @@ -10,7 +10,7 @@ home-manager.users.willem = { imports = [ - ../../../../home/linux/default.nix + ../../../home/linux/default.nix ]; }; diff --git a/nixos/modules/users/willem/vm.nix b/nixos/users/willem/vm.nix similarity index 100% rename from nixos/modules/users/willem/vm.nix rename to nixos/users/willem/vm.nix