diff options
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | home/apps/kitty.nix | 1 | ||||
| -rw-r--r-- | home/desktops/default.nix | 16 | ||||
| -rw-r--r-- | hosts/shinji/default.nix | 2 | ||||
| -rw-r--r-- | options.nix | 9 | ||||
| -rw-r--r-- | system/default.nix | 5 | ||||
| -rw-r--r-- | system/desktop.nix | 12 | ||||
| -rw-r--r-- | system/gaming/steam.nix | 13 |
8 files changed, 44 insertions, 15 deletions
@@ -82,7 +82,6 @@ ./options.nix (self.lib.homeConfig hostModule.config) { - nixpkgs.config.allowUnfree = true; programs.home-manager.enable = nixpkgs.lib.mkForce false; } ]; diff --git a/home/apps/kitty.nix b/home/apps/kitty.nix index e1c596e..9d86b50 100644 --- a/home/apps/kitty.nix +++ b/home/apps/kitty.nix @@ -53,6 +53,7 @@ in { # cursor url_color = "#${config.theme.colors.bright.yellow}"; cursor = "#${config.theme.colors.text}"; + cursor_shape = "beam"; # colors background = "#${config.theme.colors.base}"; diff --git a/home/desktops/default.nix b/home/desktops/default.nix index 4d02984..ab2c752 100644 --- a/home/desktops/default.nix +++ b/home/desktops/default.nix @@ -28,18 +28,28 @@ in { # xdg libnotify # fonts - corefonts + charis-sil dejavu_fonts + doulos-sil fira-code fira-code-symbols jetbrains-mono - material-icons + lmodern + lmmath + nasin-nanpa nerd-fonts.fira-code + nerd-fonts.jetbrains-mono noto-fonts noto-fonts-cjk-sans noto-fonts-color-emoji + open-sans + roboto + roboto-flex + roboto-mono + roboto-serif + roboto-slab + ttf_bitstream_vera twemoji-color-font - vista-fonts ] ++ (optionals config.desktops.wayland.enable [ # wayland diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix index c6158c4..34e84ec 100644 --- a/hosts/shinji/default.nix +++ b/hosts/shinji/default.nix @@ -58,10 +58,8 @@ scrcpy # misc foliate - #jami solaar qbittorrent - unityhub ]; # modules diff --git a/options.nix b/options.nix index 7995623..141bf08 100644 --- a/options.nix +++ b/options.nix @@ -254,6 +254,15 @@ in { }; # + # Packages + # + unfreePackages = mkOption { + type = types.listOf types.str; + description = "List of unfree package names used"; + default = []; + }; + + # # System modules # battery = mkEnableOption { 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 |