diff --git a/hosts/hidden/hardware/default.nix b/hosts/hidden/hardware/default.nix index e395f502..c427a762 100644 --- a/hosts/hidden/hardware/default.nix +++ b/hosts/hidden/hardware/default.nix @@ -18,5 +18,5 @@ }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/home/profiles/default.nix b/modules/home/profiles/default.nix index 5bd9361a..0f4a47f6 100644 --- a/modules/home/profiles/default.nix +++ b/modules/home/profiles/default.nix @@ -1,18 +1,14 @@ -{ config, lib, ... }: +{ lib, ... }: { - options.home = with lib; { - guifull.enable = mkEnableOption "Enable most other GUI profiles"; + imports = [ + ./generic + ./guifull + ]; + options.home = with lib; { desktop.enable = mkEnableOption "Desktop programs and services"; gaming.enable = mkEnableOption "Gaming apps and programs"; production.enable = mkEnableOption "Apps for visual productivity"; - school.enable = mkEnableOption "Apps for school and college"; }; - - config.home = lib.mkIf config.home.guifull.enable { - desktop.enable = true; - gaming.enable = true; - production.enable = true; - }; } diff --git a/modules/home/profiles/generic/default.nix b/modules/home/profiles/generic/default.nix new file mode 100644 index 00000000..1d0c5202 --- /dev/null +++ b/modules/home/profiles/generic/default.nix @@ -0,0 +1,8 @@ +{ config, lib, ... }: +{ + config = lib.mkIf config.targets.genericLinux.enable { + home = { + sessionVariables.PATH = "$HOME/.nix-profile/bin:$PATH"; + }; + }; +} diff --git a/modules/home/profiles/guifull/default.nix b/modules/home/profiles/guifull/default.nix new file mode 100644 index 00000000..a322678d --- /dev/null +++ b/modules/home/profiles/guifull/default.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: +{ + options.home = with lib; { + guifull.enable = mkEnableOption "Enable most other GUI profiles"; + }; + + config.home = lib.mkIf config.home.guifull.enable { + desktop.enable = true; + gaming.enable = true; + production.enable = true; + }; +} diff --git a/modules/home/settings/impermanence/default.nix b/modules/home/settings/impermanence/default.nix index 74a814a3..7719e354 100644 --- a/modules/home/settings/impermanence/default.nix +++ b/modules/home/settings/impermanence/default.nix @@ -3,8 +3,7 @@ imports = [ impermanence.homeManagerModules.default ]; home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}" = { - enable = true; - allowOther = if !config.targets.genericLinux.enable then true else false; + enable = !config.targets.genericLinux.enable; removePrefixDirectory = true; directories = let home = config.home.homeDirectory; diff --git a/modules/home/settings/nix/default.nix b/modules/home/settings/nix/default.nix index 21ba02ba..627937f5 100644 --- a/modules/home/settings/nix/default.nix +++ b/modules/home/settings/nix/default.nix @@ -6,7 +6,7 @@ ]; nix = { - package = lib.mkForce pkgs.lix; + package = lib.mkForce pkgs.nix; settings.experimental-features = [ "flakes" "nix-command" diff --git a/modules/home/settings/nixgl/default.nix b/modules/home/settings/nixgl/default.nix index ebf9c3d2..539ad99f 100644 --- a/modules/home/settings/nixgl/default.nix +++ b/modules/home/settings/nixgl/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: { - nixGL = lib.mkIf config.targets.genericLinux.enable { + nixGL = { installScripts = [ "mesa" "nvidia" diff --git a/modules/home/settings/xdg/folders/default.nix b/modules/home/settings/xdg/folders/default.nix index 38a53e7b..5722c561 100644 --- a/modules/home/settings/xdg/folders/default.nix +++ b/modules/home/settings/xdg/folders/default.nix @@ -14,7 +14,7 @@ XDG_GAMES_DIR = "${homeDirectory}/Games"; XDG_KEEPERS_DIR = "${homeDirectory}/Keepers"; XDG_NETWORK_DIR = "${homeDirectory}/Network"; - XDG_PERSIST_DIR = if !config.targets.genericLinux.enable then "/persist${homeDirectory}" else "${homeDirectory}/.stow"; + XDG_PERSIST_DIR = "/persist${homeDirectory}"; XDG_PROJECTS_DIR = "${homeDirectory}/Projects"; XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots"; };