diff --git a/flake.lock b/flake.lock index 187d704..78b4c2c 100644 --- a/flake.lock +++ b/flake.lock @@ -178,11 +178,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1754420989, - "narHash": "sha256-3e4wHzNwTMg7GaeLH9A091DMaO9AfFxUjpfqbddCUeo=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f38f25a44023a21a504bd3fd9d4f41c4a39f55c", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -420,11 +420,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1754450053, - "narHash": "sha256-Ex4vYChLUmVIvL0O/m4QWwjPVUOszxfLI3o1DTVQpt8=", + "lastModified": 1755562676, + "narHash": "sha256-vjXyKX/+RIg9mpjTRdnlwI3rM6v1IbgAEGDXGEwircY=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "1ec8188b5c012338f140c4be53dfa1be787f9eb9", + "rev": "6fdaf21b8266483651ec3943f6ec45f7609b1b9a", "type": "github" }, "original": { @@ -478,11 +478,11 @@ ] }, "locked": { - "lastModified": 1754457347, - "narHash": "sha256-QN9yZ1L5EmR16NNM+hNNzMjARk+FPjUeSE/ds4Kms0E=", + "lastModified": 1755601933, + "narHash": "sha256-iXZeeYyfy8NdpvH/OOW9V3C2AfsXE+fzDHfrIOHBPF0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ad5d2b4aa770fdc74c80fd682fee0b00a8ad7991", + "rev": "8af2e064f93234ee79df8b9858eeefbf84394488", "type": "github" }, "original": { @@ -526,11 +526,11 @@ "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { - "lastModified": 1754223384, - "narHash": "sha256-pewBF80b4slivTMSeONyOPceyzUUlBLpVOxlGf0hFEY=", + "lastModified": 1754828166, + "narHash": "sha256-i7c+fpXVsnvj2+63Gl3YfU1hVyxbLeqeFj55ZBZACWI=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "2d6fee65844e851060a6817984248bcf8358c6b0", + "rev": "f01c8d121a3100230612be96e4ac668e15eafb77", "type": "github" }, "original": { @@ -547,11 +547,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1754453133, - "narHash": "sha256-3AwYWyCt6mHDfyHPviOLSvn3f+bWQrWo/j+wIzSqpfs=", + "lastModified": 1755517372, + "narHash": "sha256-hPLk6SSLTzag/anov7f+zmIvmuQBWw22q19qFydkTvQ=", "owner": "DreamMaoMao", "repo": "mangowc", - "rev": "f9dcaaae777b2d15c2a6802344d97fc34ed9580f", + "rev": "51ba025716d4b5ddaac9e2dbf87eef3f65506990", "type": "github" }, "original": { @@ -569,11 +569,11 @@ ] }, "locked": { - "lastModified": 1750505787, - "narHash": "sha256-D57Vl2x9RJP+8pjYGYUf1L/q+G6bsmoVaqJX3m5PtlQ=", + "lastModified": 1753859411, + "narHash": "sha256-xiQGpk987dCmeF29mClveaGJNIvljmJJ9FRHVPp92HU=", "owner": "DreamMaoMao", "repo": "mmsg", - "rev": "4dc703aa06ae40d2cf5d3c0122b4d7f7d78fe8bf", + "rev": "6066d37d810bb16575c0b60e25852d1f6d50de60", "type": "github" }, "original": { @@ -587,11 +587,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1754215936, - "narHash": "sha256-aIk3DNwa9s0cGkeKOtQq/2iMyfhgf+kgmpJflX7sn/A=", + "lastModified": 1755510252, + "narHash": "sha256-IPwAGaR9LO4LasxIFPqOTmIfliDsnzWVgzsaIekzRG4=", "owner": "viperML", "repo": "nh", - "rev": "a38e84e3c51904810189979f6a0ef4439352d65d", + "rev": "8d690296fb3b898da565b33455a4227aed8a3133", "type": "github" }, "original": { @@ -607,11 +607,11 @@ ] }, "locked": { - "lastModified": 1753661392, - "narHash": "sha256-fK4INnIJQNAA8cyjcDRZSPleA+N/STI6I0oBDMZ2r+E=", + "lastModified": 1754679101, + "narHash": "sha256-nFK2XhrDS5igmkDQWmyTcgiJsEr3KOcR31DaSy+Fy9s=", "owner": "oxalica", "repo": "nil", - "rev": "cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d", + "rev": "f80fe365cb441624d1608235e6e793e5dce47fb0", "type": "github" }, "original": { @@ -623,20 +623,18 @@ "niri": { "inputs": { "niri-stable": "niri-stable", - "niri-unstable": [ - "niri-unstable" - ], + "niri-unstable": "niri-unstable", "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1754403288, - "narHash": "sha256-FdI2tV45ChVgwly2JRx1lA68gHIdZ38yyzHJeHHYTSc=", + "lastModified": 1755424351, + "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a5151e16afa09a01ef7b360d87956730d0534da7", + "rev": "9aa137af01f05386e5bb5050e983750017007a66", "type": "github" }, "original": { @@ -665,15 +663,15 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1754400448, - "narHash": "sha256-tP4wYaIKlhMTzNp0S9ouU5Key0+41Z5KkjP9zO6bIQU=", - "owner": "YalTeR", + "lastModified": 1755419373, + "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=", + "owner": "YaLTeR", "repo": "niri", - "rev": "52c579d5567d0b16ae68177fad05c612baba38af", + "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599", "type": "github" }, "original": { - "owner": "YalTeR", + "owner": "YaLTeR", "repo": "niri", "type": "github" } @@ -686,11 +684,11 @@ ] }, "locked": { - "lastModified": 1754406208, - "narHash": "sha256-liUId61xGKvxEkk4KcrMunJU2gPePCzpjsHcU5xjG/k=", + "lastModified": 1754476755, + "narHash": "sha256-vSF0VMEmPMzwNkrXIZwkhOSYmKES9BaDK/LlEe7/q8E=", "owner": "doronbehar", "repo": "nix-matlab", - "rev": "b38f8b79af583185c68002a7603d31d8986911cc", + "rev": "0e9c9fb660f9e1a1e4d59fd083e0212a15b513e2", "type": "gitlab" }, "original": { @@ -728,11 +726,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1754193386, - "narHash": "sha256-FHD7fXA77RIF0J/eQHL0MS2+E3sZeiKN1BWC2UpY6xE=", + "lastModified": 1755611592, + "narHash": "sha256-qW9AmvvtcNg7AO233ukL2YIE7GpHfwUPANgctWBThv8=", "owner": "nix-community", "repo": "nixd", - "rev": "89332c35fe968902f582e5c1a3b409f6da5f9315", + "rev": "04e52933cbf3e88c920f8fc74e10883de1c81c7a", "type": "github" }, "original": { @@ -816,11 +814,11 @@ }, "nixpkgs-lib_5": { "locked": { - "lastModified": 1754184128, - "narHash": "sha256-AjhoyBL4eSyXf01Bmc6DiuaMrJRNdWopmdnMY0Pa/M0=", + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "02e72200e6d56494f4a7c0da8118760736e41b60", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "type": "github" }, "original": { @@ -831,11 +829,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1754292888, - "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "lastModified": 1755274400, + "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", "type": "github" }, "original": { @@ -847,11 +845,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1754292888, - "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "lastModified": 1755471983, + "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "48f4c982de68d966421d2b6f1ddbeb6227cc5ceb", "type": "github" }, "original": { @@ -868,11 +866,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1754459064, - "narHash": "sha256-0edf+wA3aFEMD3Xn0FhveBcE1UsAlNsIvWZvIAoknKk=", + "lastModified": 1755570090, + "narHash": "sha256-0DQL2ISJG9ECvp6HlNwk+UH3mwMT9Fk4mLlmszXU3gE=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "886afff215c4504c46ec840e283cedb7c79870bb", + "rev": "d69aad7a124b1ef7b70a4f0130755c0a1c2cc8f4", "type": "github" }, "original": { @@ -883,11 +881,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "lastModified": 1754340878, + "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "rev": "cab778239e705082fe97bb4990e0d24c50924c04", "type": "github" }, "original": { @@ -944,11 +942,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -975,11 +973,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1754454387, - "narHash": "sha256-ViCy7RR3EhFC8Fj6CPrwiuM/M/jdqTsUVxX3XyKlo5w=", + "lastModified": 1755578972, + "narHash": "sha256-3VxpGUb5akZOiCSK/uuIRLuELma0a75Xqlf444c1eoA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bca8a5647e6aad5902777da1122855474a89b0d", + "rev": "9512947ff97e22508c33fbf002a5141e1ee8a15d", "type": "github" }, "original": { @@ -991,11 +989,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -1007,11 +1005,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -1051,11 +1049,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1754474936, - "narHash": "sha256-5isFM/P8BUOJvHnloh3WNg9HEJKUdNVyIjmCAzaanQY=", + "lastModified": 1755612177, + "narHash": "sha256-uKlrQ9nPuzxjBxIlwpnVuc/JZtw47QHaIYw9b5TENYo=", "owner": "nix-community", "repo": "NUR", - "rev": "5f01257d6fa49cde9d57e7992b9872136a283c5c", + "rev": "78a3c5354ece1099e134f33c495032a93693f160", "type": "github" }, "original": { @@ -1099,11 +1097,11 @@ ] }, "locked": { - "lastModified": 1754301638, - "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", + "lastModified": 1753771532, + "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", "owner": "NuschtOS", "repo": "search", - "rev": "a60091045273484c040a91f5c229ba298f8ecc27", + "rev": "2a65adaf2c0c428efb0f4a2bc406aab466e96a06", "type": "github" }, "original": { @@ -1122,7 +1120,6 @@ "nh": "nh", "nil": "nil", "niri": "niri", - "niri-unstable": "niri-unstable", "nix-matlab": "nix-matlab", "nixGL": "nixGL", "nixd": "nixd", @@ -1177,11 +1174,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754438321, - "narHash": "sha256-sRRV9FAZyCbq91IXc6gokBGNe0mF3DPbX/ceY8vUvw0=", + "lastModified": 1755546184, + "narHash": "sha256-KxRj/8SydDk3gzamS0VEewo5pu8JAYhSZ5GPcImPGNQ=", "owner": "nix-community", "repo": "stylix", - "rev": "8410296a30e62e06305020cb74d3247cfa45d9cc", + "rev": "9810b32b9b7520e3b37358ff8e793fb5034c3299", "type": "github" }, "original": { @@ -1402,11 +1399,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1754061284, - "narHash": "sha256-ONcNxdSiPyJ9qavMPJYAXDNBzYobHRxw0WbT38lKbwU=", + "lastModified": 1754847726, + "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "58bd4da459f0a39e506847109a2a5cfceb837796", + "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", "type": "github" }, "original": { @@ -1435,11 +1432,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1754367142, - "narHash": "sha256-U0gbn4Qe2NfdaQHvSerzjn3iLhrH+Ah0DMBJfRh1OT8=", + "lastModified": 1755219541, + "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ecbe57e7be12452d6fe477f2154a6d93f60c41e0", + "rev": "5a184d435927c3423f0ad189ea2b490578450fb7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cf9deb9..4a78290 100644 --- a/flake.nix +++ b/flake.nix @@ -53,14 +53,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; flake-parts.url = "github:hercules-ci/flake-parts"; - niri-unstable = { - url = "github:YalTeR/niri"; - # url = "github:visualglitch91/niri/feat/blur-lite"; - flake = false; - }; + # niri-unstable = { + # url = "github:YalTeR/niri"; + # # url = "github:visualglitch91/niri/feat/blur-lite"; + # flake = false; + # }; niri = { url = "github:sodiboo/niri-flake"; - inputs.niri-unstable.follows = "niri-unstable"; + # inputs.niri-unstable.follows = "niri-unstable"; }; nur.url = "github:nix-community/NUR"; stylix = { diff --git a/home/programs/utils/ai.nix b/home/programs/utils/ai.nix new file mode 100644 index 0000000..11ed2ee --- /dev/null +++ b/home/programs/utils/ai.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + programs.gemini-cli = { + enable = true; + settings = { + theme = "ANSI"; + vimMode = true; + preferredEditor = "nvim"; + autoAccept = false; + }; + }; + home.packages = with pkgs; [ qwen-code ]; +} diff --git a/home/programs/utils/claude-code.nix b/home/programs/utils/claude-code.nix deleted file mode 100644 index 2f8a21d..0000000 --- a/home/programs/utils/claude-code.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, config, ... }: -{ - home = { - packages = with pkgs; [ claude-code ]; - sessionVariables = { - ANTHROPIC_BASE_URL = "https://anyrouter.top"; - ANTHROPIC_AUTH_TOKEN = "$(cat ${config.age.secrets.anyrouter_token.path})"; - }; - }; -} diff --git a/home/programs/utils/default.nix b/home/programs/utils/default.nix index a53fb9c..d5efb5c 100644 --- a/home/programs/utils/default.nix +++ b/home/programs/utils/default.nix @@ -50,7 +50,7 @@ ./eye-candy.nix ./obs.nix ./music.nix - ./claude-code.nix + ./ai.nix ]; programs.pay-respects.enable = true; } diff --git a/home/tweaks/colorscheme.nix b/home/tweaks/colorscheme.nix index acaa0b8..2d59598 100644 --- a/home/tweaks/colorscheme.nix +++ b/home/tweaks/colorscheme.nix @@ -5,6 +5,6 @@ isDefault = true; } "everforest" - "catppuccin-frappe" + "nord" ]; } diff --git a/pkgs/default.nix b/pkgs/default.nix index d79e908..64ac5db 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,5 +8,4 @@ custom-colorschemes = pkgs.callPackage ./customColorSchemes { }; wallpapers = pkgs.callPackage ./wallpapers.nix { }; maple-mono-variable = pkgs.callPackage ./maple-mono-variable.nix { }; - qwen-code = pkgs.callPackage ./qwen-code.nix { }; } diff --git a/pkgs/qwen-code.nix b/pkgs/qwen-code.nix deleted file mode 100644 index 8f7f318..0000000 --- a/pkgs/qwen-code.nix +++ /dev/null @@ -1,56 +0,0 @@ -# copied from https://github.com/NixOS/nixpkgs/issues/427851#issuecomment-3115131890 -{ - lib, - buildNpmPackage, - fetchFromGitHub, - fetchNpmDeps, - nix-update-script, -}: - -buildNpmPackage (finalAttrs: { - pname = "qwen-code"; - version = "unstable-2025-07-24"; - - src = fetchFromGitHub { - owner = "sid115"; - repo = "qwen-code"; - rev = "e082e301bf2e779435237aab56927b204ead5d2e"; - hash = "sha256-qX2ssemIt3Ijl9GxCgurcXg5B5ZC2D6cRjGqD9G8Ksg="; - }; - - npmDeps = fetchNpmDeps { - inherit (finalAttrs) src; - hash = "sha256-zzF/9V+g3uxZxCGmIIHplDX8IRd2txbLj9lco+pkkWg="; - }; - - buildPhase = '' - runHook preBuild - - npm run generate - npm run bundle - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -r bundle/* $out/ - substituteInPlace $out/gemini.js --replace '/usr/bin/env node' "$(type -p node)" - ln -s $out/gemini.js $out/bin/qwen-code - - runHook postInstall - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Qwen-code is a coding agent that lives in digital world"; - homepage = "https://github.com/QwenLM/qwen-code"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ]; - mainProgram = "qwen-code"; - platforms = lib.platforms.all; - }; -})