From 93a6613abc9286e0f59ca41e2cf3593f9a4a88f5 Mon Sep 17 00:00:00 2001 From: js0ny Date: Mon, 3 Nov 2025 08:59:31 +0000 Subject: [PATCH] nix: update flake --- nixcfgs/flake.lock | 105 +++++++-------------- nixcfgs/flake.nix | 3 - nixcfgs/hosts/zephyrus/default.nix | 3 +- nixcfgs/modules/nixos/desktop/fonts.nix | 2 +- nixcfgs/modules/nixos/programs/winboat.nix | 5 - nixcfgs/users/js0ny/packages/cli.nix | 1 + nixcfgs/users/js0ny/programs/rime.nix | 2 +- 7 files changed, 39 insertions(+), 82 deletions(-) delete mode 100644 nixcfgs/modules/nixos/programs/winboat.nix diff --git a/nixcfgs/flake.lock b/nixcfgs/flake.lock index 2a65f24..4e79acb 100644 --- a/nixcfgs/flake.lock +++ b/nixcfgs/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1760836749, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1760637553, - "narHash": "sha256-I3fN6TsYfOtKFc1iVy/vXYR7Ck3JRTPncnQaZC6eLJ8=", + "lastModified": 1761962468, + "narHash": "sha256-M+RNHviu4H7/iVzubX5NvBGP7mKIbvzQTaKIfv+10QM=", "owner": "caelestia-dots", "repo": "cli", - "rev": "4593b823d730f46168d2eccd061467adb1754a57", + "rev": "1cea6fb42a533d29d42c2219e405e0b058b5bedc", "type": "github" }, "original": { @@ -54,11 +54,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1761208545, - "narHash": "sha256-rlhP4YHqbqSULj/Q3PkaN5mla8btYBBvs/qCiLCGLVM=", + "lastModified": 1762046656, + "narHash": "sha256-BxVttDz6M8ZukWWjvHuyyIUSKAeiWzhds/xKyfIoMHs=", "owner": "caelestia-dots", "repo": "shell", - "rev": "223207235e41e3476aefae4e9f4a8724dcd02e8b", + "rev": "9bc3f378d01497adcaa60afff22c0537f939d556", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1761266473, - "narHash": "sha256-QxCyKWBmuzI+eMhYV1JmbZsiUnBNATRP1EW34OBt5Vg=", + "lastModified": 1762146130, + "narHash": "sha256-/XOEA0a61fZ45i/BpaSsyLNNbw/yKwjMbkB/IWSGLzU=", "owner": "nix-community", "repo": "home-manager", - "rev": "5c71d4a730bd3c972befff343bb074421e345937", + "rev": "b5ed4afc2277339bdf0e9edf59befff7350cf075", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1760721282, - "narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=", + "lastModified": 1762039661, + "narHash": "sha256-oM5BwAGE78IBLZn+AqxwH/saqwq3e926rNq5HmOulkc=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "c3211fcd0c56c11ff110d346d4487b18f7365168", + "rev": "c3c8c9f2a5ed43175ac4dc030308756620e6e4e4", "type": "github" }, "original": { @@ -223,11 +223,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "owner": "nixOS", "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "type": "github" }, "original": { @@ -239,11 +239,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761236834, - "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", + "lastModified": 1761880412, + "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", + "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -269,33 +269,17 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1761301315, - "narHash": "sha256-B7PylIEgB1iCDq9UyGI1K44BMBRvvxDt0W2+LS3ub9o=", + "lastModified": 1762155241, + "narHash": "sha256-MqlSUPlmzoy9JNo4Dq8u+4XacmmptnEkLgFQfVWJ59k=", "owner": "nix-community", "repo": "NUR", - "rev": "e5a797ab3fa9189ee7f4c95d8c6edae19e1f18ff", + "rev": "78b46cade89187b2bcd137a90533c0af36840468", "type": "github" }, "original": { @@ -314,11 +298,11 @@ ] }, "locked": { - "lastModified": 1761078382, - "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", + "lastModified": 1762115864, + "narHash": "sha256-KREKZiBAkAnqJC+jvY+vSbLlrg8j6DFEU7Lv+tgOlHI=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", + "rev": "8e9e76efa3cc811c230512b40d8cfde06e40da5b", "type": "github" }, "original": { @@ -335,11 +319,11 @@ ] }, "locked": { - "lastModified": 1760822546, - "narHash": "sha256-cy3wJQQzQbZ/EYUfTDuMiP/haPOjkqGgWOPPl7K9oiM=", + "lastModified": 1761897390, + "narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=", "ref": "refs/heads/master", - "rev": "3e2ce40b18af943f9ba370ed73565e9f487663ef", - "revCount": 697, + "rev": "fc704e6b5d445899a1565955268c91942a4f263f", + "revCount": 700, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -359,8 +343,7 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", - "plasma-manager": "plasma-manager", - "winboat": "winboat" + "plasma-manager": "plasma-manager" } }, "systems": { @@ -392,24 +375,6 @@ "repo": "default", "type": "github" } - }, - "winboat": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1761236108, - "narHash": "sha256-HmdYCnoKNzdMqlG9bUKOf0mm3dRS6OL0989o4axcY/0=", - "owner": "TibixDev", - "repo": "winboat", - "rev": "cbb277eecf37cea7ca219ee61401f26811af76ed", - "type": "github" - }, - "original": { - "owner": "TibixDev", - "repo": "winboat", - "type": "github" - } } }, "root": "root", diff --git a/nixcfgs/flake.nix b/nixcfgs/flake.nix index 5d02121..da55ea6 100644 --- a/nixcfgs/flake.nix +++ b/nixcfgs/flake.nix @@ -21,7 +21,6 @@ inputs.home-manager.follows = "home-manager"; }; nur.url = "github:nix-community/NUR"; - winboat.url = "github:TibixDev/winboat"; caelestia-shell = { url = "github:caelestia-dots/shell"; inputs.nixpkgs.follows = "nixpkgs"; @@ -38,7 +37,6 @@ home-manager, plasma-manager, nur, - winboat, caelestia-shell, agenix, ... @@ -46,7 +44,6 @@ overlays = [ nur.overlays.default (final: prev: { - winboat = winboat.packages.x86_64-linux.winboat; caelestia-shell = caelestia-shell.packages.x86_64-linux.caelestia-shell; }) ]; diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index e0f6bbe..f7f7114 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -22,7 +22,7 @@ # desktop environment and display manager ../../modules/nixos/desktop/dm/sddm.nix ../../modules/nixos/desktop/de/kde.nix - ../../modules/nixos/desktop/de/niri.nix + ../../modules/nixos/desktop/de/sway.nix # desktop programs ../../modules/nixos/programs/zsh.nix @@ -34,7 +34,6 @@ ../../modules/nixos/programs/steam.nix ../../modules/nixos/programs/thunderbird.nix ../../modules/nixos/programs/waydroid.nix - ../../modules/nixos/programs/winboat.nix ../../modules/nixos/programs/wine.nix # services diff --git a/nixcfgs/modules/nixos/desktop/fonts.nix b/nixcfgs/modules/nixos/desktop/fonts.nix index 053886d..8f9b452 100644 --- a/nixcfgs/modules/nixos/desktop/fonts.nix +++ b/nixcfgs/modules/nixos/desktop/fonts.nix @@ -5,7 +5,7 @@ pkgs.lxgw-neoxihei pkgs.noto-fonts-cjk-sans pkgs.noto-fonts - pkgs.noto-fonts-emoji + pkgs.noto-fonts-color-emoji pkgs.nerd-fonts.jetbrains-mono pkgs.nur.repos.definfo.sarasa-term-sc-nerd pkgs.vollkorn diff --git a/nixcfgs/modules/nixos/programs/winboat.nix b/nixcfgs/modules/nixos/programs/winboat.nix deleted file mode 100644 index d82779f..0000000 --- a/nixcfgs/modules/nixos/programs/winboat.nix +++ /dev/null @@ -1,5 +0,0 @@ -{inputs, ...}: { - environment.systemPackages = [ - inputs.winboat - ]; -} diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index 2e02b1c..8b0bacc 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -51,5 +51,6 @@ powershell-editor-services package-version-server gemini-cli + codex ]; } diff --git a/nixcfgs/users/js0ny/programs/rime.nix b/nixcfgs/users/js0ny/programs/rime.nix index 5ab77b2..63c4835 100644 --- a/nixcfgs/users/js0ny/programs/rime.nix +++ b/nixcfgs/users/js0ny/programs/rime.nix @@ -20,7 +20,7 @@ in { kdePackages.fcitx5-configtool kdePackages.fcitx5-qt fcitx5-gtk - fcitx5-chinese-addons + qt6Packages.fcitx5-chinese-addons ]; }; };