diff --git a/hosts/detritus/user/default.nix b/hosts/detritus/user/default.nix index 07de9f2a..7dc502d6 100644 --- a/hosts/detritus/user/default.nix +++ b/hosts/detritus/user/default.nix @@ -2,7 +2,7 @@ { home-manager.users."${config.sysusers.main}" = { home = { - guifull.enable = true; + desktop.enable = true; stateVersion = lib.mkForce config.system.stateVersion; }; diff --git a/hosts/hidden/default.nix b/hosts/hidden/default.nix index 91f5ae24..18cb16db 100644 --- a/hosts/hidden/default.nix +++ b/hosts/hidden/default.nix @@ -1,9 +1,10 @@ -{ ... }: +{ lib, ... }: { imports = [ ./boot ./disko ./hardware + ./services ./user ../../modules/system ]; diff --git a/hosts/hidden/services/default.nix b/hosts/hidden/services/default.nix new file mode 100644 index 00000000..e1b677cd --- /dev/null +++ b/hosts/hidden/services/default.nix @@ -0,0 +1,9 @@ +{ config, lib, ... }: +{ + networking.useNetworkd = lib.mkForce false; + + virtualisation = { + libvirtd.enable = true; + vmware.host.enable = true; + }; +} diff --git a/hosts/hidden/user/default.nix b/hosts/hidden/user/default.nix index 3ca3a690..4e49c399 100644 --- a/hosts/hidden/user/default.nix +++ b/hosts/hidden/user/default.nix @@ -1,7 +1,8 @@ { config, lib, ... }: { home-manager.users."${config.sysusers.main}".home = { - guifull.enable = true; + desktop.enable = true; + school.enable = true; stateVersion = lib.mkForce config.system.stateVersion; }; } diff --git a/hosts/jupiter/services/default.nix b/hosts/jupiter/services/default.nix index f633f5d2..80db5f9e 100644 --- a/hosts/jupiter/services/default.nix +++ b/hosts/jupiter/services/default.nix @@ -9,12 +9,5 @@ libvirtd.enable = true; vmware.host.enable = true; }; - - nixpkgs.allowUnfreePackages = [ "vmware-workstation" ]; - - environment.persistence."/persist".users.${config.sysusers.main}.directories = [ - "vmware" - ".vmware" - ]; }; } diff --git a/modules/home/programs/misc/school/default.nix b/modules/home/programs/misc/school/default.nix index aba9de2a..2e1388bf 100644 --- a/modules/home/programs/misc/school/default.nix +++ b/modules/home/programs/misc/school/default.nix @@ -16,6 +16,8 @@ "school/.config/com.yuezk.qt" "school/.config/remmina" "school/.config/teams-for-linux" + "school/.vmware" + "school/vmware" ]; }; } diff --git a/modules/home/programs/terminal/nh/default.nix b/modules/home/programs/terminal/nh/default.nix index 387f8bd8..3eb9b254 100644 --- a/modules/home/programs/terminal/nh/default.nix +++ b/modules/home/programs/terminal/nh/default.nix @@ -2,7 +2,7 @@ { programs.nh = { enable = true; - flake = "${config.home.homeDirectory}/Projects/nixos-config"; + flake = "${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}/dirs/Projects/nixos-config"; }; home.shellAliases = { diff --git a/modules/home/settings/impermanence/default.nix b/modules/home/settings/impermanence/default.nix index e8e25295..04e50743 100644 --- a/modules/home/settings/impermanence/default.nix +++ b/modules/home/settings/impermanence/default.nix @@ -6,16 +6,16 @@ allowOther = false; removePrefixDirectory = true; directories = [ - "home/Keepers" - "home/Projects" + "dirs/Keepers" + "dirs/Projects" "nix/.local/state/nix/profiles" "secure/.ssh" ] ++ (if config.home.desktop.enable then [ - "home/Documents" - "home/Games" - "home/Photos" - "home/Videos" + "dirs/Documents" + "dirs/Games" + "dirs/Photos" + "dirs/Videos" "secure/.pki" "state/.local/state/wireplumber" diff --git a/modules/system/services/general/default.nix b/modules/system/services/general/default.nix index 5b57ebba..9612da44 100644 --- a/modules/system/services/general/default.nix +++ b/modules/system/services/general/default.nix @@ -9,5 +9,6 @@ ./ssh ./tlp ./userborn + ./vmware ]; } diff --git a/modules/system/services/general/vmware/default.nix b/modules/system/services/general/vmware/default.nix new file mode 100644 index 00000000..83216ffb --- /dev/null +++ b/modules/system/services/general/vmware/default.nix @@ -0,0 +1,13 @@ +{ config, lib, ... }: +{ + config = lib.mkIf config.virtualisation.vmware.host.enable { + virtualisation.vmware.host = { + extraConfig = '' + mks.gl.allowUnsupportedDrivers = "TRUE" + mks.vk.allowUnsupportedDevices = "TRUE" + ''; + }; + + nixpkgs.allowUnfreePackages = [ "vmware-workstation" ]; + }; +}