From 621b9c2cb46a4b8eec8cf7221a27b6d9ba8e585e Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Fri, 7 Nov 2025 22:46:27 +0800 Subject: [PATCH] update flakes --- flake.lock | 349 +++++++++++++++------------- flake.nix | 9 +- home/default.nix | 2 +- home/programs/desktop/default.nix | 1 + home/programs/desktop/dms.nix | 2 + home/programs/desktop/noctalia.nix | 1 + home/programs/documents/default.nix | 2 +- home/programs/utils/default.nix | 2 +- home/tweaks/default.nix | 2 +- hosts/default.nix | 2 +- os/programs/misc.nix | 1 - os/system/fonts.nix | 1 - 12 files changed, 197 insertions(+), 177 deletions(-) diff --git a/flake.lock b/flake.lock index 67f3e64..f0771ad 100644 --- a/flake.lock +++ b/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": { @@ -95,11 +95,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1760926060, - "narHash": "sha256-pEkdpaEPWkyhWFweRfxkTtofL6QTzKBK4zSn+AZ6dnI=", + "lastModified": 1762307984, + "narHash": "sha256-IQe2ysGBZhg6TtBliazFGZo9xYJMNTVCDGdiY2BDTjk=", "owner": "caelestia-dots", "repo": "cli", - "rev": "d0f8a06e5959326f04ccf535b1b5c8bd15f6aa89", + "rev": "c05f6ef57a4cc7943e38256ce50a63d75927dc1c", "type": "github" }, "original": { @@ -111,19 +111,19 @@ "caelestia-cli_2": { "inputs": { "caelestia-shell": [ - "niri-caelestia-shell" + "caelestia-shell" ], "nixpkgs": [ - "niri-caelestia-shell", + "caelestia-shell", "nixpkgs" ] }, "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": { @@ -144,11 +144,33 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1760837100, - "narHash": "sha256-B4iL67pRKARIPnZGnlV19axKjjW+UfNP1wnlPbxUM6M=", + "lastModified": 1762259112, + "narHash": "sha256-Z4Go+PLBy/fViiO0vEpnpA27lCHpldJbFY6LW9XNqkQ=", "owner": "caelestia-dots", "repo": "shell", - "rev": "84343dde62f99590cd9e21694065cf70d96d9869", + "rev": "d81a7929c9d1ac71cb6ab36c3d5ab55c67a1ce99", + "type": "github" + }, + "original": { + "owner": "caelestia-dots", + "repo": "shell", + "type": "github" + } + }, + "caelestia-shell_2": { + "inputs": { + "caelestia-cli": "caelestia-cli_2", + "nixpkgs": "nixpkgs_3", + "quickshell": [ + "quickshell" + ] + }, + "locked": { + "lastModified": 1762259112, + "narHash": "sha256-Z4Go+PLBy/fViiO0vEpnpA27lCHpldJbFY6LW9XNqkQ=", + "owner": "caelestia-dots", + "repo": "shell", + "rev": "d81a7929c9d1ac71cb6ab36c3d5ab55c67a1ce99", "type": "github" }, "original": { @@ -161,14 +183,14 @@ "inputs": { "dgop": "dgop", "dms-cli": "dms-cli", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1761960705, - "narHash": "sha256-iiql8FapRgBuVevkbpT8zCmfui+qH8Q5ZqTbiGlpUuM=", + "lastModified": 1762320578, + "narHash": "sha256-i23ck6SDu3ghECGunrABzZ9cWe9NLaOaYAppoTeIS/8=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "60ce662d49de667d550e7ec362b47604e1b62d17", + "rev": "f5462fa1bf12bc38ff978c61aa00017e8d1fd0ab", "type": "github" }, "original": { @@ -292,11 +314,11 @@ }, "flake-compat_3": { "locked": { - "lastModified": 1746162366, - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", + "lastModified": 1761640442, + "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=", "owner": "nix-community", "repo": "flake-compat", - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", + "rev": "4a56054d8ffc173222d09dad23adf4ba946c8884", "type": "github" }, "original": { @@ -310,11 +332,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1762040540, + "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "0010412d62a25d959151790968765a70c436598b", "type": "github" }, "original": { @@ -367,11 +389,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -547,16 +569,16 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1761017224, - "narHash": "sha256-ETFcYfgn8TgRG/Z/y/tX8C2Ef1q0GoQuwt5cYiwPpyw=", + "lastModified": 1762197029, + "narHash": "sha256-/whJjw9rRS9qcfz+LMDPqKs1i53jqbNTMkKLgBxk1KM=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "3548acfac63e7674b5e25896f6b393474fe8ea65", + "rev": "bbaee5e0a087e52d7c99e0d8be607670f889b177", "type": "github" }, "original": { @@ -608,14 +630,14 @@ }, "hexecute": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1760925323, - "narHash": "sha256-6Fd7foKFaKxwy6ADHRmZbYaGZZ4E7RvfJyEsmWtYQxY=", + "lastModified": 1761947942, + "narHash": "sha256-t93tj2yXv6oqahuB7b7occZPek6yI5gfasYMgljjYaY=", "owner": "ThatOtherAndrew", "repo": "Hexecute", - "rev": "42e595602584bb056d0c717eb1c218278c07ce02", + "rev": "e0f6ada7c5c1e9e65b482ed42e3798b36640be74", "type": "github" }, "original": { @@ -652,11 +674,11 @@ ] }, "locked": { - "lastModified": 1761005073, - "narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=", + "lastModified": 1762296971, + "narHash": "sha256-Jyv3L5rrUYpecON+9zyFz2VqgTSTsIG35fXuCyuCQv0=", "owner": "nix-community", "repo": "home-manager", - "rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f", + "rev": "34fe48801d2a5301b814eaa1efb496499d06cebc", "type": "github" }, "original": { @@ -716,15 +738,15 @@ "mangowc": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "scenefx": "scenefx" }, "locked": { - "lastModified": 1761011644, - "narHash": "sha256-20pwQgXNrBUw08F9KFJGqAjzGrisVB9BaoJ7G9qICqc=", + "lastModified": 1762316593, + "narHash": "sha256-6dATLh18+Y4+QU7AdoJLyI/odF/s4Y6wAhIClMneGpU=", "owner": "DreamMaoMao", "repo": "mangowc", - "rev": "e0353979bbaabaead67a2a6c6dd56b65cee09fd7", + "rev": "cca92ec50d41eeeb71d82be4dbdf821646163c9f", "type": "github" }, "original": { @@ -735,14 +757,14 @@ }, "nh": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1760961269, - "narHash": "sha256-Udg6DnM6scJj+imbttJR7GQpG2WWeDZ1JOtySTY99M0=", + "lastModified": 1762071046, + "narHash": "sha256-K1GZCf1eRopDtx6PIYV6xiYAfkEQtDT8jviYcVPJdGw=", "owner": "nix-community", "repo": "nh", - "rev": "e27508e06f74c7f03616150c1ac1431eaef7f443", + "rev": "bc6b44046df7f7e06fe00a7fce77f1c9fbfb35ea", "type": "github" }, "original": { @@ -775,17 +797,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760950171, - "narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=", + "lastModified": 1762307471, + "narHash": "sha256-tfT7MtW77rOtu3nfClgJm8FO1E/esoGY7xy+QZ3ob9c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f851a923137c0a54719412146fd63d24b3214e60", + "rev": "0abb5bca37e977cd4d04f95a35b7091adfeea1c3", "type": "github" }, "original": { @@ -794,28 +816,6 @@ "type": "github" } }, - "niri-caelestia-shell": { - "inputs": { - "caelestia-cli": "caelestia-cli_2", - "nixpkgs": "nixpkgs_10", - "quickshell": [ - "quickshell" - ] - }, - "locked": { - "lastModified": 1760838378, - "narHash": "sha256-YQyB1jiy+aC2T58fI/T6BAl/S/7T7YdySa+GgzFws1s=", - "owner": "jutraim", - "repo": "niri-caelestia-shell", - "rev": "7c2b2e7d44d986952e8df46f2be2123f464017c8", - "type": "github" - }, - "original": { - "owner": "jutraim", - "repo": "niri-caelestia-shell", - "type": "github" - } - }, "niri-stable": { "flake": false, "locked": { @@ -836,11 +836,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1760940149, - "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=", + "lastModified": 1762146685, + "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=", "owner": "YaLTeR", "repo": "niri", - "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5", + "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943", "type": "github" }, "original": { @@ -849,6 +849,26 @@ "type": "github" } }, + "nirinit": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1759527445, + "narHash": "sha256-eBFGtv6uuHJpGBa3WB3UAij967PgP7AT5qiwkpvb6Rc=", + "owner": "amaanq", + "repo": "nirinit", + "rev": "32193bbc08a2c92165c695f1af8c467fcdc80f7e", + "type": "github" + }, + "original": { + "owner": "amaanq", + "repo": "nirinit", + "type": "github" + } + }, "nix-matlab": { "inputs": { "flake-compat": "flake-compat_2", @@ -876,11 +896,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1752054764, - "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "lastModified": 1762090880, + "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=", "owner": "nix-community", "repo": "nixGL", - "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5", "type": "github" }, "original": { @@ -899,11 +919,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1759830669, - "narHash": "sha256-MvFhaBavW6beDnhDBiEBfWFDE1pat5kOgGeOPYE9zyk=", + "lastModified": 1761572354, + "narHash": "sha256-3aXsnYf/wXad8DRLTSTOlulS+65qp93eMo5R7pmaHi4=", "owner": "nix-community", "repo": "nixd", - "rev": "62c94242843cbed00ee4c5b2cd6e781b4a9b7854", + "rev": "b9229d79b1cd722257c16027ea79d8f033c3aa4e", "type": "github" }, "original": { @@ -930,11 +950,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -987,11 +1007,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1760862643, - "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "type": "github" }, "original": { @@ -1003,11 +1023,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1760862643, - "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "type": "github" }, "original": { @@ -1024,11 +1044,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1761013067, - "narHash": "sha256-Ml7RxI2FNl6uk/ePkv1sAfgQ45cu9pwRDLyECPGIWBc=", + "lastModified": 1762309314, + "narHash": "sha256-y3BuuZi7Ij+HNrEzgCYgXaMmuGem7L6LCxbBbC41+zA=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "cc7637689618520c5f5e10503eaa1044412bac57", + "rev": "4dc8c8e5edd8f76121186236cf461b03c306493a", "type": "github" }, "original": { @@ -1039,15 +1059,15 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", - "owner": "nixos", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1070,11 +1090,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1761007988, - "narHash": "sha256-rjG2ObQpU/162J+JNVfXNlaZkCI/jfdYvuzNRtjOUcU=", + "lastModified": 1762254973, + "narHash": "sha256-0td4fZg9NGBOStEqhHmB4Rle/ySBs/z9zBN6zofkx28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "459986346a7cdb9e914c7efd8ccbdeaae2bb1465", + "rev": "f646317c4052d86e5e5ffb00c88202ebd00d9920", "type": "github" }, "original": { @@ -1086,11 +1106,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -1102,11 +1122,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1759632233, - "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", + "lastModified": 1761656231, + "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", + "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45", "type": "github" }, "original": { @@ -1134,11 +1154,11 @@ }, "nixpkgs_16": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -1150,11 +1170,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1760596604, - "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", + "lastModified": 1761236834, + "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", + "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", "type": "github" }, "original": { @@ -1166,11 +1186,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -1181,6 +1201,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1760878510, "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", @@ -1196,7 +1232,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 315532800, "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", @@ -1209,7 +1245,7 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1758360447, "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", @@ -1222,7 +1258,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1759831965, "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", @@ -1238,7 +1274,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1750386251, "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=", @@ -1254,7 +1290,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1759580034, "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", @@ -1270,22 +1306,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts_4", @@ -1294,11 +1314,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1760960598, - "narHash": "sha256-UP1v+sEkHuvD2+qyhxbkQpBR+dl9U0ljml3/dMI2jeU=", + "lastModified": 1762293638, + "narHash": "sha256-svsYLbxNq8EZoVtNF97wCAElZ2py5Q1p7viG6lTUixA=", "owner": "nix-community", "repo": "nixvim", - "rev": "e3b77e803b2350b72f4d72c8f175ab0fbfe5a642", + "rev": "aa3a1dfb028cd09b8061862f9dd8d859467fc7ed", "type": "github" }, "original": { @@ -1316,11 +1336,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1761965864, - "narHash": "sha256-3p14v+HlP6VWbTCicInLbsvU6zFO9gOnWu06Qxj4E/M=", + "lastModified": 1762311813, + "narHash": "sha256-wiBOzvHWxKKovbfBpzWfjhXGpO4n/2owlsEHBlL/1k0=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "42c51cb8a445e2e9538242c69389db1e331a0912", + "rev": "c78e3b5653295fae5a7e9c795eaefbdf5efcd6c6", "type": "github" }, "original": { @@ -1335,11 +1355,11 @@ "nixpkgs": "nixpkgs_16" }, "locked": { - "lastModified": 1761019869, - "narHash": "sha256-ieaO94BvvJR54LYFyCJB1LB4nBt9ls4TtgXBdXENHCE=", + "lastModified": 1762318117, + "narHash": "sha256-tFeL1rc29qIyWomXXR0B3ztzHfIB1L9YohshT7O1UVY=", "owner": "nix-community", "repo": "NUR", - "rev": "62c5aee56c07b4536f87d2a1dc1a9439ed577dc1", + "rev": "daf8ebae7cabef93af0c1ffc3256d3b02a90a713", "type": "github" }, "original": { @@ -1383,11 +1403,11 @@ ] }, "locked": { - "lastModified": 1758662783, - "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", + "lastModified": 1761730856, + "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", "owner": "NuschtOS", "repo": "search", - "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", + "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", "type": "github" }, "original": { @@ -1405,11 +1425,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" }, @@ -1442,6 +1462,7 @@ "inputs": { "agenix": "agenix", "caelestia-cli": "caelestia-cli", + "caelestia-shell": "caelestia-shell_2", "dankMaterialShell": "dankMaterialShell", "flake-parts": "flake-parts", "ghostty": "ghostty", @@ -1451,7 +1472,7 @@ "nh": "nh", "nil": "nil", "niri": "niri", - "niri-caelestia-shell": "niri-caelestia-shell", + "nirinit": "nirinit", "nix-matlab": "nix-matlab", "nixGL": "nixGL", "nixd": "nixd", @@ -1508,11 +1529,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760472212, - "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", + "lastModified": 1762264356, + "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", "owner": "nix-community", "repo": "stylix", - "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", + "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", "type": "github" }, "original": { @@ -1763,11 +1784,11 @@ "nixpkgs": "nixpkgs_17" }, "locked": { - "lastModified": 1760945191, - "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=", + "lastModified": 1762305549, + "narHash": "sha256-iHxl8YwQsCX9QyB0ImEvmr+C3FuZP0BR/9vMmjbaITA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2", + "rev": "144d1e80d642c50c71846c0cb674e86c956e9a24", "type": "github" }, "original": { @@ -1796,11 +1817,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1759707084, - "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", + "lastModified": 1762302024, + "narHash": "sha256-F+4W0J5r7fbEl+VmATFqAA5+4dFSNAmLJB7tAtrTIkY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", + "rev": "53b6072bd995b5b4017999cf247f9eb6660c72a2", "type": "github" }, "original": { @@ -1840,7 +1861,7 @@ }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1758405547, diff --git a/flake.nix b/flake.nix index 01ee57b..64e0682 100644 --- a/flake.nix +++ b/flake.nix @@ -91,12 +91,9 @@ url = "git+https://git.outfoxxed.me/quickshell/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; }; - dankMaterialShell = { - url = "github:AvengeMedia/DankMaterialShell"; - inputs.quickshell.follows = "quickshell"; - }; - niri-caelestia-shell = { - url = "github:jutraim/niri-caelestia-shell"; + dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell"; + caelestia-shell = { + url = "github:caelestia-dots/shell"; inputs.quickshell.follows = "quickshell"; }; caelestia-cli.url = "github:caelestia-dots/cli"; diff --git a/home/default.nix b/home/default.nix index ade077d..85f2d6b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -72,7 +72,7 @@ addons = with pkgs; [ fcitx5-gtk libsForQt5.fcitx5-qt - fcitx5-chinese-addons + qt6Packages.fcitx5-chinese-addons fcitx5-rime fcitx5-pinyin-moegirl fcitx5-pinyin-zhwiki diff --git a/home/programs/desktop/default.nix b/home/programs/desktop/default.nix index f54408f..b5776f7 100644 --- a/home/programs/desktop/default.nix +++ b/home/programs/desktop/default.nix @@ -28,4 +28,5 @@ recursive = true; }; home.sessionVariables.QT_QPA_PLATFORMTHEME = "gtk3"; + services.wl-clip-persist.enable = true; } diff --git a/home/programs/desktop/dms.nix b/home/programs/desktop/dms.nix index 41ea8f0..f4ece3c 100644 --- a/home/programs/desktop/dms.nix +++ b/home/programs/desktop/dms.nix @@ -69,6 +69,8 @@ in # }; # in # "${dankMaterialShell}/etc/xdg/quickshell/DankMaterialShell" |> lib.mkForce; + programs.dankMaterialShell.quickshell.package = + inputs.quickshell.packages.${pkgs.system}.quickshell; xdg.configFile."DankMaterialShell/stylix-colors.json".text = builtins.toJSON colorTheme; xdg.configFile."DankMaterialShell/settings.json".text = # json '' diff --git a/home/programs/desktop/noctalia.nix b/home/programs/desktop/noctalia.nix index 219dcdb..9876b1a 100644 --- a/home/programs/desktop/noctalia.nix +++ b/home/programs/desktop/noctalia.nix @@ -31,6 +31,7 @@ density = "comfortable"; floating = true; showCapsule = true; + outerCorners = false; widgets = { center = [ { diff --git a/home/programs/documents/default.nix b/home/programs/documents/default.nix index 7f04dff..87d3a46 100644 --- a/home/programs/documents/default.nix +++ b/home/programs/documents/default.nix @@ -4,7 +4,7 @@ ./zathura.nix ]; home.packages = with pkgs; [ - libreoffice + inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.libreoffice inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.onlyoffice-desktopeditors ]; } diff --git a/home/programs/utils/default.nix b/home/programs/utils/default.nix index 8fcbadb..be56bda 100644 --- a/home/programs/utils/default.nix +++ b/home/programs/utils/default.nix @@ -14,7 +14,7 @@ socat pandoc # typst - du-dust + dust killall htop gparted diff --git a/home/tweaks/default.nix b/home/tweaks/default.nix index 1afb122..363df64 100644 --- a/home/tweaks/default.nix +++ b/home/tweaks/default.nix @@ -7,5 +7,5 @@ ./wallpaper.nix ./colorscheme.nix ]; - desktopShell = "noctalia-shell"; + desktopShell = "caelestia"; } diff --git a/hosts/default.nix b/hosts/default.nix index 7ebf70d..3b58ad0 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -23,7 +23,7 @@ let ../secrets/age.nix # inputs.mangowc.hmModules.mango inputs.dankMaterialShell.homeModules.dankMaterialShell.default - inputs.niri-caelestia-shell.homeManagerModules.default + inputs.caelestia-shell.homeManagerModules.default inputs.noctalia-shell.homeModules.default ] ++ (builtins.attrValues self.homeManagerModules); diff --git a/os/programs/misc.nix b/os/programs/misc.nix index 80cdebf..c3d824e 100644 --- a/os/programs/misc.nix +++ b/os/programs/misc.nix @@ -1,4 +1,3 @@ { services.todesk.enable = true; - programs.zoom-us.enable = true; } diff --git a/os/system/fonts.nix b/os/system/fonts.nix index f468f65..f70a4f7 100644 --- a/os/system/fonts.nix +++ b/os/system/fonts.nix @@ -5,7 +5,6 @@ noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-color-emoji - noto-fonts-emoji nerd-fonts.symbols-only nerd-fonts.hurmit nerd-fonts.monofur