diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/default.nix | 5 | ||||
| -rw-r--r-- | system/desktop.nix | 12 | ||||
| -rw-r--r-- | system/gaming/steam.nix | 13 |
3 files changed, 21 insertions, 9 deletions
diff --git a/system/default.nix b/system/default.nix index eb220ed..f6a6fa3 100644 --- a/system/default.nix +++ b/system/default.nix @@ -25,8 +25,9 @@ nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings.use-xdg-base-directories = true; - # allow unfree packages - nixpkgs.config.allowUnfree = true; + # allow defined unfree packages + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) config.unfreePackages; # set state version system.stateVersion = config.stateVersion; diff --git a/system/desktop.nix b/system/desktop.nix index 307d0b9..d22a475 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -1,5 +1,6 @@ { lib, + pkgs, config, inputs, system, @@ -55,5 +56,16 @@ in { enable = true; package = inputs.preload-ng.packages.${system}.preload-ng-src; }; + + # system fonts + fonts.packages = with pkgs; [ + corefonts + vista-fonts + ]; + + unfreePackages = [ + "corefonts" + "vista-fonts" + ]; }; } diff --git a/system/gaming/steam.nix b/system/gaming/steam.nix index ada0aaf..2364291 100644 --- a/system/gaming/steam.nix +++ b/system/gaming/steam.nix @@ -7,12 +7,12 @@ cfg = config.gaming.steam; in { config = mkIf cfg.enable { - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-runtime" - ]; + unfreePackages = [ + "steam" + "steam-original" + "steam-runtime" + "steam-unwrapped" + ]; programs.gamescope = { enable = true; @@ -28,7 +28,6 @@ in { }; # controllers - hardware.xone.enable = true; hardware.steam-hardware.enable = true; # cod |