chore: mini restructure, move home to top level

README.md

@@ -7,12 +7,13 @@ snowflake
 
 ## :open_book: Table of contents
 #### will be expanded as i tack on more modules and things get more complex obviously
++ :house_with_garden: [home](home) - houses my dots
 + :computer: [hosts](hosts)
   - :full_moon: [tsuki](hosts/tsuki) - my main machine config
   - :princess: [hime](hosts/hime) - my server config
-  - :white_flower: [sutakku](hosts/sutakku) - *arr stack vm
+  - :white_flower: [sutakku](hosts/sutakku) - (currently) my *arr stack vm
 + :electric_plug: [modules](modules)
-  - :house_with_garden: [home](modules/home) - houses my dots
+  - :scroll: [services](modules/services) - houses services
 + :airplane: [overlays](overlays) - will house overlays eventually
 + :package: [pkgs](pkgs) - will house pkgs eventually
 + :lock: [secrets](secrets) - houses my secrets
@@ -24,4 +25,4 @@ snowflake
 + [NobbZ](https://github.com/NobbZ) - general nix assistance
 + [MatthiasBenaets](https://github.com/MatthiasBenaets) - amazing nixos introduction video
 + [sioodmy](https://github.com/sioodmy) - general dotfile stuff
-+ [hlissner](https://github.com/hlissner) - [security.nix](modules/security.nix)
++ [hlissner](https://github.com/hlissner) - [security.nix](modules/services/security.nix)

home/default.nix

@@ -0,0 +1,13 @@
+{
+  default,
+  ...
+}: {
+  imports = [
+    ./nushell
+    ./starship
+    ./helix
+    ./git
+    ./lazygit
+  ];
+  
+}

hosts/hime/default.nix

@@ -4,7 +4,7 @@
   imports =
     [
     ./hardware-configuration.nix
-    ../common
+    ../../modules/services
     ];
 
   boot.loader = {

hosts/hime/home.nix

@@ -3,7 +3,7 @@
 {
 
 imports = [
-  ../../modules/common.nix
+  ../../home
 ];
  systemd.user.startServices = "sd-switch";
  programs.home-manager.enable = true;

hosts/sutakku/default.nix

@@ -4,7 +4,7 @@
   imports =
     [ 
     ./hardware-configuration.nix
-    ../common
+    ../../home
     ];
 
   boot.loader = {

hosts/sutakku/home.nix

@@ -3,7 +3,7 @@
 {
 
 imports = [
-  ../../modules/common.nix
+  ../../home
 ];
  systemd.user.startServices = "sd-switch";
  programs.home-manager.enable = true;

hosts/tsuki/default.nix

@@ -4,8 +4,8 @@
   imports =
     [ 
     ./hardware-configuration.nix
-    ../../modules/home/wayland
+    ../../home/wayland
-    ../common
+    ../../modules/services
     ];
 
   # bootloader 

hosts/tsuki/home.nix

@@ -3,15 +3,15 @@
 {
 
 imports = [
-  ../../modules/common.nix
+  ../../home
-  ../../modules/home/wezterm
+  ../../home/wezterm
-  ../../modules/home/zathura
+  ../../home/zathura
-  ../../modules/home/gtk
+  ../../home/gtk
-  ../../modules/home/dunst
+  ../../home/dunst
-  ../../modules/home/lf
+  ../../home/lf
-  ../../modules/home/mpv
+  ../../home/mpv
-  ../../modules/home/waybar
+  ../../home/waybar
-  ../../modules/home/wayland/hyprland
+  ../../home/wayland/hyprland
 ];
 
  systemd.user.startServices = "sd-switch";

modules/common.nix

@@ -1,13 +0,0 @@
-{
-  default,
-  ...
-}: {
-  imports = [
-    ./home/nushell
-    ./home/starship
-    ./home/helix
-    ./home/git
-    ./home/lazygit
-  ];
-  
-}

modules/services/default.nix

@@ -2,8 +2,8 @@
   default,
   ...
 }: {
-   imports = [
+  imports = [
     ./tailscale.nix
     ./security.nix
-  ]; 
+  ];
-}
+}