From c18886cd32f21a1fd8d4a52bbe244c1b81f6f70e Mon Sep 17 00:00:00 2001 From: poslop Date: Wed, 30 Apr 2025 15:58:49 -0500 Subject: [PATCH] working --- hosts/nixos-vm1/modules/default.nix | 5 ----- hosts/nixos-vm1/modules/desktop/default.nix | 5 ----- hosts/nixos-vm1/modules/desktop/hyprland/default.nix | 5 ----- hosts/nixos-vm2/configuration.nix | 8 +++++--- modules/desktop/hyprland/default.nix | 2 +- .../modules => modules}/desktop/hyprland/monitor.nix | 0 rebuild.sh | 1 + 7 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 hosts/nixos-vm1/modules/default.nix delete mode 100644 hosts/nixos-vm1/modules/desktop/default.nix delete mode 100644 hosts/nixos-vm1/modules/desktop/hyprland/default.nix rename {hosts/nixos-vm1/modules => modules}/desktop/hyprland/monitor.nix (100%) create mode 100755 rebuild.sh diff --git a/hosts/nixos-vm1/modules/default.nix b/hosts/nixos-vm1/modules/default.nix deleted file mode 100644 index 5c8d960..0000000 --- a/hosts/nixos-vm1/modules/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./desktop - ]; -} diff --git a/hosts/nixos-vm1/modules/desktop/default.nix b/hosts/nixos-vm1/modules/desktop/default.nix deleted file mode 100644 index 3fbd598..0000000 --- a/hosts/nixos-vm1/modules/desktop/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./hyprland - ]; -} diff --git a/hosts/nixos-vm1/modules/desktop/hyprland/default.nix b/hosts/nixos-vm1/modules/desktop/hyprland/default.nix deleted file mode 100644 index 4c2bef5..0000000 --- a/hosts/nixos-vm1/modules/desktop/hyprland/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./monitor.nix - ]; -} diff --git a/hosts/nixos-vm2/configuration.nix b/hosts/nixos-vm2/configuration.nix index 1748f6f..0c8fa91 100644 --- a/hosts/nixos-vm2/configuration.nix +++ b/hosts/nixos-vm2/configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, inputs, ... }: +{ config, lib, pkgs, ... }: { nix.settings = { @@ -7,7 +7,6 @@ imports = [ - "${inputs.self}/modules" ./hardware-configuration.nix ]; @@ -35,10 +34,13 @@ ]; }; + services.spice-vdagentd.enable = true; + services.qemuGuest.enable = true; + environment.systemPackages = with pkgs; [ + kitty vim wget - kitty git curl zsh diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix index 96e5300..4c2bef5 100644 --- a/modules/desktop/hyprland/default.nix +++ b/modules/desktop/hyprland/default.nix @@ -1,5 +1,5 @@ { imports = [ - ./hyprland.nix + ./monitor.nix ]; } diff --git a/hosts/nixos-vm1/modules/desktop/hyprland/monitor.nix b/modules/desktop/hyprland/monitor.nix similarity index 100% rename from hosts/nixos-vm1/modules/desktop/hyprland/monitor.nix rename to modules/desktop/hyprland/monitor.nix diff --git a/rebuild.sh b/rebuild.sh new file mode 100755 index 0000000..60c6ba7 --- /dev/null +++ b/rebuild.sh @@ -0,0 +1 @@ +sudo nixos-rebuild switch --flake ./#nixos-vm2