From 653956657686df8220097ee454f2fea818b27032 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 4 Oct 2025 11:28:55 +0800 Subject: [PATCH 1/7] fix: Reformat README.org --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index c8888b3..a498e3f 100644 --- a/README.org +++ b/README.org @@ -32,7 +32,7 @@ Hey, you. This is my nixos configurations. ** FlakE OutputS and StructurE -| =outputs= field | description | source | +| =outputs= field | description | source | |-------------------------------------------+-----------------------------------------------------------------------------+------------------------------------------| | =packages= | packages imported or wrapped from elsewhere | ./pkgs | | =lib= | patched nixpkgs.lib to include self-defined helper function | ./lib | From 498ce94456de64994d74ef45aa40660fce3189fd Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 4 Oct 2025 11:28:55 +0800 Subject: [PATCH 2/7] Update flake inputs, and add osu!-lazer game --- flake.lock | 332 ++++++++++++++++----------- flake.nix | 6 + overlays/additions/default.nix | 2 +- overlays/additions/osu-lazer-bin.nix | 9 + 4 files changed, 217 insertions(+), 132 deletions(-) create mode 100644 overlays/additions/osu-lazer-bin.nix diff --git a/flake.lock b/flake.lock index 3f1a318..8f696c9 100644 --- a/flake.lock +++ b/flake.lock @@ -21,16 +21,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -77,11 +78,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1759138459, - "narHash": "sha256-ZcN/CxIEkZK/6rCM61kUk+zXy/2a2jih7chE79wzb5U=", + "lastModified": 1760316624, + "narHash": "sha256-Dcu83UalaiHxevevfqWAnmTcLA4LQwpQyH4FjGuiIO4=", "owner": "HeitorAugustoLN", "repo": "betterfox-nix", - "rev": "2d50864d5a7dbf3f16fbae433f81abadf5d58119", + "rev": "15d8c5b5fdec16d7ea55fbf5e06cff684db594cb", "type": "github" }, "original": { @@ -99,11 +100,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1759348172, - "narHash": "sha256-ZPUJX2ZA0ndcHndIA/S/nRESIJV0rifPr91SUpzJtEM=", + "lastModified": 1760399206, + "narHash": "sha256-pGLAy+AzovuPodYGIluw7xAVxPbCsvQpGhAoJAowP/Y=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "dd1af56ad79c965ee20c236ba6adbb2135ac02af", + "rev": "89d8d9c63ac57d349c4a62bfcbaeed4a732c7735", "type": "github" }, "original": { @@ -197,11 +198,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1759180402, - "narHash": "sha256-Y67ooUjDMWjPk+/IjMRnhe+OPn19Q0wF73prtExwyiI=", + "lastModified": 1759749205, + "narHash": "sha256-kBtdRCrVGXR7ikW+n5vWauNDaguJIqMbi/5KZNayjuI=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "5e7e93beb9f2b5a81768aaf4950203ceea21c4f6", + "rev": "ef9e8d892556595fcdfd723d145c29593a67c50d", "type": "github" }, "original": { @@ -216,11 +217,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1759456943, - "narHash": "sha256-WjK2qcb1+jYYtIBEROW8/IE+q781r6hEP+97Kf2ITvE=", + "lastModified": 1760408563, + "narHash": "sha256-EuPr1tn/XWP6Ncfx/SklqIpxD9Wyq7DvC4K+bjqzLNY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "68529e783b91782936f01883d7fbf071c3e58da4", + "rev": "30e279ec3c96040116852e8cbcfb8ffdc7ad0223", "type": "github" }, "original": { @@ -239,11 +240,11 @@ ] }, "locked": { - "lastModified": 1759370635, - "narHash": "sha256-qX5Ot+d1Hh7wvpDnt41dwJC3VqzpG+Yue4d3fM/Xlmk=", + "lastModified": 1760343951, + "narHash": "sha256-BnohURUMSBD+OFXnB1/gAruIvdWU6qzEEztPR50g/Ug=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e8a15f25bcbd4e29cd7a36e1fbc3df525cca9acb", + "rev": "d10de31165c8af2175965e58b7316ed685a7d992", "type": "github" }, "original": { @@ -340,11 +341,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -414,6 +415,24 @@ } }, "flake-parts_5": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -434,7 +453,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "nur", @@ -546,11 +565,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1760392170, + "narHash": "sha256-WftxJgr2MeDDFK47fQKywzC72L2jRc/PWcyGdjaDzkw=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "46d55f0aeb1d567a78223e69729734f3dca25a85", "type": "github" }, "original": { @@ -628,11 +647,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1759201995, - "narHash": "sha256-3STv6fITv8Ar/kl0H7vIA7VV0d2gyLh8UL0BOiVacXg=", + "lastModified": 1760362368, + "narHash": "sha256-xjcfVPlTeHjE/H9244CmpEibGLfu7leHnQbfFZ/ctBg=", "owner": "helix-editor", "repo": "helix", - "rev": "bfcbef10c513108c7b43317569416c2eefc4ed44", + "rev": "50e4385aefdd1cea80a3a50af62d5eefcb42b4e8", "type": "github" }, "original": { @@ -675,11 +694,11 @@ ] }, "locked": { - "lastModified": 1759261733, - "narHash": "sha256-G104PUPKBgJmcu4NWs0LUaPpSOTD4jiq4mamLWu3Oc0=", + "lastModified": 1760312644, + "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "5a21f4819ee1be645f46d6b255d49f4271ef6723", + "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "type": "github" }, "original": { @@ -695,11 +714,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1760312644, + "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "type": "github" }, "original": { @@ -760,11 +779,11 @@ ] }, "locked": { - "lastModified": 1759217228, - "narHash": "sha256-P13ExJlhMVkrc5LxZLNkIJZhjNYo3LLXnxDsUNrdnMQ=", + "lastModified": 1760266702, + "narHash": "sha256-TP19RpzIyo1JeYAhKii13seYwmhkv7IOD+dCnQOrcgQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e52c15ab25f7dc68dde527c8df5bfa9d80d8e64f", + "rev": "3d7e970d4cac5d3ee3fe7cafa17cc9868fa21fed", "type": "github" }, "original": { @@ -823,11 +842,11 @@ ] }, "locked": { - "lastModified": 1756511062, - "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", + "lastModified": 1759851320, + "narHash": "sha256-n5dRAIC3/78drQtFxmQRrBLd6TKfotUnX7GWu0mAcSg=", "ref": "refs/heads/main", - "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", - "revCount": 162, + "rev": "7c31a18259b8358ac196cf803a26967c0fa1d3e4", + "revCount": 163, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -847,11 +866,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1759449996, - "narHash": "sha256-uVU5w4rjS7OLvfYyQO2z6Ek3VjRQcwEnMM9PMNsPupI=", + "lastModified": 1760400370, + "narHash": "sha256-ghN+xxNfS9xz9VT2f49KjhVAWYBMfo2Z1r8YttPqZvc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7412bed2f1eb9770c6d4a23953bfbc0df8fcf258", + "rev": "921a313d1522414e15f0843bae028f5327b0e2e6", "type": "github" }, "original": { @@ -863,11 +882,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1759446555, - "narHash": "sha256-f2tc3fri2itU727dGn11HmE72WeZGTeR7+zJI/7SB3o=", + "lastModified": 1760398177, + "narHash": "sha256-E9Qv7RWRU3qxHtidPyjOMCiow9pRUI5yiNldYaWIeV8=", "owner": "neovim", "repo": "neovim", - "rev": "2abea5dc37734aeb349b52b29eadccc9209fa3bf", + "rev": "0ed5e00077dcc8ab1a99dd76a85628b11504ffa4", "type": "github" }, "original": { @@ -888,11 +907,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759451820, - "narHash": "sha256-3wpxw9FLg1Cv1p8B/aJnQBHvm1NROLI1TCUovHoXB34=", + "lastModified": 1760376620, + "narHash": "sha256-wx2gkuQcEm4VAVn4YHLMHinyzbSKj669zk60gEuIEHc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "773aa140dd70ae4eaafc2bcb7f4384ab32115404", + "rev": "d704fb90b155dcd19311fc42e21b9d1739b17a09", "type": "github" }, "original": { @@ -944,11 +963,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1759405741, - "narHash": "sha256-aNjjON77C1rV5UDFGXraj8zuI6XITjWHsC3gYXd9X+U=", + "lastModified": 1760353665, + "narHash": "sha256-29ij92nS9Q1xEsw3USGFB4zlvyIAhjPXIl3pDy3mM6k=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "dbc282ec717fbb421aceb033f0e9b2f34265381b", + "rev": "3802aa38862b816e33b0dc22646b065c6d29c132", "type": "github" }, "original": { @@ -957,6 +976,25 @@ "type": "github" } }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1760406533, + "narHash": "sha256-ViYpiGv0w+TXpBCFXPXWlEP3dVNHeGgvpsKDbQMY6UE=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "f8f51dd445f7b0dbb3429a3e31994bb0f2908010", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -982,11 +1020,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759261527, - "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -998,11 +1036,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759147044, - "narHash": "sha256-3ZPFytJOcLjTChljeaGgoaNj+tOqzgEpqZAvRe3bU90=", - "owner": "PedroHLC", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "18e83bbe13aa50992777832b52bd0e0d8585fb3b", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -1027,13 +1065,28 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "github" }, "original": { @@ -1061,11 +1114,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "github" }, "original": { @@ -1077,11 +1130,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -1109,11 +1162,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759417375, - "narHash": "sha256-O7eHcgkQXJNygY6AypkF9tFhsoDQjpNEojw3eFs73Ow=", + "lastModified": 1760349414, + "narHash": "sha256-W4Ri1ZwYuNcBzqQQa7NnWfrv0wHMo7rduTWjIeU9dZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c", + "rev": "c12c63cd6c5eb34c7b4c3076c6a99e00fcab86ec", "type": "github" }, "original": { @@ -1125,27 +1178,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760103332, + "narHash": "sha256-BMsGVfKl4Q80Pr9T1AkCRljO1bpwCmY8rTBVj8XGuhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1759386674, - "narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "625ad6366178f03acd79f9e3822606dd7985b657", + "rev": "870493f9a8cb0b074ae5b411b2f232015db19a65", "type": "github" }, "original": { @@ -1155,13 +1192,45 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_7": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1759632233, + "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -1171,7 +1240,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1754340878, "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", @@ -1189,17 +1258,17 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_6", + "flake-parts": "flake-parts_6", + "nixpkgs": "nixpkgs_7", "nuschtosSearch": "nuschtosSearch", "systems": "systems_5" }, "locked": { - "lastModified": 1759445396, - "narHash": "sha256-ofMqAEC6NcFSDGC6qMMG+XFtmlnOghuxh89SzN40+sc=", + "lastModified": 1760353389, + "narHash": "sha256-/NLkyQww0DEkGqC6drAUK5MEFhhygibv8tyNGpWzR3E=", "owner": "nix-community", "repo": "nixvim", - "rev": "eb54f65d9b24310a55de000e62ff6053aa8874ed", + "rev": "69d72bb82d7ba1904df47cf092ce1d4c88448001", "type": "github" }, "original": { @@ -1210,15 +1279,15 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_7" + "flake-parts": "flake-parts_7", + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1759475326, - "narHash": "sha256-bXXGDZQm05KmaSf/TDqAOkPK4i6Ba5y12aL6/hcJiro=", + "lastModified": 1760430709, + "narHash": "sha256-quDW3v8FyqKtv+4o9iS88riWS8mbBuaX9JLEtVVSlYg=", "owner": "nix-community", "repo": "NUR", - "rev": "1d38cb6e7f916b7a31f4d8ef1995ba9fbaf93380", + "rev": "3d6e829da38e34aa643e5e5a23f967ff2c0a2909", "type": "github" }, "original": { @@ -1319,8 +1388,9 @@ "neovim-nightly": "neovim-nightly", "niri-flake": "niri-flake", "nix-doom": "nix-doom", + "nix-gaming": "nix-gaming", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", "nur": "nur", "sops-nix": "sops-nix", @@ -1337,11 +1407,11 @@ ] }, "locked": { - "lastModified": 1759286284, - "narHash": "sha256-JLdGGc4XDutzSD1L65Ni6Ye+oTm8kWfm0KTPMcyl7Y4=", + "lastModified": 1760236527, + "narHash": "sha256-h9+WEQtUIZaZMvA1pnbZbMM+5X39OFnW92Q8hNoToD0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f6f2da475176bb7cff51faae8b3fe879cd393545", + "rev": "a38dd7f462825c75ce8567816ae38c2e7d826bfa", "type": "github" }, "original": { @@ -1358,11 +1428,11 @@ ] }, "locked": { - "lastModified": 1740623427, - "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=", + "lastModified": 1759631821, + "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab", + "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", "type": "github" }, "original": { @@ -1399,11 +1469,11 @@ ] }, "locked": { - "lastModified": 1759188042, - "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", + "lastModified": 1760393368, + "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", + "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", "type": "github" }, "original": { @@ -1415,11 +1485,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1759268257, - "narHash": "sha256-AobwqrSSzIKQdKlbyWXLS3TRW0nF2pIVQBBD7++l/mA=", + "lastModified": 1759872672, + "narHash": "sha256-ewQbmr1nA6YmOxjpcJKI5iQUmpgfgnAByIkY7uRK9WE=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "899032e4f5b3b90fa160c9f0bf8ed179161f696e", + "rev": "6c6cbe9b79609b912ab590ed9432b0de0bc6e076", "type": "github" }, "original": { @@ -1451,11 +1521,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759404594, - "narHash": "sha256-k9hd15rLqG7x3OCUPrcQtpleDlOyQjy16ZEseruypNQ=", + "lastModified": 1760350849, + "narHash": "sha256-JqcM5Pkm5q1c9D5zpINJsN1yCB4Vq1cL12ZuFyo32T4=", "owner": "nix-community", "repo": "stylix", - "rev": "3f70c5855572004f9c630ed4a92aa186755361be", + "rev": "7b4957d716f4fb615bf0e37d3b23c112579b1408", "type": "github" }, "original": { @@ -1643,11 +1713,11 @@ ] }, "locked": { - "lastModified": 1758728421, - "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", + "lastModified": 1760120816, + "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", + "rev": "761ae7aff00907b607125b2f57338b74177697ed", "type": "github" }, "original": { @@ -1658,14 +1728,14 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1758728421, - "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", + "lastModified": 1760120816, + "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", + "rev": "761ae7aff00907b607125b2f57338b74177697ed", "type": "github" }, "original": { @@ -1694,11 +1764,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1759449168, - "narHash": "sha256-Ka18wfIaNvTN9sr+PBie6P83959Om4j5P62M4RwNeoY=", + "lastModified": 1759707084, + "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "da6693c88ab5edac2ec3c81730f112be67abe278", + "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 886c14e..e451eec 100644 --- a/flake.nix +++ b/flake.nix @@ -219,5 +219,11 @@ owner = "nix-community"; repo = "emacs-overlay"; }; + + nix-gaming = { + type = "github"; + owner = "fufexan"; + repo = "nix-gaming"; + }; }; } diff --git a/overlays/additions/default.nix b/overlays/additions/default.nix index 291aace..1ea4ffc 100644 --- a/overlays/additions/default.nix +++ b/overlays/additions/default.nix @@ -7,11 +7,11 @@ in ./TrackersListCollection.nix ./OuterWildsTextAdventure.nix ./editor-runtime.nix - ./radicle-ci-broker.nix ./wallpapers.nix ./rime-yuhaostar.nix ./nixvim.nix ./doom-emacs.nix + ./osu-lazer-bin.nix # typochecker: disable-line ./pkgsNoCuda.nix ] diff --git a/overlays/additions/osu-lazer-bin.nix b/overlays/additions/osu-lazer-bin.nix new file mode 100644 index 0000000..aed88e4 --- /dev/null +++ b/overlays/additions/osu-lazer-bin.nix @@ -0,0 +1,9 @@ +{ inputs, ... }: +_final: prev: +let + inherit (inputs) nix-gaming; + inherit (prev.stdenv.hostPlatform) system; +in +{ + inherit (nix-gaming.packages.${system}) osu-lazer-bin; # typochecker: disable-line +} From da29bcfc4c5e28eeae5ebdc1f462501816bfb004 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 4 Oct 2025 11:28:55 +0800 Subject: [PATCH 3/7] Remove radicle-ci-broker from pkgs --- _sources/generated.json | 50 +++++++----------------- _sources/generated.nix | 44 +++++++-------------- nvfetcher.toml | 4 -- overlays/additions/radicle-ci-broker.nix | 8 ---- pkgs/radicle-ci-broker.nix | 21 ---------- 5 files changed, 30 insertions(+), 97 deletions(-) delete mode 100644 overlays/additions/radicle-ci-broker.nix delete mode 100644 pkgs/radicle-ci-broker.nix diff --git a/_sources/generated.json b/_sources/generated.json index c225c4b..50561f3 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "TrackersListCollection": { "cargoLocks": null, - "date": "2025-10-03", + "date": "2025-10-14", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,18 +34,18 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "8830319bf7b42f4b69e26f6f50189b025064e4c1", - "sha256": "sha256-2HHxgnPIdbrMl3NhfZRsDl6KYgldHp4K7Wm5qIYEgQk=", + "rev": "673a78b2f5032eed48e03317ab58dfab4f76880c", + "sha256": "sha256-+MvC3IZj8Bi1qvvljNQa9saJFYz5U/s1V8lLAKNARLQ=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "8830319bf7b42f4b69e26f6f50189b025064e4c1" + "version": "673a78b2f5032eed48e03317ab58dfab4f76880c" }, "cliphist": { "cargoLocks": null, - "date": "2025-09-11", + "date": "2025-10-11", "extract": null, "name": "cliphist", "passthru": null, @@ -57,12 +57,12 @@ "name": null, "owner": "sentriz", "repo": "cliphist", - "rev": "6eda526d02119ebc09ec0f64b0a96ed4540f5a83", - "sha256": "sha256-G5Gnr6YkJf+wINifN5xBOA69gWwqXW3XLedw/zfhc9U=", + "rev": "efb61cb5b5a28d896c05a24ac83b9c39c96575f2", + "sha256": "sha256-y4FSl/Bj80XqCR0ZwjGEkqYUIF6zJHrYyy01XPFlzjU=", "sparseCheckout": [], "type": "github" }, - "version": "6eda526d02119ebc09ec0f64b0a96ed4540f5a83" + "version": "efb61cb5b5a28d896c05a24ac83b9c39c96575f2" }, "juicity": { "cargoLocks": null, @@ -151,26 +151,6 @@ }, "version": "b6f0d93f6b8cf6eee0b4c94450198ba2d6a05ff6" }, - "radicle-ci-broker": { - "cargoLocks": null, - "date": "2025-09-26", - "extract": null, - "name": "radicle-ci-broker", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "rev": "6aced1f715304ea91d583266288983133ab8bb45", - "sha256": "sha256-4Wo/UOOKMSzQIddEnwsiPWFS1+s2k+rf1nsZ4raz7y0=", - "sparseCheckout": [], - "type": "git", - "url": "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" - }, - "version": "6aced1f715304ea91d583266288983133ab8bb45" - }, "rime-yuhaostar": { "cargoLocks": null, "date": null, @@ -208,7 +188,7 @@ }, "spotx": { "cargoLocks": null, - "date": "2025-09-23", + "date": "2025-10-08", "extract": null, "name": "spotx", "passthru": null, @@ -220,12 +200,12 @@ "name": null, "owner": "SpotX-Official", "repo": "SpotX-Bash", - "rev": "08b00cf6892ed76d9b4ee3c0cdd401362ad7d99b", - "sha256": "sha256-2IDaci4IO+KNe1ApXas0B8hEeY+mXdyz50wuXVHtw7g=", + "rev": "12cfe5dcec1d82cb613d8aa8dd60f4cd181dfb06", + "sha256": "sha256-GPy9/fJhcx1XPS6WRt4yVQQrEt/YQCh2cDzQxb1nvfg=", "sparseCheckout": [], "type": "github" }, - "version": "08b00cf6892ed76d9b4ee3c0cdd401362ad7d99b" + "version": "12cfe5dcec1d82cb613d8aa8dd60f4cd181dfb06" }, "tree-sitter-idris": { "cargoLocks": null, @@ -262,7 +242,7 @@ "type": "url", "url": "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4" }, - "version": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + "version": "346942a88f763c59cc17f7b2a02756cc9d2a0c891585f916e3a4a9c15fe26ac9" }, "wallpaper_hollow-knight-quest.3840x2160.mp4": { "cargoLocks": null, @@ -277,7 +257,7 @@ "type": "url", "url": "http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4" }, - "version": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + "version": "ecbb31075e7e387cb03a9035298a2b0fbce529d2f4dc91b7bddaa08af570a41b" }, "wallpaper_outer-wilds.3840x2160.mp4": { "cargoLocks": null, @@ -292,7 +272,7 @@ "type": "url", "url": "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4" }, - "version": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + "version": "19e0ccb48483f55f3413201718e8b2ba4a6acd112e1a3e7bb5ad913b87c5f210" }, "wshowkeys-mao": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 41c5191..5dedd85 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,30 +15,30 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "8830319bf7b42f4b69e26f6f50189b025064e4c1"; + version = "673a78b2f5032eed48e03317ab58dfab4f76880c"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "8830319bf7b42f4b69e26f6f50189b025064e4c1"; + rev = "673a78b2f5032eed48e03317ab58dfab4f76880c"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-2HHxgnPIdbrMl3NhfZRsDl6KYgldHp4K7Wm5qIYEgQk="; + sha256 = "sha256-+MvC3IZj8Bi1qvvljNQa9saJFYz5U/s1V8lLAKNARLQ="; }; - date = "2025-10-03"; + date = "2025-10-14"; }; cliphist = { pname = "cliphist"; - version = "6eda526d02119ebc09ec0f64b0a96ed4540f5a83"; + version = "efb61cb5b5a28d896c05a24ac83b9c39c96575f2"; src = fetchFromGitHub { owner = "sentriz"; repo = "cliphist"; - rev = "6eda526d02119ebc09ec0f64b0a96ed4540f5a83"; + rev = "efb61cb5b5a28d896c05a24ac83b9c39c96575f2"; fetchSubmodules = false; - sha256 = "sha256-G5Gnr6YkJf+wINifN5xBOA69gWwqXW3XLedw/zfhc9U="; + sha256 = "sha256-y4FSl/Bj80XqCR0ZwjGEkqYUIF6zJHrYyy01XPFlzjU="; }; - date = "2025-09-11"; + date = "2025-10-11"; }; juicity = { pname = "juicity"; @@ -94,20 +94,6 @@ }; date = "2025-02-17"; }; - radicle-ci-broker = { - pname = "radicle-ci-broker"; - version = "6aced1f715304ea91d583266288983133ab8bb45"; - src = fetchgit { - url = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git"; - rev = "6aced1f715304ea91d583266288983133ab8bb45"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ ]; - sha256 = "sha256-4Wo/UOOKMSzQIddEnwsiPWFS1+s2k+rf1nsZ4raz7y0="; - }; - date = "2025-09-26"; - }; rime-yuhaostar = { pname = "rime-yuhaostar"; version = "v3.10.0"; @@ -133,15 +119,15 @@ }; spotx = { pname = "spotx"; - version = "08b00cf6892ed76d9b4ee3c0cdd401362ad7d99b"; + version = "12cfe5dcec1d82cb613d8aa8dd60f4cd181dfb06"; src = fetchFromGitHub { owner = "SpotX-Official"; repo = "SpotX-Bash"; - rev = "08b00cf6892ed76d9b4ee3c0cdd401362ad7d99b"; + rev = "12cfe5dcec1d82cb613d8aa8dd60f4cd181dfb06"; fetchSubmodules = false; - sha256 = "sha256-2IDaci4IO+KNe1ApXas0B8hEeY+mXdyz50wuXVHtw7g="; + sha256 = "sha256-GPy9/fJhcx1XPS6WRt4yVQQrEt/YQCh2cDzQxb1nvfg="; }; - date = "2025-09-23"; + date = "2025-10-08"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; @@ -160,7 +146,7 @@ }; "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4" = { pname = "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4"; - version = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; + version = "346942a88f763c59cc17f7b2a02756cc9d2a0c891585f916e3a4a9c15fe26ac9"; src = fetchurl { url = "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4"; sha256 = "sha256-NGlCqI92PFnMF/eyoCdWzJ0qDIkVhfkW46SpwV/iask="; @@ -168,7 +154,7 @@ }; "wallpaper_hollow-knight-quest.3840x2160.mp4" = { pname = "wallpaper_hollow-knight-quest.3840x2160.mp4"; - version = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; + version = "ecbb31075e7e387cb03a9035298a2b0fbce529d2f4dc91b7bddaa08af570a41b"; src = fetchurl { url = "http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4"; sha256 = "sha256-7LsxB15+OHywOpA1KYorD7zlKdL03JG3vdqgivVwpBs="; @@ -176,7 +162,7 @@ }; "wallpaper_outer-wilds.3840x2160.mp4" = { pname = "wallpaper_outer-wilds.3840x2160.mp4"; - version = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; + version = "19e0ccb48483f55f3413201718e8b2ba4a6acd112e1a3e7bb5ad913b87c5f210"; src = fetchurl { url = "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4"; sha256 = "sha256-GeDMtISD9V80EyAXGOiyukpqzREuGj57ta2RO4fF8hA="; diff --git a/nvfetcher.toml b/nvfetcher.toml index 1c1149f..26b9e4f 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -38,10 +38,6 @@ src.git = "https://github.com/top-mind/OuterWildsTextAdventureWeb.git" fetch.github = "sentriz/cliphist" src.git = "https://github.com/sentriz/cliphist.git" -[radicle-ci-broker] -fetch.git = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" -src.git = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" - ["wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4"] fetch.url = "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4" src.cmd = "curl -sL http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4 | sha256sum | cut -d ' ' -f 1" diff --git a/overlays/additions/radicle-ci-broker.nix b/overlays/additions/radicle-ci-broker.nix deleted file mode 100644 index fd08864..0000000 --- a/overlays/additions/radicle-ci-broker.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ outputs, ... }: -_final: prev: -let - inherit (prev.stdenv.hostPlatform) system; -in -{ - inherit (outputs.packages.${system}) radicle-ci-broker; -} diff --git a/pkgs/radicle-ci-broker.nix b/pkgs/radicle-ci-broker.nix deleted file mode 100644 index 8a919a2..0000000 --- a/pkgs/radicle-ci-broker.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - rustPlatform, - srcs, - git, -}: -let - inherit (srcs) radicle-ci-broker; -in -rustPlatform.buildRustPackage (finalAttrs: { - pname = "radicle-ci-broker"; - version = "0-unstable-${radicle-ci-broker.date}-git${radicle-ci-broker.version}"; - inherit (radicle-ci-broker) src; - nativeBuildInputs = [ git ]; - - cargoLock = { - lockFile = "${finalAttrs.src}/Cargo.lock"; - allowBuiltinFetchGit = true; - }; - - doCheck = false; -}) From f1bdf3030d301e232865dde321dc82290c7ff777 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 4 Oct 2025 11:28:55 +0800 Subject: [PATCH 4/7] Add just related extension for zed --- home/david/modules/programs/zed.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/david/modules/programs/zed.nix b/home/david/modules/programs/zed.nix index 88405f4..f3cd7d5 100644 --- a/home/david/modules/programs/zed.nix +++ b/home/david/modules/programs/zed.nix @@ -50,6 +50,8 @@ in "typos" "ty" "ruff" + "just" + "just-ls" ]; extraPackages = with pkgs; [ editor-runtime From 921ef3a748e463eb39a9569e27f0590bbf1d3946 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 4 Oct 2025 11:28:55 +0800 Subject: [PATCH 5/7] Add osu!-lazer on Tytonidae --- nixos/configurations/Tytonidae/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index e92d2f8..f91368a 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -94,6 +94,7 @@ nixvim doom-emacs neovide + osu-lazer-bin # typochecker: disable-line sbctl ]; From 72b67ac3c27c4641da0d005e6e64ed8fe05fbc38 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 4 Oct 2025 11:28:55 +0800 Subject: [PATCH 6/7] fix: Fix typo --- pkgs/doom-emacs/config/config.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/doom-emacs/config/config.el b/pkgs/doom-emacs/config/config.el index bf5a38c..138770a 100644 --- a/pkgs/doom-emacs/config/config.el +++ b/pkgs/doom-emacs/config/config.el @@ -13,7 +13,7 @@ :family "Maple Mono NF CN" :size 20)) (setq doom-theme 'doom-gruvbox) -;;; Fix failure to loacate 'Symbols Nerd Font Mono' font +;;; Fix failure to locate 'Symbols Nerd Font Mono' font (setq nerd-icons-font-family "Maple Mono NF CN") (setq telega-emoji-use-images From 54bc3214f2eb3640952494aedd59e96b40992a4f Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 4 Oct 2025 11:28:55 +0800 Subject: [PATCH 7/7] Add org-modern support for doom --- pkgs/doom-emacs/config/config.el | 8 ++++++++ pkgs/doom-emacs/package.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/doom-emacs/config/config.el b/pkgs/doom-emacs/config/config.el index 138770a..2c85921 100644 --- a/pkgs/doom-emacs/config/config.el +++ b/pkgs/doom-emacs/config/config.el @@ -111,3 +111,11 @@ NOTE: wayland only." (global-set-key (kbd "") (scroll-on-jump-interactive 'diff-hl-next-hunk)) (global-set-key (kbd "") (scroll-on-jump-interactive 'diff-hl-previous-hunk)) + +(use-package org-modern-mode + :hook + (org-mode . org-modern-mode) + (org-agenda-finalize . org-modern-agenda) + :config + (setq org-modern-hide-stars nil + org-modern-table nil)) diff --git a/pkgs/doom-emacs/package.nix b/pkgs/doom-emacs/package.nix index 9ef661d..788533b 100644 --- a/pkgs/doom-emacs/package.nix +++ b/pkgs/doom-emacs/package.nix @@ -24,6 +24,7 @@ let melpaPackages.telega melpaPackages.nixos-options melpaPackages.scroll-on-jump + melpaPackages.org-modern ]; extraBinPackages = (with pkgs; [