diff --git a/hosts/nixos-vm2/configuration.nix b/hosts/nixos-vm2/configuration.nix index 0c8fa91..c3454c6 100644 --- a/hosts/nixos-vm2/configuration.nix +++ b/hosts/nixos-vm2/configuration.nix @@ -7,6 +7,7 @@ imports = [ + ../../modules ./hardware-configuration.nix ]; @@ -37,14 +38,6 @@ services.spice-vdagentd.enable = true; services.qemuGuest.enable = true; - environment.systemPackages = with pkgs; [ - kitty - vim - wget - git - curl - zsh - ]; system.stateVersion = "24.11"; } diff --git a/modules/desktop/hyprland/default.nix b/modules/core/default.nix similarity index 54% rename from modules/desktop/hyprland/default.nix rename to modules/core/default.nix index 4c2bef5..83b6cbe 100644 --- a/modules/desktop/hyprland/default.nix +++ b/modules/core/default.nix @@ -1,5 +1,5 @@ { imports = [ - ./monitor.nix + ./packages.nix ]; } diff --git a/modules/core/packages.nix b/modules/core/packages.nix new file mode 100644 index 0000000..cc70fd7 --- /dev/null +++ b/modules/core/packages.nix @@ -0,0 +1,15 @@ +{ + pkgs, + ... +}: +{ + environment.systemPackages = with pkgs; [ + wl-clipboard + kitty + vim + wget + git + curl + zsh + ]; +} diff --git a/modules/default.nix b/modules/default.nix index 5c8d960..76cbfbd 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,5 +1,6 @@ { imports = [ - ./desktop + ./home + ./core ]; } diff --git a/modules/desktop/default.nix b/modules/home/default.nix similarity index 73% rename from modules/desktop/default.nix rename to modules/home/default.nix index 3fbd598..2efe6c6 100644 --- a/modules/desktop/default.nix +++ b/modules/home/default.nix @@ -1,5 +1,6 @@ { imports = [ ./hyprland + ./ssh.nix ]; } diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix new file mode 100644 index 0000000..42d1c67 --- /dev/null +++ b/modules/home/hyprland/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + #./monitor.nix + ]; +} diff --git a/modules/desktop/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix similarity index 100% rename from modules/desktop/hyprland/hyprland.nix rename to modules/home/hyprland/hyprland.nix diff --git a/modules/desktop/hyprland/monitor.nix b/modules/home/hyprland/monitor.nix similarity index 100% rename from modules/desktop/hyprland/monitor.nix rename to modules/home/hyprland/monitor.nix diff --git a/modules/home/ssh.nix b/modules/home/ssh.nix new file mode 100644 index 0000000..8254dbd --- /dev/null +++ b/modules/home/ssh.nix @@ -0,0 +1,9 @@ +{ + pkgs, + ... +}: +{ + services.openssh = { + enable = true; + }; +}