diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/default.nix | 5 | ||||
| -rw-r--r-- | system/desktop.nix | 12 | ||||
| -rw-r--r-- | system/desktops/ly.nix | 21 | ||||
| -rw-r--r-- | system/gaming/steam.nix | 13 |
4 files changed, 34 insertions, 17 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/desktops/ly.nix b/system/desktops/ly.nix index 3ff2c1d..49469b2 100644 --- a/system/desktops/ly.nix +++ b/system/desktops/ly.nix @@ -13,17 +13,14 @@ in { # display manager services.displayManager.ly = { enable = true; - package = inputs.self.packages.${system}.ly; settings = let base = "0x00${config.theme.colors.base}"; text = "0x00${config.theme.colors.text}"; bold = "0x01${config.theme.colors.text}"; error = "0x00${config.theme.colors.error}"; - save_file = pkgs.writeText "ly-prefs" '' - ${config.user} - 1 - ''; + red = "0x00${config.theme.colors.normal.red}"; + blue = "0x00${config.theme.colors.normal.blue}"; in { # general clear_password = true; @@ -34,9 +31,6 @@ in { session_log = "/dev/null"; # state (evil) tty = 1; - save = false; - load = true; - save_file = toString save_file; # background bg = base; error_bg = base; @@ -45,6 +39,11 @@ in { fg = text; error_fg = error; border_fg = bold; + # animation + animation = "colormix"; + colormix_col1 = blue; + colormix_col2 = red; + colormix_col3 = "0x20000000"; }; }; @@ -56,5 +55,11 @@ in { systemd.services.display-manager = { environment.XDG_CURRENT_DESKTOP = "X-NIXOS-SYSTEMD-AWARE"; }; + + # write save file + environment.etc."ly/save.txt".text = '' + 0 + ${config.user}:1 + ''; }; } 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 |