From acf1e42b69d56c298e4419b303a7d3ffe4b34a3f Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Sat, 7 Dec 2024 19:26:34 +0100 Subject: [PATCH] Update nixpkgs-unstable --- flake.lock | 6 +++--- modules/personal/fonts/default.nix | 2 +- modules/services/nix-cache/default.nix | 2 +- overlay.nix | 17 ----------------- 4 files changed, 5 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 501fa01..f287845 100644 --- a/flake.lock +++ b/flake.lock @@ -1022,11 +1022,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732812356, - "narHash": "sha256-LNcgjOLArRlx2W6XSi0yc0xwLjrK3KF9LxAMqUgFDgw=", + "lastModified": 1733376361, + "narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "581d7e4d23b91daf2afa0005a5d3d01d6a8884fe", + "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c", "type": "github" }, "original": { diff --git a/modules/personal/fonts/default.nix b/modules/personal/fonts/default.nix index 5a02835..8d59fd8 100644 --- a/modules/personal/fonts/default.nix +++ b/modules/personal/fonts/default.nix @@ -8,7 +8,7 @@ with lib; packages = with pkgs; mkForce [ noto-fonts-emoji-blob-bin ibm-plex - (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) + nerd-fonts.symbols-only noto-fonts (pkgs.noto-fonts-cjk-sans or pkgs.noto-fonts-cjk) merriweather diff --git a/modules/services/nix-cache/default.nix b/modules/services/nix-cache/default.nix index cfec3c3..1928ef0 100644 --- a/modules/services/nix-cache/default.nix +++ b/modules/services/nix-cache/default.nix @@ -39,7 +39,7 @@ in services.harmonia = mkIf cfg.enableServer { enable = true; - signKeyPath = cfg.privateKeyFile; + signKeyPaths = [ cfg.privateKeyFile ]; settings = { bind = bindAddr; priority = 45; diff --git a/overlay.nix b/overlay.nix index 2ed5783..e0bff79 100644 --- a/overlay.nix +++ b/overlay.nix @@ -9,9 +9,6 @@ let # Typst updates really quickly. typst = final.unstable.typst; typst-lsp = final.unstable.typst-lsp; - - # Until 0.35 is in - kitty = final.unstable.kitty; }; overlay-imported = final: prev: { sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; }; @@ -103,19 +100,6 @@ let nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ]; }; }; - - overlay-rust-is-dumb = final: prev: { - # Use stable delta compiled with old Rust version - delta = final.stable.delta; - deepfilternet = final.stable.deepfilternet; - harmonia = final.callPackage - (import - (builtins.fetchurl { - url = "https://raw.githubusercontent.com/Mic92/nixpkgs/63f91202f5cd071187ede5e5ffc56003cb442876/pkgs/by-name/ha/harmonia/package.nix"; - sha256 = "1mz211c0bxn116ix0j5xx4wlglpbkfg7d3npw1z8hg9gc0vbj2xb"; - })) - { }; - }; in [ # inputs.swayfx.inputs.scenefx.overlays.override @@ -130,7 +114,6 @@ in overlay-imported overlay-versioning overlay-libs - overlay-rust-is-dumb (import ./packages/common)