diff --git a/README.md b/README.md index 016ff39..1a13868 100755 --- a/README.md +++ b/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) diff --git a/home/default.nix b/home/default.nix new file mode 100644 index 0000000..3ea62d7 --- /dev/null +++ b/home/default.nix @@ -0,0 +1,13 @@ +{ + default, + ... +}: { + imports = [ + ./nushell + ./starship + ./helix + ./git + ./lazygit + ]; + +} \ No newline at end of file diff --git a/modules/home/dunst/default.nix b/home/dunst/default.nix similarity index 100% rename from modules/home/dunst/default.nix rename to home/dunst/default.nix diff --git a/modules/home/dunst/dunstrc b/home/dunst/dunstrc similarity index 100% rename from modules/home/dunst/dunstrc rename to home/dunst/dunstrc diff --git a/modules/home/git/default.nix b/home/git/default.nix similarity index 100% rename from modules/home/git/default.nix rename to home/git/default.nix diff --git a/modules/home/gtk/default.nix b/home/gtk/default.nix similarity index 100% rename from modules/home/gtk/default.nix rename to home/gtk/default.nix diff --git a/modules/home/helix/default.nix b/home/helix/default.nix similarity index 100% rename from modules/home/helix/default.nix rename to home/helix/default.nix diff --git a/modules/home/lazygit/default.nix b/home/lazygit/default.nix similarity index 100% rename from modules/home/lazygit/default.nix rename to home/lazygit/default.nix diff --git a/modules/home/lf/default.nix b/home/lf/default.nix similarity index 100% rename from modules/home/lf/default.nix rename to home/lf/default.nix diff --git a/modules/home/mpv/default.nix b/home/mpv/default.nix similarity index 100% rename from modules/home/mpv/default.nix rename to home/mpv/default.nix diff --git a/modules/home/nushell/config.nu b/home/nushell/config.nu similarity index 100% rename from modules/home/nushell/config.nu rename to home/nushell/config.nu diff --git a/modules/home/nushell/default.nix b/home/nushell/default.nix similarity index 100% rename from modules/home/nushell/default.nix rename to home/nushell/default.nix diff --git a/modules/home/nushell/env.nu b/home/nushell/env.nu similarity index 100% rename from modules/home/nushell/env.nu rename to home/nushell/env.nu diff --git a/modules/home/starship/default.nix b/home/starship/default.nix similarity index 100% rename from modules/home/starship/default.nix rename to home/starship/default.nix diff --git a/modules/home/waybar/default.nix b/home/waybar/default.nix similarity index 100% rename from modules/home/waybar/default.nix rename to home/waybar/default.nix diff --git a/modules/home/wayland/default.nix b/home/wayland/default.nix similarity index 100% rename from modules/home/wayland/default.nix rename to home/wayland/default.nix diff --git a/modules/home/wayland/hyprland/config.nix b/home/wayland/hyprland/config.nix similarity index 100% rename from modules/home/wayland/hyprland/config.nix rename to home/wayland/hyprland/config.nix diff --git a/modules/home/wayland/hyprland/default.nix b/home/wayland/hyprland/default.nix similarity index 100% rename from modules/home/wayland/hyprland/default.nix rename to home/wayland/hyprland/default.nix diff --git a/modules/home/wezterm/default.nix b/home/wezterm/default.nix similarity index 100% rename from modules/home/wezterm/default.nix rename to home/wezterm/default.nix diff --git a/modules/home/zathura/default.nix b/home/zathura/default.nix similarity index 100% rename from modules/home/zathura/default.nix rename to home/zathura/default.nix diff --git a/hosts/hime/default.nix b/hosts/hime/default.nix index 170e3f7..3a8a910 100644 --- a/hosts/hime/default.nix +++ b/hosts/hime/default.nix @@ -4,7 +4,7 @@ imports = [ ./hardware-configuration.nix - ../common + ../../modules/services ]; boot.loader = { diff --git a/hosts/hime/home.nix b/hosts/hime/home.nix index 58b63d0..bcbf576 100644 --- a/hosts/hime/home.nix +++ b/hosts/hime/home.nix @@ -3,7 +3,7 @@ { imports = [ - ../../modules/common.nix + ../../home ]; systemd.user.startServices = "sd-switch"; programs.home-manager.enable = true; diff --git a/hosts/sutakku/default.nix b/hosts/sutakku/default.nix index 9afca46..7e3d015 100644 --- a/hosts/sutakku/default.nix +++ b/hosts/sutakku/default.nix @@ -4,7 +4,7 @@ imports = [ ./hardware-configuration.nix - ../common + ../../home ]; boot.loader = { diff --git a/hosts/sutakku/home.nix b/hosts/sutakku/home.nix index 58b63d0..bcbf576 100644 --- a/hosts/sutakku/home.nix +++ b/hosts/sutakku/home.nix @@ -3,7 +3,7 @@ { imports = [ - ../../modules/common.nix + ../../home ]; systemd.user.startServices = "sd-switch"; programs.home-manager.enable = true; diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix index 360c001..7dd09fb 100755 --- a/hosts/tsuki/default.nix +++ b/hosts/tsuki/default.nix @@ -4,8 +4,8 @@ imports = [ ./hardware-configuration.nix - ../../modules/home/wayland - ../common + ../../home/wayland + ../../modules/services ]; # bootloader diff --git a/hosts/tsuki/home.nix b/hosts/tsuki/home.nix index dc42267..9dfe8f8 100755 --- a/hosts/tsuki/home.nix +++ b/hosts/tsuki/home.nix @@ -3,15 +3,15 @@ { imports = [ - ../../modules/common.nix - ../../modules/home/wezterm - ../../modules/home/zathura - ../../modules/home/gtk - ../../modules/home/dunst - ../../modules/home/lf - ../../modules/home/mpv - ../../modules/home/waybar - ../../modules/home/wayland/hyprland + ../../home + ../../home/wezterm + ../../home/zathura + ../../home/gtk + ../../home/dunst + ../../home/lf + ../../home/mpv + ../../home/waybar + ../../home/wayland/hyprland ]; systemd.user.startServices = "sd-switch"; diff --git a/modules/common.nix b/modules/common.nix deleted file mode 100644 index acb8c0f..0000000 --- a/modules/common.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - default, - ... -}: { - imports = [ - ./home/nushell - ./home/starship - ./home/helix - ./home/git - ./home/lazygit - ]; - -} \ No newline at end of file diff --git a/hosts/common/default.nix b/modules/services/default.nix similarity index 74% rename from hosts/common/default.nix rename to modules/services/default.nix index 7efd5f5..07558d6 100644 --- a/hosts/common/default.nix +++ b/modules/services/default.nix @@ -2,8 +2,8 @@ default, ... }: { - imports = [ + imports = [ ./tailscale.nix ./security.nix - ]; -} \ No newline at end of file + ]; +} diff --git a/hosts/common/security.nix b/modules/services/security.nix similarity index 100% rename from hosts/common/security.nix rename to modules/services/security.nix diff --git a/hosts/common/tailscale.nix b/modules/services/tailscale.nix similarity index 100% rename from hosts/common/tailscale.nix rename to modules/services/tailscale.nix