diff --git a/flake.lock b/flake.lock index 42a20f9..85831c8 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ ] }, "locked": { - "lastModified": 1780678125, - "narHash": "sha256-EOqBLRKjzpwDGpYrrNmLj/4FfGtKl856672aZzlcmL0=", + "lastModified": 1781283585, + "narHash": "sha256-JELElPQzPHxcK6CX/x5M6jkZBCVsy3eNYMD7VKupOP0=", "owner": "linyinfeng", "repo": "angrr", - "rev": "f20f94fbb488bd29ccbebd1bdb13cc428cd48f82", + "rev": "1cd3e44186e07cdc86f8b82de1854c4f999eeca4", "type": "github" }, "original": { @@ -246,11 +246,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1780630679, - "narHash": "sha256-hhQyVAYmNKziZ0T+T4Gsk0PYmnz4vdzOzpkJAmDASKM=", + "lastModified": 1781195293, + "narHash": "sha256-C9OFghpvf3RzK2rGsZjjNNrTrHgFOecEkpDhFnU4QGs=", "owner": "cachix", "repo": "devenv", - "rev": "90ed6227ab389dd4e874a69a724f25dba312b754", + "rev": "5f5109c83854577191634f7b86fc6e0c8fd44964", "type": "github" }, "original": { @@ -267,11 +267,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1780654233, - "narHash": "sha256-F5rHBSjkUyobwPC2IclWO6t91hiKBnuJa0yDfKuUchE=", + "lastModified": 1781260166, + "narHash": "sha256-vKKEJke8kswPWPu/J/giMA92VFrVNWQn7x6TwRmJHBo=", "owner": "nix-community", "repo": "fenix", - "rev": "b9e0e5df8f7b4456eb1cad97c435ad0b3e44c669", + "rev": "a257e130673b0a1caa7137bf0896169910efdd5a", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1780679734, - "narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=", + "lastModified": 1781305496, + "narHash": "sha256-g8Vv4Qfc7n+lgov97REu3X6BeJtvYY0hlSUZR1GrGQQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b2b7db486e06e098711dc291bb25db82850e1d16", + "rev": "c87a39aa979acc4848016d2220c6238390d84779", "type": "github" }, "original": { @@ -581,9 +581,7 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "systems": [ "systems" ], @@ -592,11 +590,11 @@ ] }, "locked": { - "lastModified": 1780708788, - "narHash": "sha256-BaHq9HXksp8OGe0kl6x7IxlyqIWgVQj5qHSaAqhAgDs=", + "lastModified": 1781314753, + "narHash": "sha256-jYUqaiwYXDaYyAD37BkjfdokNOUKldSrgDuGClKgesc=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "364bfe7a69b3adbfe5c1fedd7a6abf7dd3c79928", + "rev": "62824228f20bd515681e7dcab3ff13799ef5186c", "type": "github" }, "original": { @@ -654,17 +652,21 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixpkgs-stable" + ], "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1780694373, - "narHash": "sha256-wuj6QmOlLsGjBOut+Ki/hiOT/H5ONzBePqOkOolsNfo=", + "lastModified": 1781234038, + "narHash": "sha256-jo4a47qDgsx1F1i0MtHZl12FfzqKJOES25vbm0ZUxeI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8f7043c852210cd0875a1bbe9ca872c90ab5ac74", + "rev": "eb5789cba8d37802d330df5a13c691622c83121f", "type": "github" }, "original": { @@ -693,11 +695,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1780637332, - "narHash": "sha256-FeKyLRxLZu2EUnhifijZPDZRl0sVnPVHMtizAINNiN4=", + "lastModified": 1780938415, + "narHash": "sha256-QHyIMGSbCQW8d5qbOrMsm6gem10bO3Au2YLa3alJfHo=", "owner": "YaLTeR", "repo": "niri", - "rev": "f717ae030fe56fc52522ebef69f17f3f09064ac4", + "rev": "6f1a2c5f0e8274223d4204b1f8d6f7f91538967e", "type": "github" }, "original": { @@ -754,11 +756,11 @@ ] }, "locked": { - "lastModified": 1779036909, - "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=", + "lastModified": 1781242433, + "narHash": "sha256-bchLZZ3sRn740zyvD2icZSnNoTaanN0nw7l6fjVXO+E=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "56c666e108467d87d13508936aade6d567f2a501", + "rev": "aabb2037edfc0f210723b72cd5f528aab5dd3f0b", "type": "github" }, "original": { @@ -827,11 +829,11 @@ ] }, "locked": { - "lastModified": 1780704078, - "narHash": "sha256-Ktgje3rXwJK3c7nhub8qYgIy/VCYNVrUmIVaaeDhe0E=", + "lastModified": 1781182279, + "narHash": "sha256-V5EQQbDnmdiXGQXrEF1PEL7QYsFqfH8N1E89Z5ONwFk=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "ad4c358ded144d26da517b999ddb51295770c419", + "rev": "5675822ba756e6e56f8f6a5a76e90e0da2ece94d", "type": "github" }, "original": { @@ -842,27 +844,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1781268102, + "narHash": "sha256-Zn5KTggEmUB3lXn/ccERNcBdddE6IaOFber9dWViWDg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "49a4bd0573c376468dd7996ddb6f9fa31d8c4d97", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-master": { "locked": { - "lastModified": 1780711917, - "narHash": "sha256-Cw9useKmvzRyrzQtghZPi56ImYXKsyrh+vo94hCYM3I=", + "lastModified": 1781323056, + "narHash": "sha256-8I6M3cSHg9+z4+xTX1SHig/tR/iS/6EWXzCVUT3hA8c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f3ce60d5372cbb1490033766bdd4748dc0128e86", + "rev": "8db627f70ed7d250965d1650ed6560f5d1fc6f09", "type": "github" }, "original": { @@ -874,27 +876,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1780511130, - "narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "535f3e6942cb1cead3929c604320d3db54b542b9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1780692395, - "narHash": "sha256-dAyK1031bvJZC/MBRl74IvHrOqA915OmD8cdWUa8Ucg=", + "lastModified": 1781301499, + "narHash": "sha256-Uggd5B3ix0F3Y+MK75tBPjWRMDpuEOeDR5vVev/LsFU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8e54c6a68fd045814b3650040b48440cd28acf19", + "rev": "0c21b4cd8a6b561283f8ae412c7e795f51e753fa", "type": "github" }, "original": { @@ -906,11 +892,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { @@ -1032,7 +1018,7 @@ "nixpkgs-unstable" ], "nixpkgs-master": "nixpkgs-master", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", "plant": "plant", @@ -1047,11 +1033,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1780573409, - "narHash": "sha256-Dlru75JzUwjI9d5uiDrN9Rt/wTFVTuqt6QBT+nf2g8U=", + "lastModified": 1781193851, + "narHash": "sha256-Pz4G9dV3Cy9L2Gtl8dMrHlwPa8Oy+vE8NIXmd2b6ZVo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "aadee11251e6074c9245ac96bc4bfe6eca05a64c", + "rev": "dc0ac97934098a20224a4638f39ae88fa97e9b88", "type": "github" }, "original": { @@ -1127,11 +1113,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1780701809, - "narHash": "sha256-u7AUNs6U6eD1os4+ghbr1gH4QjPWzOdKvpeM+E+XRKM=", + "lastModified": 1781018772, + "narHash": "sha256-C+cGIUaC6dqfwTbI+BwCd572PbESGA3WYxR1sLTqxkY=", "owner": "danth", "repo": "stylix", - "rev": "3a02d9f73608641b28e08b26acb0b0b47c05f14b", + "rev": "a378e4c09031fb15a4d65da88aa628f71fc52f6b", "type": "github" }, "original": { @@ -1301,11 +1287,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1779745227, - "narHash": "sha256-yqY7RtEJGJiENzR0GwL6q69tSAy6xAAmAcLuIhLjPf8=", + "lastModified": 1781226823, + "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "5d1efbc9dc3ab1c10160b656e0247f3325daf0f2", + "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e", "type": "github" }, "original": { @@ -1324,11 +1310,11 @@ ] }, "locked": { - "lastModified": 1780567926, - "narHash": "sha256-LVaiAnBwgr2YotaIlrcwCgmbwHsE2ccegRztLjur/d4=", + "lastModified": 1781173532, + "narHash": "sha256-MwnZpL82aQO1I15JH525vz6REI/OULEAmXDp6cIcgNg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "eea9ae34eb9011aee9b8ce8ee2bc2dd111ee8285", + "rev": "f13e82162fae68af7716147207fa5f868f5ca381", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cb55384..2cfec0b 100644 --- a/flake.nix +++ b/flake.nix @@ -90,16 +90,16 @@ }; llm-agents = { url = "github:numtide/llm-agents.nix"; - inputs.nixpkgs.follows = "nixpkgs"; + # Not followed intentionally (binary cache) + # inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; inputs.systems.follows = "systems"; inputs.treefmt-nix.follows = "treefmt"; }; niri = { url = "github:sodiboo/niri-flake"; - # Not followed intentionally (binary cache) - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.nixpkgs-stable.follows = "nixpkgs-stable"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs-stable"; }; noctalia = { url = "github:noctalia-dev/noctalia-shell/v4.7.5"; diff --git a/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua b/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua index 25fbcf3..52d7b68 100644 --- a/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua +++ b/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua @@ -193,7 +193,7 @@ local plugins = { }, }, }, - "saghen/blink.lib" + "saghen/blink.lib", }, config = function() require("blink.cmp").setup(require("plugins.cmp.cmp")) diff --git a/modules/core/nix.nix b/modules/core/nix.nix index c1d5b2e..5755c08 100644 --- a/modules/core/nix.nix +++ b/modules/core/nix.nix @@ -41,9 +41,13 @@ in "nix/nix-racer.toml".source = (pkgs.formats.toml { }).generate "nix-racer.toml" { listen = "127.0.0.1:2048"; substituters = [ + # { + # penalty = 0; + # url = "https://mirror.sjtu.edu.cn/nix-channels/store"; + # } { penalty = 0; - url = "https://mirror.sjtu.edu.cn/nix-channels/store"; + url = "https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store"; } { penalty = 50; @@ -55,7 +59,7 @@ in } { penalty = 0; - url = "https://cache.garnix.io"; + url = "https://cache.numtide.com"; } { penalty = 100; @@ -114,17 +118,17 @@ in experimental-features = "nix-command flakes pipe-operators"; substituters = lib.mkForce [ "http://127.0.0.1:2048" - "https://mirror.sjtu.edu.cn/nix-channels/store" + "https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store" + "https://cache.numtide.com" "https://cache.nixos.org" # "https://mirrors.ustc.edu.cn/nix-channels/store" # "https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store" # "https://nix-community.cachix.org" - # "https://cache.garnix.io" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + "niks3.numtide.com-1:DTx8wZduET09hRmMtKdQDxNNthLQETkc/yaX7M4qK0g=" ]; download-buffer-size = 536870912; # 512 MiB warn-dirty = false; diff --git a/modules/desktop/wm/niri/default.nix b/modules/desktop/wm/niri/default.nix index 406299c..c7c808b 100644 --- a/modules/desktop/wm/niri/default.nix +++ b/modules/desktop/wm/niri/default.nix @@ -15,6 +15,7 @@ in }; config = lib.mkIf cfg.enable { + niri-flake.cache.enable = false; programs.niri = { enable = true; package = pkg;