From 0f90fed5d42551c50b8792a335df3d6a3d00e3f7 Mon Sep 17 00:00:00 2001 From: yushyin Date: Thu, 18 Dec 2025 22:33:52 +0100 Subject: [PATCH] flake: Bump nixpkgs and home-manager to 25.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/af66ad14b28a127c5c0f3bbb298218fc63528a18?narHash=sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8%3D' (2025-08-06) → 'github:hercules-ci/flake-parts/a34fae9c08a15ad73f295041fec82323541400a9?narHash=sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw%3D' (2025-12-15) • Updated input 'home-manager': 'github:nix-community/home-manager/fc3add429f21450359369af74c2375cb34a2d204?narHash=sha256-oV695RvbAE4%2BR9pcsT9shmp6zE/%2BIZe6evHWX63f2Qg%3D' (2025-07-27) → 'github:nix-community/home-manager/d3135ab747fd9dac250ffb90b4a7e80634eacbe9?narHash=sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0%3D' (2025-12-17) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/b65f8d80656f9fcbd1fecc4b7f0730f468333142?narHash=sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0%3D' (2025-08-10) → 'github:nix-community/nix-index-database/82befcf7dc77c909b0f2a09f5da910ec95c5b78f?narHash=sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws%3D' (2025-12-09) • Updated input 'nixGL': 'github:guibou/nixGL/a8e1ce7d49a149ed70df676785b07f63288f53c5?narHash=sha256-Ob/HuUhANoDs%2BnvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ%3D' (2025-07-09) → 'github:guibou/nixGL/b6105297e6f0cd041670c3e8628394d4ee247ed5?narHash=sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8%3D' (2025-11-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e728d7ae4bb6394bbd19eec52b7358526a44c414?narHash=sha256-YzNTExe3kMY9lYs23mZR7jsVHe5TWnpwNrsPOpFs/b8%3D' (2025-08-07) → 'github:NixOS/nixpkgs/c6f52ebd45e5925c188d1a20119978aa4ffd5ef6?narHash=sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8%3D' (2025-12-15) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054?narHash=sha256-iAcj9T/Y%2B3DBy2J0N%2ByF9XQQQ8IEb5swLFzs23CdP88%3D' (2025-08-09) → 'github:nixos/nixpkgs/def3da69945bbe338c373fddad5a1bb49cf199ce?narHash=sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0%3D' (2025-12-18) home/zsh: Using relative paths in dotDir is deprecated. Use config.xdg.configHome instead profiles/dev: Use nixd from stable branch home/fonts: Rename noto-fonts-emoji to noto-fonts-color-emoji profiles/graphical: Rename xpui.js to xpui-snapshot.js (spotify patch) --- flake.lock | 42 ++++++++++----------- flake.nix | 4 +- home/modules/by-name/fonts/default.nix | 2 +- home/modules/by-name/zsh/default.nix | 2 +- home/modules/profiles/dev.nix | 2 +- home/modules/profiles/graphical/default.nix | 6 +-- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 4e725ab..aebb2c6 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -80,16 +80,16 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1765979862, + "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1754800038, - "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1752054764, - "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "lastModified": 1762090880, + "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=", "owner": "guibou", "repo": "nixGL", - "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5", "type": "github" }, "original": { @@ -137,27 +137,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754563854, - "narHash": "sha256-YzNTExe3kMY9lYs23mZR7jsVHe5TWnpwNrsPOpFs/b8=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e728d7ae4bb6394bbd19eec52b7358526a44c414", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", - "owner": "NixOS", + "lastModified": 1766025857, + "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a3ca1f1..8217b7f 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ description = "yushyin's shelter"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; @@ -16,7 +16,7 @@ haumea.url = "github:nix-community/haumea"; haumea.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-25.05"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; theming.url = "git+https://forge.nihilum.space/yushyin/themes-colors"; diff --git a/home/modules/by-name/fonts/default.nix b/home/modules/by-name/fonts/default.nix index 35efd99..76aa7cc 100644 --- a/home/modules/by-name/fonts/default.nix +++ b/home/modules/by-name/fonts/default.nix @@ -7,7 +7,7 @@ config = lib.mkIf config.fonts.fontconfig.enable { home.packages = with pkgs; [ nerd-fonts.hack - noto-fonts-emoji + noto-fonts-color-emoji noto-fonts-cjk-sans noto-fonts-cjk-serif ]; diff --git a/home/modules/by-name/zsh/default.nix b/home/modules/by-name/zsh/default.nix index 3e07274..235a5f0 100644 --- a/home/modules/by-name/zsh/default.nix +++ b/home/modules/by-name/zsh/default.nix @@ -5,7 +5,7 @@ { config, pkgs, lib, ... }: lib.mkIf config.programs.zsh.enable { programs.zsh = { - dotDir = ".config/zsh"; + dotDir = "${config.xdg.configHome}/zsh"; history.path = "${config.xdg.dataHome}/zsh/zsh_history"; initContent = builtins.readFile ./zshrc + '' # too lazy to configure my own prompt, thus just use pure-prompt for now diff --git a/home/modules/profiles/dev.nix b/home/modules/profiles/dev.nix index bd57ffc..93c4841 100644 --- a/home/modules/profiles/dev.nix +++ b/home/modules/profiles/dev.nix @@ -29,7 +29,7 @@ in home.packages = with pkgs; [ cabal-install ghc haskell-language-server ]; }; nix = { - home.packages = (with pkgs; [ nixfmt-rfc-style ]) ++ (with inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; [ nixd ]); + home.packages = (with pkgs; [ nixfmt-rfc-style nixd ]); }; purescript = { home.packages = with pkgs; [ nodePackages.purescript-language-server ]; diff --git a/home/modules/profiles/graphical/default.nix b/home/modules/profiles/graphical/default.nix index b6d12ab..e6d076b 100644 --- a/home/modules/profiles/graphical/default.nix +++ b/home/modules/profiles/graphical/default.nix @@ -95,9 +95,9 @@ --set LD_PRELOAD "${pkgs.spotify-adblock}/lib/libspotifyadblock.so" # Hide placeholder for advert banner - ${pkgs.unzip}/bin/unzip -p $out/share/spotify/Apps/xpui.spa xpui.js | sed 's/adsEnabled:\!0/adsEnabled:false/' > $out/share/spotify/Apps/xpui.js - ${pkgs.zip}/bin/zip --junk-paths --update $out/share/spotify/Apps/xpui.spa $out/share/spotify/Apps/xpui.js - rm $out/share/spotify/Apps/xpui.js + ${pkgs.unzip}/bin/unzip -p $out/share/spotify/Apps/xpui.spa xpui-snapshot.js | sed 's/adsEnabled:\!0/adsEnabled:false/' > $out/share/spotify/Apps/xpui-snapshot.js + ${pkgs.zip}/bin/zip --junk-paths --update $out/share/spotify/Apps/xpui.spa $out/share/spotify/Apps/xpui-snapshot.js + rm $out/share/spotify/Apps/xpui-snapshot.js ''; }); });