From 0668a962e8169118243b97629a3166e96a451cb3 Mon Sep 17 00:00:00 2001 From: kat witch Date: Thu, 5 Nov 2020 16:46:46 +0000 Subject: [PATCH] Restructured to use a profiles directory for cleaner structure. --- configuration/hosts/beltane/configuration.nix | 2 +- configuration/hosts/litha/configuration.nix | 6 +++--- configuration/hosts/samhain/configuration.nix | 10 +++++----- configuration/hosts/yule/configuration.nix | 10 +++++----- configuration/{ => profiles}/common/default.nix | 4 ++-- configuration/{ => profiles}/common/pbb.nix | 0 configuration/{ => profiles}/common/users.nix | 0 configuration/{ => profiles}/desktop/default.nix | 0 configuration/{ => profiles}/development/default.nix | 0 configuration/{ => profiles}/gaming/default.nix | 0 configuration/{ => profiles}/gnome/default.nix | 0 configuration/{ => profiles}/xfce/default.nix | 0 12 files changed, 16 insertions(+), 16 deletions(-) rename configuration/{ => profiles}/common/default.nix (94%) rename configuration/{ => profiles}/common/pbb.nix (100%) rename configuration/{ => profiles}/common/users.nix (100%) rename configuration/{ => profiles}/desktop/default.nix (100%) rename configuration/{ => profiles}/development/default.nix (100%) rename configuration/{ => profiles}/gaming/default.nix (100%) rename configuration/{ => profiles}/gnome/default.nix (100%) rename configuration/{ => profiles}/xfce/default.nix (100%) diff --git a/configuration/hosts/beltane/configuration.nix b/configuration/hosts/beltane/configuration.nix index 09734676..7fa04be7 100644 --- a/configuration/hosts/beltane/configuration.nix +++ b/configuration/hosts/beltane/configuration.nix @@ -3,7 +3,7 @@ let unstable = import {}; in { imports = [ - ../../common + ../../profiles/common ./hardware-configuration.nix #./services/postgres.nix ./services/znc.nix diff --git a/configuration/hosts/litha/configuration.nix b/configuration/hosts/litha/configuration.nix index e304f663..c8445801 100644 --- a/configuration/hosts/litha/configuration.nix +++ b/configuration/hosts/litha/configuration.nix @@ -8,9 +8,9 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../common - ../../desktop - ../../xfce + ../../profiles/common + ../../profiles/desktop + ../../profiles/xfce ]; # Use the systemd-boot EFI boot loader. diff --git a/configuration/hosts/samhain/configuration.nix b/configuration/hosts/samhain/configuration.nix index adf604ac..409c051c 100644 --- a/configuration/hosts/samhain/configuration.nix +++ b/configuration/hosts/samhain/configuration.nix @@ -4,11 +4,11 @@ imports = [ ./hardware-configuration.nix - ../../common - ../../desktop - ../../gnome - ../../gaming - ../../development + ../../profiles/common + ../../profiles/desktop + ../../profiles/gnome + ../../profiles/gaming + ../../profiles/development ]; boot.loader.systemd-boot.enable = true; diff --git a/configuration/hosts/yule/configuration.nix b/configuration/hosts/yule/configuration.nix index b76a463a..6b28a9fb 100644 --- a/configuration/hosts/yule/configuration.nix +++ b/configuration/hosts/yule/configuration.nix @@ -4,11 +4,11 @@ imports = [ ./hardware-configuration.nix - ../../common - ../../desktop - ../../gnome - ../../gaming - ../../development + ../../profiles/common + ../../profiles/desktop + ../../profiles/gnome + ../../profiles/gaming + ../../profiles/development ]; boot.loader.systemd-boot.enable = true; diff --git a/configuration/common/default.nix b/configuration/profiles/common/default.nix similarity index 94% rename from configuration/common/default.nix rename to configuration/profiles/common/default.nix index 618e8006..405bd5ff 100644 --- a/configuration/common/default.nix +++ b/configuration/profiles/common/default.nix @@ -7,14 +7,14 @@ let }; in { imports = [ - ../../modules + ../../../modules "${home-manager}/nixos" ./pbb.nix ./users.nix ]; nixpkgs.overlays = [ - (self: super: import ../../pkgs { nixpkgs = super.path; }) + (self: super: import ../../../pkgs { nixpkgs = super.path; }) ]; boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; diff --git a/configuration/common/pbb.nix b/configuration/profiles/common/pbb.nix similarity index 100% rename from configuration/common/pbb.nix rename to configuration/profiles/common/pbb.nix diff --git a/configuration/common/users.nix b/configuration/profiles/common/users.nix similarity index 100% rename from configuration/common/users.nix rename to configuration/profiles/common/users.nix diff --git a/configuration/desktop/default.nix b/configuration/profiles/desktop/default.nix similarity index 100% rename from configuration/desktop/default.nix rename to configuration/profiles/desktop/default.nix diff --git a/configuration/development/default.nix b/configuration/profiles/development/default.nix similarity index 100% rename from configuration/development/default.nix rename to configuration/profiles/development/default.nix diff --git a/configuration/gaming/default.nix b/configuration/profiles/gaming/default.nix similarity index 100% rename from configuration/gaming/default.nix rename to configuration/profiles/gaming/default.nix diff --git a/configuration/gnome/default.nix b/configuration/profiles/gnome/default.nix similarity index 100% rename from configuration/gnome/default.nix rename to configuration/profiles/gnome/default.nix diff --git a/configuration/xfce/default.nix b/configuration/profiles/xfce/default.nix similarity index 100% rename from configuration/xfce/default.nix rename to configuration/profiles/xfce/default.nix