diff --git a/modules/home/default.nix b/modules/home/default.nix index 3b738bc..c7dafac 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -42,7 +42,9 @@ in gparted heroic imageViewing - plasma + # plasma + hypr + wayland ivpn kolourPaint ledger diff --git a/modules/home/gui/desktop/plasma/default.nix b/modules/home/gui/desktop/plasma/default.nix index 6bac5b0..8fdd176 100755 --- a/modules/home/gui/desktop/plasma/default.nix +++ b/modules/home/gui/desktop/plasma/default.nix @@ -51,6 +51,7 @@ in "Switch to Desktop 2" = "Meta+2"; "Switch to Desktop 3" = "Meta+3"; "Switch to Desktop 4" = "Meta+4"; + "Switch to Desktop 5" = "Meta+5"; "Window Close" = "Meta+Tab"; "Window Fullscreen" = "Ctrl+Shift+Tab"; }; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 9da2991..87253da 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -8,12 +8,14 @@ in imports = builtins.attrValues { inherit (modules) flatpak + hypr + wayland ivpn network ollamaMars - plasma + # plasma plymouth - sddm + # sddm tuios wireguard microvm diff --git a/modules/nixos/guests/defenseio/default.nix b/modules/nixos/guests/defenseio/default.nix index 0662ba7..e6f7f67 100755 --- a/modules/nixos/guests/defenseio/default.nix +++ b/modules/nixos/guests/defenseio/default.nix @@ -41,9 +41,9 @@ in autostart = true; config = let - ceresCpu = 45; + ceresCpu = 40; erisCpu = 5; - marsCpu = 20; + marsCpu = 18; deimosCpu = 5; phobosCpu = 5; @@ -78,7 +78,7 @@ in num = 1024; ceresRam = num * 50; erisRam = num * 7; - marsRam = num * 24; + marsRam = num * 22; deimosRam = num * 7; phobosRam = num * 7; in diff --git a/modules/nixos/guests/jellyfin/default.nix b/modules/nixos/guests/jellyfin/default.nix index bb2857e..fbd888f 100755 --- a/modules/nixos/guests/jellyfin/default.nix +++ b/modules/nixos/guests/jellyfin/default.nix @@ -82,8 +82,8 @@ in systemd.services.systemd-networkd.wantedBy = [ "multi-user.target" ]; microvm = { - vcpu = 8; - mem = 8192; + vcpu = 2; + mem = 1024 * 3; hypervisor = "qemu"; interfaces = [ { diff --git a/modules/nixos/guests/mastodon/default.nix b/modules/nixos/guests/mastodon/default.nix index 5391572..5158ac3 100755 --- a/modules/nixos/guests/mastodon/default.nix +++ b/modules/nixos/guests/mastodon/default.nix @@ -290,8 +290,8 @@ in }; microvm = { - vcpu = 4; - mem = 8192; + vcpu = 2; + mem = 1024 * 3; hypervisor = "qemu"; interfaces = [ { diff --git a/modules/nixos/guests/minecraft/world0/default.nix b/modules/nixos/guests/minecraft/world0/default.nix index 7a2b15c..c137de0 100755 --- a/modules/nixos/guests/minecraft/world0/default.nix +++ b/modules/nixos/guests/minecraft/world0/default.nix @@ -124,8 +124,8 @@ in systemd.services.systemd-networkd.wantedBy = [ "multi-user.target" ]; microvm = { - vcpu = 6; - mem = 1024 * 8; + vcpu = 2; + mem = 1024 * 3; hypervisor = "qemu"; interfaces = [ {