From 88ad3517bf638e227cc229cda04531862ec911f8 Mon Sep 17 00:00:00 2001 From: twoneis Date: Mon, 12 Feb 2024 16:58:42 +0100 Subject: [PATCH] restructure home as submodule of each system --- modules/{server-home => server/home}/default.nix | 8 ++++---- .../{server-home => server/home}/server-utils/default.nix | 0 modules/{ => system}/home/art/default.nix | 0 modules/{ => system}/home/browser/default.nix | 0 modules/{ => system}/home/chat/default.nix | 0 modules/{ => system}/home/cursor/default.nix | 0 modules/{ => system}/home/default.nix | 0 modules/{ => system}/home/direnv/default.nix | 0 modules/{ => system}/home/discord/default.nix | 0 modules/{ => system}/home/editor/default.nix | 0 modules/{ => system}/home/editor/helix-config.nix | 0 modules/{ => system}/home/editor/helix-languages.nix | 0 modules/{ => system}/home/email/default.nix | 0 modules/{ => system}/home/gdb/default.nix | 0 modules/{ => system}/home/gdb/gdb-for-asm | 0 modules/{ => system}/home/gdb/gdb-for-c | 0 modules/{ => system}/home/gdb/gef-for-asm | 0 modules/{ => system}/home/gdb/gef-for-c | 0 modules/{ => system}/home/git/default.nix | 0 modules/{ => system}/home/media/default.nix | 0 modules/{ => system}/home/shell/default.nix | 0 modules/{ => system}/home/terminal/alacritty-config.nix | 0 modules/{ => system}/home/terminal/default.nix | 0 modules/{ => system}/home/themes/default.nix | 0 modules/{ => system}/home/utils/default.nix | 0 outputs.nix | 4 ++-- 26 files changed, 6 insertions(+), 6 deletions(-) rename modules/{server-home => server/home}/default.nix (64%) rename modules/{server-home => server/home}/server-utils/default.nix (100%) rename modules/{ => system}/home/art/default.nix (100%) rename modules/{ => system}/home/browser/default.nix (100%) rename modules/{ => system}/home/chat/default.nix (100%) rename modules/{ => system}/home/cursor/default.nix (100%) rename modules/{ => system}/home/default.nix (100%) rename modules/{ => system}/home/direnv/default.nix (100%) rename modules/{ => system}/home/discord/default.nix (100%) rename modules/{ => system}/home/editor/default.nix (100%) rename modules/{ => system}/home/editor/helix-config.nix (100%) rename modules/{ => system}/home/editor/helix-languages.nix (100%) rename modules/{ => system}/home/email/default.nix (100%) rename modules/{ => system}/home/gdb/default.nix (100%) rename modules/{ => system}/home/gdb/gdb-for-asm (100%) rename modules/{ => system}/home/gdb/gdb-for-c (100%) rename modules/{ => system}/home/gdb/gef-for-asm (100%) rename modules/{ => system}/home/gdb/gef-for-c (100%) rename modules/{ => system}/home/git/default.nix (100%) rename modules/{ => system}/home/media/default.nix (100%) rename modules/{ => system}/home/shell/default.nix (100%) rename modules/{ => system}/home/terminal/alacritty-config.nix (100%) rename modules/{ => system}/home/terminal/default.nix (100%) rename modules/{ => system}/home/themes/default.nix (100%) rename modules/{ => system}/home/utils/default.nix (100%) diff --git a/modules/server-home/default.nix b/modules/server/home/default.nix similarity index 64% rename from modules/server-home/default.nix rename to modules/server/home/default.nix index d89c5b3..1c877a2 100644 --- a/modules/server-home/default.nix +++ b/modules/server/home/default.nix @@ -1,9 +1,9 @@ { ... }: { imports = [ - ../home/direnv - ../home/editor - ../home/git - ../home/shell + ../../system/home/direnv + ../../system/home/editor + ../../system/home/git + ../../system/home/shell ./server-utils ]; diff --git a/modules/server-home/server-utils/default.nix b/modules/server/home/server-utils/default.nix similarity index 100% rename from modules/server-home/server-utils/default.nix rename to modules/server/home/server-utils/default.nix diff --git a/modules/home/art/default.nix b/modules/system/home/art/default.nix similarity index 100% rename from modules/home/art/default.nix rename to modules/system/home/art/default.nix diff --git a/modules/home/browser/default.nix b/modules/system/home/browser/default.nix similarity index 100% rename from modules/home/browser/default.nix rename to modules/system/home/browser/default.nix diff --git a/modules/home/chat/default.nix b/modules/system/home/chat/default.nix similarity index 100% rename from modules/home/chat/default.nix rename to modules/system/home/chat/default.nix diff --git a/modules/home/cursor/default.nix b/modules/system/home/cursor/default.nix similarity index 100% rename from modules/home/cursor/default.nix rename to modules/system/home/cursor/default.nix diff --git a/modules/home/default.nix b/modules/system/home/default.nix similarity index 100% rename from modules/home/default.nix rename to modules/system/home/default.nix diff --git a/modules/home/direnv/default.nix b/modules/system/home/direnv/default.nix similarity index 100% rename from modules/home/direnv/default.nix rename to modules/system/home/direnv/default.nix diff --git a/modules/home/discord/default.nix b/modules/system/home/discord/default.nix similarity index 100% rename from modules/home/discord/default.nix rename to modules/system/home/discord/default.nix diff --git a/modules/home/editor/default.nix b/modules/system/home/editor/default.nix similarity index 100% rename from modules/home/editor/default.nix rename to modules/system/home/editor/default.nix diff --git a/modules/home/editor/helix-config.nix b/modules/system/home/editor/helix-config.nix similarity index 100% rename from modules/home/editor/helix-config.nix rename to modules/system/home/editor/helix-config.nix diff --git a/modules/home/editor/helix-languages.nix b/modules/system/home/editor/helix-languages.nix similarity index 100% rename from modules/home/editor/helix-languages.nix rename to modules/system/home/editor/helix-languages.nix diff --git a/modules/home/email/default.nix b/modules/system/home/email/default.nix similarity index 100% rename from modules/home/email/default.nix rename to modules/system/home/email/default.nix diff --git a/modules/home/gdb/default.nix b/modules/system/home/gdb/default.nix similarity index 100% rename from modules/home/gdb/default.nix rename to modules/system/home/gdb/default.nix diff --git a/modules/home/gdb/gdb-for-asm b/modules/system/home/gdb/gdb-for-asm similarity index 100% rename from modules/home/gdb/gdb-for-asm rename to modules/system/home/gdb/gdb-for-asm diff --git a/modules/home/gdb/gdb-for-c b/modules/system/home/gdb/gdb-for-c similarity index 100% rename from modules/home/gdb/gdb-for-c rename to modules/system/home/gdb/gdb-for-c diff --git a/modules/home/gdb/gef-for-asm b/modules/system/home/gdb/gef-for-asm similarity index 100% rename from modules/home/gdb/gef-for-asm rename to modules/system/home/gdb/gef-for-asm diff --git a/modules/home/gdb/gef-for-c b/modules/system/home/gdb/gef-for-c similarity index 100% rename from modules/home/gdb/gef-for-c rename to modules/system/home/gdb/gef-for-c diff --git a/modules/home/git/default.nix b/modules/system/home/git/default.nix similarity index 100% rename from modules/home/git/default.nix rename to modules/system/home/git/default.nix diff --git a/modules/home/media/default.nix b/modules/system/home/media/default.nix similarity index 100% rename from modules/home/media/default.nix rename to modules/system/home/media/default.nix diff --git a/modules/home/shell/default.nix b/modules/system/home/shell/default.nix similarity index 100% rename from modules/home/shell/default.nix rename to modules/system/home/shell/default.nix diff --git a/modules/home/terminal/alacritty-config.nix b/modules/system/home/terminal/alacritty-config.nix similarity index 100% rename from modules/home/terminal/alacritty-config.nix rename to modules/system/home/terminal/alacritty-config.nix diff --git a/modules/home/terminal/default.nix b/modules/system/home/terminal/default.nix similarity index 100% rename from modules/home/terminal/default.nix rename to modules/system/home/terminal/default.nix diff --git a/modules/home/themes/default.nix b/modules/system/home/themes/default.nix similarity index 100% rename from modules/home/themes/default.nix rename to modules/system/home/themes/default.nix diff --git a/modules/home/utils/default.nix b/modules/system/home/utils/default.nix similarity index 100% rename from modules/home/utils/default.nix rename to modules/system/home/utils/default.nix diff --git a/outputs.nix b/outputs.nix index a8196f0..5ec2aa5 100644 --- a/outputs.nix +++ b/outputs.nix @@ -10,7 +10,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.twoneis = import ./modules/home; + users.twoneis = import ./modules/system/home; }; } ]; @@ -20,7 +20,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.twoneis = import ./modules/server-home; + users.twoneis = import ./modules/server/home; }; } ];