diff --git a/README.md b/README.md index 58b2dbb..2ad8708 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ nix-config/ ├── modules/ # Shared configuration modules │ ├── common.nix # Base system configuration │ ├── programs.nix # System-wide packages and programs -│ ├── home/ # Home Manager configurations +│ ├── hm/ # Home Manager configurations │ └── desktops/ # Desktop environment configurations └── rebuild-nix-system.sh # Helper script for system rebuilds ``` @@ -73,7 +73,7 @@ Hyprland desktop environment setup: - **Theming**: Gruvbox theme with consistent fonts - **Tools**: Screenshot tools, clipboard manager, file manager -### `modules/home/` +### `modules/hm/` Home Manager configurations: @@ -135,7 +135,7 @@ nix flake update ### User Packages - Managed through Home Manager -- Per-user configurations in `modules/home/` +- Per-user configurations in `modules/hm/` ## 🔄 Development Workflow diff --git a/hosts/hurricane/configuration.nix b/hosts/hurricane/configuration.nix index 344e391..2babd60 100644 --- a/hosts/hurricane/configuration.nix +++ b/hosts/hurricane/configuration.nix @@ -7,9 +7,9 @@ ]; # Extend home-manager configuration with host-specific monitor settings home-manager.users.schulze.imports = [ - ./hyprland-monitors.nix - ./hyprlock.nix - ./hyprpaper.nix + ./hm/hyprland-monitors.nix + ./hm/hyprlock.nix + ./hm/hyprpaper.nix ]; networking.hostName = "hurricane"; diff --git a/hosts/hurricane/hyprland-monitors.nix b/hosts/hurricane/hm/hyprland-monitors.nix similarity index 100% rename from hosts/hurricane/hyprland-monitors.nix rename to hosts/hurricane/hm/hyprland-monitors.nix diff --git a/hosts/hurricane/hyprlock.nix b/hosts/hurricane/hm/hyprlock.nix similarity index 60% rename from hosts/hurricane/hyprlock.nix rename to hosts/hurricane/hm/hyprlock.nix index 9c7a827..bf08d77 100644 --- a/hosts/hurricane/hyprlock.nix +++ b/hosts/hurricane/hm/hyprlock.nix @@ -1,3 +1,3 @@ { - programs.hyprlock.settings.background.path = "$HOME/git/nix-config/modules/home/images/control-panel.png"; + programs.hyprlock.settings.background.path = "$HOME/git/nix-config/modules/hm/images/control-panel.png"; } diff --git a/hosts/hurricane/hm/hyprpaper.nix b/hosts/hurricane/hm/hyprpaper.nix new file mode 100644 index 0000000..9a5d8b0 --- /dev/null +++ b/hosts/hurricane/hm/hyprpaper.nix @@ -0,0 +1,17 @@ +{ + services.hyprpaper = { + enable = true; + settings = { + preload = [ + "$HOME/git/nix-config/modules/hm/images/nix.png" + "$HOME/git/nix-config/modules/hm/images/forest.png" + ]; + wallpaper = [ + ", $HOME/git/nix-config/modules/hm/images/nix.png" + "DP-3, $HOME/git/nix-config/modules/hm/images/forest.png" + "HDMI-A-1, $HOME/git/nix-config/modules/hm/images/forest.png" + "eDP-1, $HOME/git/nix-config/modules/hm/images/forest.png" + ]; + }; + }; +} diff --git a/hosts/hurricane/hyprpaper.nix b/hosts/hurricane/hyprpaper.nix deleted file mode 100644 index eb2edf6..0000000 --- a/hosts/hurricane/hyprpaper.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - services.hyprpaper = { - enable = true; - settings = { - preload = [ - "$HOME/git/nix-config/modules/home/images/nix.png" - "$HOME/git/nix-config/modules/home/images/forest.png" - ]; - wallpaper = [ - ", $HOME/git/nix-config/modules/home/images/nix.png" - "DP-3, $HOME/git/nix-config/modules/home/images/forest.png" - "HDMI-A-1, $HOME/git/nix-config/modules/home/images/forest.png" - "eDP-1, $HOME/git/nix-config/modules/home/images/forest.png" - ]; - }; - }; -} diff --git a/hosts/wildfire/configuration.nix b/hosts/wildfire/configuration.nix index 0b484aa..0980f6b 100644 --- a/hosts/wildfire/configuration.nix +++ b/hosts/wildfire/configuration.nix @@ -7,9 +7,9 @@ ]; # Extend home-manager configuration with host-specific monitor settings home-manager.users.schulze.imports = [ - ./hyprland-monitors.nix - ./hyprlock.nix - ./hyprpaper.nix + ./hm/hyprland-monitors.nix + ./hm/hyprlock.nix + ./hm/hyprpaper.nix ]; # Encrypted drive diff --git a/hosts/wildfire/hyprland-monitors.nix b/hosts/wildfire/hm/hyprland-monitors.nix similarity index 100% rename from hosts/wildfire/hyprland-monitors.nix rename to hosts/wildfire/hm/hyprland-monitors.nix diff --git a/hosts/wildfire/hyprlock.nix b/hosts/wildfire/hm/hyprlock.nix similarity index 66% rename from hosts/wildfire/hyprlock.nix rename to hosts/wildfire/hm/hyprlock.nix index 8bb23cb..93213aa 100644 --- a/hosts/wildfire/hyprlock.nix +++ b/hosts/wildfire/hm/hyprlock.nix @@ -1,3 +1,3 @@ { - programs.hyprlock.settings.background.path = "$HOME/git/nix-config/modules/home/images/sky.png"; + programs.hyprlock.settings.background.path = "$HOME/git/nix-config/modules/hm/images/sky.png"; } diff --git a/hosts/wildfire/hm/hyprpaper.nix b/hosts/wildfire/hm/hyprpaper.nix new file mode 100644 index 0000000..fe04241 --- /dev/null +++ b/hosts/wildfire/hm/hyprpaper.nix @@ -0,0 +1,15 @@ +{ + services.hyprpaper = { + enable = true; + settings = { + preload = [ + "$HOME/git/nix-config/modules/hm/images/nix.png" + "$HOME/git/nix-config/modules/hm/images/sunset-rocks.png" + ]; + wallpaper = [ + ", $HOME/git/nix-config/modules/hm/images/nix.png" + "DP-3, $HOME/git/nix-config/modules/hm/images/sunset-rocks.png" + ]; + }; + }; +} diff --git a/hosts/wildfire/hyprpaper.nix b/hosts/wildfire/hyprpaper.nix deleted file mode 100644 index 27208d4..0000000 --- a/hosts/wildfire/hyprpaper.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - services.hyprpaper = { - enable = true; - settings = { - preload = [ - "$HOME/git/nix-config/modules/home/images/nix.png" - "$HOME/git/nix-config/modules/home/images/sunset-rocks.png" - ]; - wallpaper = [ - ", $HOME/git/nix-config/modules/home/images/nix.png" - "DP-3, $HOME/git/nix-config/modules/home/images/sunset-rocks.png" - ]; - }; - }; -} diff --git a/modules/common.nix b/modules/common.nix index 9ae17e8..bfbe6bd 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -27,20 +27,20 @@ }; # User-specific Home Manager configurations users.schulze.imports = [ - ./home/home-manager.nix # Base user environment - ./home/hyprland.nix # Hyprland window manager user config - ./home/hyprlock.nix # Hyprlock screen lock user config - ./home/hypridle.nix # Hypridle idle daemon user config - ./home/cursor.nix # Mouse cursor config - ./home/rofi.nix # Rofi theme/config - ./home/ghostty.nix # Ghostty config - ./home/gtk.nix # GTK theme - ./home/nextcloud.nix # Nextcloud autostart - ./home/code-cursor.nix # Cursor config - ./home/vim.nix # Vim config - ./home/hyprsunset.nix # Hyprsunset night mode - ./home/btop.nix # Btop config - ./home/ssh.nix # SSH config + ./hm/home-manager.nix # Base user environment + ./hm/hyprland.nix # Hyprland window manager user config + ./hm/hyprlock.nix # Hyprlock screen lock user config + ./hm/hypridle.nix # Hypridle idle daemon user config + ./hm/cursor.nix # Mouse cursor config + ./hm/rofi.nix # Rofi theme/config + ./hm/ghostty.nix # Ghostty config + ./hm/gtk.nix # GTK theme + ./hm/nextcloud.nix # Nextcloud autostart + ./hm/code-cursor.nix # Cursor config + ./hm/vim.nix # Vim config + ./hm/hyprsunset.nix # Hyprsunset night mode + ./hm/btop.nix # Btop config + ./hm/ssh.nix # SSH config ]; }; diff --git a/modules/home/btop.nix b/modules/hm/btop.nix similarity index 100% rename from modules/home/btop.nix rename to modules/hm/btop.nix diff --git a/modules/home/code-cursor.nix b/modules/hm/code-cursor.nix similarity index 100% rename from modules/home/code-cursor.nix rename to modules/hm/code-cursor.nix diff --git a/modules/home/cursor.nix b/modules/hm/cursor.nix similarity index 100% rename from modules/home/cursor.nix rename to modules/hm/cursor.nix diff --git a/modules/home/ghostty.nix b/modules/hm/ghostty.nix similarity index 100% rename from modules/home/ghostty.nix rename to modules/hm/ghostty.nix diff --git a/modules/home/gtk.nix b/modules/hm/gtk.nix similarity index 100% rename from modules/home/gtk.nix rename to modules/hm/gtk.nix diff --git a/modules/home/home-manager.nix b/modules/hm/home-manager.nix similarity index 100% rename from modules/home/home-manager.nix rename to modules/hm/home-manager.nix diff --git a/modules/home/hypridle.nix b/modules/hm/hypridle.nix similarity index 100% rename from modules/home/hypridle.nix rename to modules/hm/hypridle.nix diff --git a/modules/home/hyprland.nix b/modules/hm/hyprland.nix similarity index 100% rename from modules/home/hyprland.nix rename to modules/hm/hyprland.nix diff --git a/modules/home/hyprlock.nix b/modules/hm/hyprlock.nix similarity index 96% rename from modules/home/hyprlock.nix rename to modules/hm/hyprlock.nix index decdf75..d866de8 100644 --- a/modules/home/hyprlock.nix +++ b/modules/hm/hyprlock.nix @@ -6,7 +6,7 @@ in { settings = { background = { # Background image is set in host specific configuration - #path = "$HOME/git/nixos/modules/home/images/sky.png"; + #path = "$HOME/git/nixos/modules/hm/images/sky.png"; blur_size = 3; blur_passes = 4; contrast = 1; diff --git a/modules/home/hyprsunset.nix b/modules/hm/hyprsunset.nix similarity index 100% rename from modules/home/hyprsunset.nix rename to modules/hm/hyprsunset.nix diff --git a/modules/home/images/control-panel.png b/modules/hm/images/control-panel.png similarity index 100% rename from modules/home/images/control-panel.png rename to modules/hm/images/control-panel.png diff --git a/modules/home/images/forest.png b/modules/hm/images/forest.png similarity index 100% rename from modules/home/images/forest.png rename to modules/hm/images/forest.png diff --git a/modules/home/images/nix.png b/modules/hm/images/nix.png similarity index 100% rename from modules/home/images/nix.png rename to modules/hm/images/nix.png diff --git a/modules/home/images/sky.png b/modules/hm/images/sky.png similarity index 100% rename from modules/home/images/sky.png rename to modules/hm/images/sky.png diff --git a/modules/home/images/statue.png b/modules/hm/images/statue.png similarity index 100% rename from modules/home/images/statue.png rename to modules/hm/images/statue.png diff --git a/modules/home/images/sunset-rocks.png b/modules/hm/images/sunset-rocks.png similarity index 100% rename from modules/home/images/sunset-rocks.png rename to modules/hm/images/sunset-rocks.png diff --git a/modules/home/nextcloud.nix b/modules/hm/nextcloud.nix similarity index 100% rename from modules/home/nextcloud.nix rename to modules/hm/nextcloud.nix diff --git a/modules/home/rofi.nix b/modules/hm/rofi.nix similarity index 100% rename from modules/home/rofi.nix rename to modules/hm/rofi.nix diff --git a/modules/home/ssh.nix b/modules/hm/ssh.nix similarity index 100% rename from modules/home/ssh.nix rename to modules/hm/ssh.nix diff --git a/modules/home/vim.nix b/modules/hm/vim.nix similarity index 100% rename from modules/home/vim.nix rename to modules/hm/vim.nix