diff --git a/colors.nix b/colors.nix index 5598687..0ffbb43 100644 --- a/colors.nix +++ b/colors.nix @@ -22,6 +22,23 @@ in { highlight-med = "#403d52"; highlight-high = "#524f67"; }; + example = { + base = "#191724"; + surface = "#1f1d2e"; + overlay = "#26233a"; + muted = "#6e6a86"; + subtle = "#908caa"; + text = "#e0def4"; + love = "#eb6f92"; + gold = "#f6c177"; + rose = "#ebbcba"; + pine = "#31748f"; + foam = "#9ccfd8"; + iris = "#c4a7e7"; + highlight-low = "#21202e"; + highlight-med = "#403d52"; + highlight-high = "#524f67"; + }; }; }; } diff --git a/devices/ellaca/options.nix b/devices/ellaca/options.nix index 71e38b9..b145c37 100644 --- a/devices/ellaca/options.nix +++ b/devices/ellaca/options.nix @@ -2,13 +2,9 @@ full = true; withNiri = true; - withGnome = false; - withVM = false; withContainers = true; - withGames = false; - hwmonPath = "/sys/class/hwmon/hwmon1/temp1_input"; stateVersion = "24.05"; diff --git a/devices/inkvine/options.nix b/devices/inkvine/options.nix index 86b4d00..033992c 100644 --- a/devices/inkvine/options.nix +++ b/devices/inkvine/options.nix @@ -2,10 +2,6 @@ full = true; withNiri = true; - withGnome = false; - - withVM = false; - withContainers = false; withGames = true; diff --git a/devices/pleniscenta/options.nix b/devices/pleniscenta/options.nix index c8b9eed..5c22220 100644 --- a/devices/pleniscenta/options.nix +++ b/devices/pleniscenta/options.nix @@ -1,16 +1,4 @@ { ... }: { - full = false; - - withNiri = false; - withGnome = false; - - withVM = false; - withContainers = false; - - withGames = false; - - hwmonPath = "/sys/class/hwmon/hwmon1/temp1_input"; - stateVersion = "24.05"; hmStateVersion = "24.11"; } diff --git a/devices/tunyon/options.nix b/devices/tunyon/options.nix index cdebb9b..54d29cb 100644 --- a/devices/tunyon/options.nix +++ b/devices/tunyon/options.nix @@ -2,10 +2,6 @@ full = true; withNiri = true; - withGnome = false; - - withVM = false; - withContainers = false; withGames = true; diff --git a/modules/default.nix b/modules/default.nix index 6806cd0..b6b2316 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,7 +2,6 @@ imports = [ ./containers ./games - ./gnome ./home ./niri ./user diff --git a/modules/games/default.nix b/modules/games/default.nix index eccf367..aaa4b39 100644 --- a/modules/games/default.nix +++ b/modules/games/default.nix @@ -1,10 +1,22 @@ -{ lib, config, pkgs, ... }: lib.mkIf config.withGames { - programs.steam.enable = true; - programs.gamemode.enable = true; +{ lib, config, pkgs, ... }: let + inherit (lib) mkIf mkMerge; +in mkIf config.withGames (mkMerge [ + (mkIf config.withImpermanence { + users.${config.username}= { + directories = [ + "Games" + ".steam" + ".local/share/PrismLauncher" + ]; + }; + }) { + programs.steam.enable = true; + programs.gamemode.enable = true; - home-manager.users.${config.username} = { - home.packages = with pkgs; [ - prismlauncher - ]; - }; -} + home-manager.users.${config.username} = { + home.packages = with pkgs; [ + prismlauncher + ]; + }; + } +]) diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix deleted file mode 100644 index a0b7d67..0000000 --- a/modules/gnome/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, config, pkgs, ... }: lib.mkIf config.withGnome { - services.xserver = { - enable = true; - desktopManager.gnome.enable = true; - }; - - services.gnome.core-utilities.enable = true; - - hardware.pulseaudio.enable = false; - - programs.dconf.enable = true; - - environment.gnome.excludePackages = with pkgs; [ - gnome-tour - gnome-user-docs - ]; -} diff --git a/modules/impermanence/default.nix b/modules/impermanence/default.nix index 367625b..2721774 100644 --- a/modules/impermanence/default.nix +++ b/modules/impermanence/default.nix @@ -6,6 +6,7 @@ "/var/lib/bluetooth" "/var/lib/nixos" "/var/lib/iwd" + "/etc/secureboot" ]; files = [ "/etc/machine-id" @@ -18,7 +19,6 @@ "Documents" "Pictures" "Videos" - "Games" "code" { directory = ".local/share/keyrings"; mode = "0700"; } ".local/share/direnv" diff --git a/options.nix b/options.nix index c09415d..1f15b1c 100644 --- a/options.nix +++ b/options.nix @@ -6,7 +6,6 @@ full = mkEnableOption "Enable complete configuration for end-user machine"; withNiri = mkEnableOption "Enable niri compositor"; - withGnome = mkEnableOption "Enable Gnome"; withVM = lib.mkEnableOption "Enable VM related configuration"; withContainers = mkEnableOption "Enable container support"; @@ -15,6 +14,8 @@ withImpermanence = mkEnableOption "Use impermanence module"; + withSecureBoot = mkEnableOption "Enable secure boot utilities (manual key-enrolling required)"; + disks = mkOption { type = attrsOf str; default = { };