From 8a583221def34eef52f205b9090a3615a5606b0d Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Fri, 7 Jul 2023 07:57:08 +0100 Subject: [PATCH] Tidying up dir hierarchy --- flake.nix | 8 ++++---- system/{ => kernighan}/kernighan-hardware.nix | 0 system/{ => kernighan}/kernighan.nix | 4 ++-- system/{ => miyamoto}/miyamoto-hardware.nix | 0 system/{ => miyamoto}/miyamoto.nix | 4 ++-- system/{ => ritchie}/ritchie-hardware.nix | 0 system/{ => ritchie}/ritchie.nix | 10 +++++----- system/{ => shared}/desktop-configuration.nix | 0 system/{ => shared}/desktop.nix | 0 system/{ => shared}/filesystem.nix | 0 system/{ => shared}/shared-configuration.nix | 2 +- system/{ => thompson}/thompson-hardware.nix | 0 system/{ => thompson}/thompson.nix | 8 ++++---- 13 files changed, 18 insertions(+), 18 deletions(-) rename system/{ => kernighan}/kernighan-hardware.nix (100%) rename system/{ => kernighan}/kernighan.nix (91%) rename system/{ => miyamoto}/miyamoto-hardware.nix (100%) rename system/{ => miyamoto}/miyamoto.nix (92%) rename system/{ => ritchie}/ritchie-hardware.nix (100%) rename system/{ => ritchie}/ritchie.nix (81%) rename system/{ => shared}/desktop-configuration.nix (100%) rename system/{ => shared}/desktop.nix (100%) rename system/{ => shared}/filesystem.nix (100%) rename system/{ => shared}/shared-configuration.nix (97%) rename system/{ => thompson}/thompson-hardware.nix (100%) rename system/{ => thompson}/thompson.nix (74%) diff --git a/flake.nix b/flake.nix index 4019640..34ab7c0 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ specialArgs.inputs = inputs; modules = [ - ./system/ritchie.nix + ./system/ritchie/ritchie.nix hyprland.nixosModules.default { @@ -55,7 +55,7 @@ specialArgs.inputs = inputs; modules = [ - ./system/thompson.nix + ./system/thompson/thompson.nix hyprland.nixosModules.default { programs.hyprland.enable = true; } @@ -76,7 +76,7 @@ specialArgs.inputs = inputs; modules = [ - ./system/miyamoto.nix + ./system/miyamoto/miyamoto.nix ]; }; @@ -86,7 +86,7 @@ specialArgs.inputs = inputs; modules = [ - ./system/kernighan.nix + ./system/kernighan/kernighan.nix ]; }; }; diff --git a/system/kernighan-hardware.nix b/system/kernighan/kernighan-hardware.nix similarity index 100% rename from system/kernighan-hardware.nix rename to system/kernighan/kernighan-hardware.nix diff --git a/system/kernighan.nix b/system/kernighan/kernighan.nix similarity index 91% rename from system/kernighan.nix rename to system/kernighan/kernighan.nix index a607d57..f90d73c 100644 --- a/system/kernighan.nix +++ b/system/kernighan/kernighan.nix @@ -4,8 +4,8 @@ { imports = [ - ./shared-configuration.nix - ./kernighan-hardware.nix + ../shared-configuration.nix + ./hardware.nix ]; networking = { diff --git a/system/miyamoto-hardware.nix b/system/miyamoto/miyamoto-hardware.nix similarity index 100% rename from system/miyamoto-hardware.nix rename to system/miyamoto/miyamoto-hardware.nix diff --git a/system/miyamoto.nix b/system/miyamoto/miyamoto.nix similarity index 92% rename from system/miyamoto.nix rename to system/miyamoto/miyamoto.nix index 768749c..26cb70f 100644 --- a/system/miyamoto.nix +++ b/system/miyamoto/miyamoto.nix @@ -4,8 +4,8 @@ { imports = [ - ./shared-configuration.nix - ./desktop-configuration.nix + ../shared/shared-configuration.nix + ../shared/desktop-configuration.nix ./miyamoto-hardware.nix ]; diff --git a/system/ritchie-hardware.nix b/system/ritchie/ritchie-hardware.nix similarity index 100% rename from system/ritchie-hardware.nix rename to system/ritchie/ritchie-hardware.nix diff --git a/system/ritchie.nix b/system/ritchie/ritchie.nix similarity index 81% rename from system/ritchie.nix rename to system/ritchie/ritchie.nix index 257313d..260041a 100644 --- a/system/ritchie.nix +++ b/system/ritchie/ritchie.nix @@ -13,11 +13,11 @@ in { imports = [ - ./shared-configuration.nix - ./desktop-configuration.nix - ./desktop.nix + ../shared/shared-configuration.nix + ../shared/desktop-configuration.nix + ../shared/desktop.nix ./ritchie-hardware.nix - ./filesystem.nix + ../shared/filesystem.nix ]; networking.hostName = "ritchie"; @@ -28,7 +28,7 @@ in "tmux" ]; openssh.authorizedKeys.keyFiles = [ - ../users/foxsoft/authorized_keys + ../../users/foxsoft/authorized_keys ]; }; diff --git a/system/desktop-configuration.nix b/system/shared/desktop-configuration.nix similarity index 100% rename from system/desktop-configuration.nix rename to system/shared/desktop-configuration.nix diff --git a/system/desktop.nix b/system/shared/desktop.nix similarity index 100% rename from system/desktop.nix rename to system/shared/desktop.nix diff --git a/system/filesystem.nix b/system/shared/filesystem.nix similarity index 100% rename from system/filesystem.nix rename to system/shared/filesystem.nix diff --git a/system/shared-configuration.nix b/system/shared/shared-configuration.nix similarity index 97% rename from system/shared-configuration.nix rename to system/shared/shared-configuration.nix index b92ece0..7ab47c1 100644 --- a/system/shared-configuration.nix +++ b/system/shared/shared-configuration.nix @@ -33,7 +33,7 @@ ]; initialPassword = "password"; openssh.authorizedKeys.keyFiles = [ - ../users/tsv/authorized_keys + ../../users/tsv/authorized_keys ]; }; diff --git a/system/thompson-hardware.nix b/system/thompson/thompson-hardware.nix similarity index 100% rename from system/thompson-hardware.nix rename to system/thompson/thompson-hardware.nix diff --git a/system/thompson.nix b/system/thompson/thompson.nix similarity index 74% rename from system/thompson.nix rename to system/thompson/thompson.nix index 9061ffe..6cdeec0 100644 --- a/system/thompson.nix +++ b/system/thompson/thompson.nix @@ -13,11 +13,11 @@ in { imports = [ - ./shared-configuration.nix - ./desktop-configuration.nix - ./desktop.nix + ../shared/shared-configuration.nix + ../shared/desktop-configuration.nix + ../shared/desktop.nix ./thompson-hardware.nix - ./filesystem.nix + ../shared/filesystem.nix ]; networking.hostName = "thompson";