From 803a47d745798cb0f5b644194042be92bd8658e6 Mon Sep 17 00:00:00 2001 From: NullBite Date: Mon, 1 Jan 2024 12:53:02 -0500 Subject: [PATCH 1/6] move things to somewhere that makes more sense (need to rename everything now please kill me) --- {roles => system}/base.nix | 0 {roles => system}/debugging.nix | 0 {roles => system}/desktop-common.nix | 0 {fragments => system/fragments}/README.md | 0 {fragments => system/fragments}/base.nix | 1 + {fragments => system/fragments}/cli-multimedia.nix | 0 {fragments => system/fragments}/hardware/bluetooth.nix | 0 {fragments => system/fragments}/hardware/nvidia-modeset.nix | 0 {fragments => system/fragments}/me.nix | 0 {fragments => system/fragments}/multimedia.nix | 0 {fragments => system/fragments}/opengl.nix | 0 {fragments => system/fragments}/software/syncthing.nix | 0 {fragments => system/fragments}/sound.nix | 0 {roles => system}/gaming.nix | 0 {roles => system}/hyprland.nix | 0 {roles => system}/plasma.nix | 0 {roles => system}/remote.nix | 0 17 files changed, 1 insertion(+) rename {roles => system}/base.nix (100%) rename {roles => system}/debugging.nix (100%) rename {roles => system}/desktop-common.nix (100%) rename {fragments => system/fragments}/README.md (100%) rename {fragments => system/fragments}/base.nix (99%) rename {fragments => system/fragments}/cli-multimedia.nix (100%) rename {fragments => system/fragments}/hardware/bluetooth.nix (100%) rename {fragments => system/fragments}/hardware/nvidia-modeset.nix (100%) rename {fragments => system/fragments}/me.nix (100%) rename {fragments => system/fragments}/multimedia.nix (100%) rename {fragments => system/fragments}/opengl.nix (100%) rename {fragments => system/fragments}/software/syncthing.nix (100%) rename {fragments => system/fragments}/sound.nix (100%) rename {roles => system}/gaming.nix (100%) rename {roles => system}/hyprland.nix (100%) rename {roles => system}/plasma.nix (100%) rename {roles => system}/remote.nix (100%) diff --git a/roles/base.nix b/system/base.nix similarity index 100% rename from roles/base.nix rename to system/base.nix diff --git a/roles/debugging.nix b/system/debugging.nix similarity index 100% rename from roles/debugging.nix rename to system/debugging.nix diff --git a/roles/desktop-common.nix b/system/desktop-common.nix similarity index 100% rename from roles/desktop-common.nix rename to system/desktop-common.nix diff --git a/fragments/README.md b/system/fragments/README.md similarity index 100% rename from fragments/README.md rename to system/fragments/README.md diff --git a/fragments/base.nix b/system/fragments/base.nix similarity index 99% rename from fragments/base.nix rename to system/fragments/base.nix index d9ec293..97ced85 100644 --- a/fragments/base.nix +++ b/system/fragments/base.nix @@ -41,6 +41,7 @@ inetutils socat nmap + hping # system utilities htop diff --git a/fragments/cli-multimedia.nix b/system/fragments/cli-multimedia.nix similarity index 100% rename from fragments/cli-multimedia.nix rename to system/fragments/cli-multimedia.nix diff --git a/fragments/hardware/bluetooth.nix b/system/fragments/hardware/bluetooth.nix similarity index 100% rename from fragments/hardware/bluetooth.nix rename to system/fragments/hardware/bluetooth.nix diff --git a/fragments/hardware/nvidia-modeset.nix b/system/fragments/hardware/nvidia-modeset.nix similarity index 100% rename from fragments/hardware/nvidia-modeset.nix rename to system/fragments/hardware/nvidia-modeset.nix diff --git a/fragments/me.nix b/system/fragments/me.nix similarity index 100% rename from fragments/me.nix rename to system/fragments/me.nix diff --git a/fragments/multimedia.nix b/system/fragments/multimedia.nix similarity index 100% rename from fragments/multimedia.nix rename to system/fragments/multimedia.nix diff --git a/fragments/opengl.nix b/system/fragments/opengl.nix similarity index 100% rename from fragments/opengl.nix rename to system/fragments/opengl.nix diff --git a/fragments/software/syncthing.nix b/system/fragments/software/syncthing.nix similarity index 100% rename from fragments/software/syncthing.nix rename to system/fragments/software/syncthing.nix diff --git a/fragments/sound.nix b/system/fragments/sound.nix similarity index 100% rename from fragments/sound.nix rename to system/fragments/sound.nix diff --git a/roles/gaming.nix b/system/gaming.nix similarity index 100% rename from roles/gaming.nix rename to system/gaming.nix diff --git a/roles/hyprland.nix b/system/hyprland.nix similarity index 100% rename from roles/hyprland.nix rename to system/hyprland.nix diff --git a/roles/plasma.nix b/system/plasma.nix similarity index 100% rename from roles/plasma.nix rename to system/plasma.nix diff --git a/roles/remote.nix b/system/remote.nix similarity index 100% rename from roles/remote.nix rename to system/remote.nix From 0160c33588572f72bd4f4519e0435a522ba5c8e9 Mon Sep 17 00:00:00 2001 From: NullBite Date: Mon, 1 Jan 2024 12:58:31 -0500 Subject: [PATCH 2/6] Refactor path references --- flake.nix | 14 +++++++------- system/base.nix | 4 ++-- system/desktop-common.nix | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 37ce78b..ca07e01 100644 --- a/flake.nix +++ b/flake.nix @@ -35,21 +35,21 @@ modules = [ ./hosts/slab/configuration.nix ./hosts/slab/nvidia-optimus.nix - ./roles/remote.nix - ./roles/plasma.nix + ./system/remote.nix + ./system/plasma.nix ./fragments/opengl.nix - ./roles/gaming.nix - ./roles/hyprland.nix + ./system/gaming.nix + ./system/hyprland.nix ]; }; nullbox = lib.nixosSystem { system = "x86_64-linux"; modules = [ ./hosts/nullbox/configuration.nix - ./roles/remote.nix - ./roles/plasma.nix + ./system/remote.nix + ./system/plasma.nix ./fragments/hardware/nvidia-modeset.nix - ./roles/gaming.nix + ./system/gaming.nix hmModule (hmModuleDefaults // { home-manager.users."${username}" = import ./home.nix; diff --git a/system/base.nix b/system/base.nix index 4b203b3..aa55cee 100644 --- a/system/base.nix +++ b/system/base.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ...}: { imports = [ - ../fragments/base.nix - ../fragments/me.nix + ./fragments/base.nix + ./fragments/me.nix ]; } diff --git a/system/desktop-common.nix b/system/desktop-common.nix index 60bdcf0..12fa0ae 100644 --- a/system/desktop-common.nix +++ b/system/desktop-common.nix @@ -3,10 +3,10 @@ { imports = [ ./base.nix - ../fragments/sound.nix - ../fragments/multimedia.nix - ../fragments/software/syncthing.nix - ../fragments/hardware/bluetooth.nix + ./fragments/sound.nix + ./fragments/multimedia.nix + ./fragments/software/syncthing.nix + ./fragments/hardware/bluetooth.nix ]; # Enable the X11 windowing system. From 7bda22606547614b92f789316e3bdedd7a559f46 Mon Sep 17 00:00:00 2001 From: NullBite Date: Mon, 1 Jan 2024 13:00:10 -0500 Subject: [PATCH 3/6] missed a few --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index ca07e01..9a13bcb 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ ./hosts/slab/nvidia-optimus.nix ./system/remote.nix ./system/plasma.nix - ./fragments/opengl.nix + ./system/fragments/opengl.nix ./system/gaming.nix ./system/hyprland.nix ]; @@ -48,7 +48,7 @@ ./hosts/nullbox/configuration.nix ./system/remote.nix ./system/plasma.nix - ./fragments/hardware/nvidia-modeset.nix + ./system/fragments/hardware/nvidia-modeset.nix ./system/gaming.nix hmModule (hmModuleDefaults // { From 07ac55c9f2dbb509dcee5d032fb97b86f46dcf00 Mon Sep 17 00:00:00 2001 From: NullBite Date: Mon, 1 Jan 2024 13:04:22 -0500 Subject: [PATCH 4/6] Move home.nix to home/common.nix --- home.nix => home/common.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename home.nix => home/common.nix (100%) diff --git a/home.nix b/home/common.nix similarity index 100% rename from home.nix rename to home/common.nix From 4656bc4913a0a04559674fef9288610260888798 Mon Sep 17 00:00:00 2001 From: NullBite Date: Mon, 1 Jan 2024 13:06:57 -0500 Subject: [PATCH 5/6] Give each host a separate home.nix --- home/common.nix | 2 -- hosts/nullbox/home.nix | 8 ++++++++ hosts/slab/home.nix | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 hosts/nullbox/home.nix create mode 100644 hosts/slab/home.nix diff --git a/home/common.nix b/home/common.nix index 37fb414..e1c70bb 100644 --- a/home/common.nix +++ b/home/common.nix @@ -7,6 +7,4 @@ home.packages = with pkgs; [ btop ]; - - home.stateVersion = "23.11"; } diff --git a/hosts/nullbox/home.nix b/hosts/nullbox/home.nix new file mode 100644 index 0000000..d73da2c --- /dev/null +++ b/hosts/nullbox/home.nix @@ -0,0 +1,8 @@ +{ lib, pkgs, osConfig, ... }: +{ + imports = [ + ../../home/common.nix + ]; + + home.stateVersion = "23.11"; +} diff --git a/hosts/slab/home.nix b/hosts/slab/home.nix new file mode 100644 index 0000000..d73da2c --- /dev/null +++ b/hosts/slab/home.nix @@ -0,0 +1,8 @@ +{ lib, pkgs, osConfig, ... }: +{ + imports = [ + ../../home/common.nix + ]; + + home.stateVersion = "23.11"; +} From 41e92331639f37e67d2769e71ffc60783c11f427 Mon Sep 17 00:00:00 2001 From: NullBite Date: Mon, 1 Jan 2024 13:08:53 -0500 Subject: [PATCH 6/6] Add home.nix to hosts --- flake.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9a13bcb..21393a9 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,9 @@ ./system/fragments/opengl.nix ./system/gaming.nix ./system/hyprland.nix + hmModule (hmModuleDefaults // { + home-manager.users."${username}" = import ./hosts/slab/home.nix; + }) ]; }; nullbox = lib.nixosSystem { @@ -52,7 +55,7 @@ ./system/gaming.nix hmModule (hmModuleDefaults // { - home-manager.users."${username}" = import ./home.nix; + home-manager.users."${username}" = import ./hosts/nullbox/home.nix; }) ];