From 7dc922f036f83b1e5d41c42ad17e0eb0fd2e4eb1 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 4 Dec 2024 09:32:21 +0100 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'api-rs': 'github:uku3lig/api-rs/c9cab8a4513ef14a1ea122d58382e7bc91ef7993?narHash=sha256-i2jN9664PirUziJh8lW4CbmYz%2BujdAzkydO00WRasXg%3D' (2024-11-21) → 'github:uku3lig/api-rs/e62f892e625b8a9872d9cd7bc140f7a8962abd81?narHash=sha256-wt0T39BRtLafAy3%2BIlX4ZZ8%2BKiZNykm9CrYO9IwTvEk%3D' (2024-12-03) • Updated input 'camasca': 'git+https://git.uku3lig.net/uku/camasca?ref=refs/heads/main&rev=8d8cf325b3b5cf704b7a3432c128ea019e978b2d' (2024-11-25) → 'git+https://git.uku3lig.net/uku/camasca?ref=refs/heads/main&rev=30b6f8cd1c466bce0bc3c925c880eed108252881' (2024-12-02) • Updated input 'catppuccin': 'github:Stonks3141/ctp-nix/7a6e695bbf6220af2b1a6941613d9df1160a32cd?narHash=sha256-AMVSa4H73IAp12Zwpa%2B2/mE9sFirxxg8gv6gDvADzQI%3D' (2024-11-30) → 'github:Stonks3141/ctp-nix/a817009ebfd2cca7f70a77884e5098d0a8c83f8e?narHash=sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk%3D' (2024-11-30) • Updated input 'crane': 'github:ipetkov/crane/9ed3180f45c2d1499e5af98c4ab7ffee8e886f5f?narHash=sha256-NvYSSiKsC0rqn9yY0a9zglLXrFp92EwKhTFZC38voCQ%3D' (2024-11-29) → 'github:ipetkov/crane/af1556ecda8bcf305820f68ec2f9d77b41d9cc80?narHash=sha256-mlIDSv1/jqWnH8JTiOV7GMUNPCXL25%2B6jmD%2B7hdxx5o%3D' (2024-12-04) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90?narHash=sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS%2Bb4tfNFCwE%3D' (2024-11-01) → 'github:hercules-ci/flake-parts/e37654df08605b510ad84eceaafcc7248495e843?narHash=sha256-kVq/jAKKtbvWwbL9wf0SKDxtxsC5Gb%2BnlIYEFnyXhGA%3D' (2024-12-03) • Updated input 'ghostty': 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=3c637a2777885dab9f8bb9d2b7c36411d62e1e4c' (2024-11-29) → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=50dc4b75d73bab7631e22e19e940331ad7ac8cfd' (2024-12-03) • Updated input 'home-manager': 'github:nix-community/home-manager/819f682269f4e002884702b87e445c82840c68f2?narHash=sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB%2BXG6Q%3D' (2024-11-29) → 'github:nix-community/home-manager/70803283187c8f775ff561be4117e5b1a11b296e?narHash=sha256-TvDEljXVpgJ7mPLyh9KKJLZkOypF%2BLCkcvJq/jBz9MU%3D' (2024-12-04) • Updated input 'mystia': 'github:soopyc/mystia/2f81f0c9834191c81b2533d6340686504a56ee6f?narHash=sha256-T6FXzbHUutnCS3%2BxI0oR62eUc0XQGDmdAiRmKtzB/L0%3D' (2024-11-29) → 'github:soopyc/mystia/3a463894ab50b92b0d60ad0eb0a9eb0d54cff0dd?narHash=sha256-OzXUawyTa/cTbGfDDg5dN0zO%2BD7e5fkgDCfgVOtUIA8%3D' (2024-12-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/fa42b5a5f401aab8a32bd33c9a4de0738180dc59?narHash=sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo%3D' (2024-11-28) → 'github:NixOS/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776?narHash=sha256-M1%2BuCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo%3D' (2024-12-03) • Updated input 'ukubot-rs': 'github:uku3lig/ukubot-rs/a187df13aeeee5d50500dfb0e3f720f180dfd2c7?narHash=sha256-gg4XsT54/JKm3SQ4bzhA8AqzMNF/nXtb6LaFethuuBU%3D' (2024-11-21) → 'github:uku3lig/ukubot-rs/35067c20002e73d766836e6c6fa79b8937c2fe59?narHash=sha256-rPqOllvleOnYJaMU%2Bzv%2BIn7b2pTncRyRnzG7xjTZk8A%3D' (2024-12-02) • Updated input 'vencord': 'github:Vendicated/Vencord/fcece6199511108f7f9eeec65a6d9120f720deb2?narHash=sha256-2UOz8o%2B3jWppk6lWatbG0avcqBFpxHYSMEspCpFWWOk%3D' (2024-11-29) → 'github:Vendicated/Vencord/df454ca95218dc32ef1521e5836f38c76bb24a61?narHash=sha256-M2vFCtoeYhqnSsOiQ0eAwuTo2yhycr582wE7flY%2BLC8%3D' (2024-12-03) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/ad53e4155149d1d69e45bc0ade1d9695d81a05b6?narHash=sha256-W4FRZVN3ExbjEQLoRijmmCu0vWJ5sYMRLzFCCsfDHhU%3D' (2024-11-30) → 'github:nix-community/nix-vscode-extensions/3ea774bace6ac2f8db48a1c1d59271e0209e4b96?narHash=sha256-%2Br1bhEqW0ACV%2BE8TID6FvW0/YJ%2B46SQ9yk6DpyHtRWg%3D' (2024-12-04) --- flake.lock | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 379962d..622d0ca 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1732176241, - "narHash": "sha256-i2jN9664PirUziJh8lW4CbmYz+ujdAzkydO00WRasXg=", + "lastModified": 1733214974, + "narHash": "sha256-wt0T39BRtLafAy3+IlX4ZZ8+KiZNykm9CrYO9IwTvEk=", "owner": "uku3lig", "repo": "api-rs", - "rev": "c9cab8a4513ef14a1ea122d58382e7bc91ef7993", + "rev": "e62f892e625b8a9872d9cd7bc140f7a8962abd81", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1732492913, - "narHash": "sha256-YiBCIgVHdjAYJKUnuzK8KIvlahN12qcIc7s/ab+cgqc=", + "lastModified": 1733151879, + "narHash": "sha256-zjpQCLLTp0I6JCypUCWDPyPdJqycJDkDGLhUvBCHP5I=", "ref": "refs/heads/main", - "rev": "8d8cf325b3b5cf704b7a3432c128ea019e978b2d", - "revCount": 25, + "rev": "30b6f8cd1c466bce0bc3c925c880eed108252881", + "revCount": 28, "type": "git", "url": "https://git.uku3lig.net/uku/camasca" }, @@ -72,11 +72,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1732947104, - "narHash": "sha256-AMVSa4H73IAp12Zwpa+2/mE9sFirxxg8gv6gDvADzQI=", + "lastModified": 1733001911, + "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", "owner": "Stonks3141", "repo": "ctp-nix", - "rev": "7a6e695bbf6220af2b1a6941613d9df1160a32cd", + "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "crane": { "locked": { - "lastModified": 1732906089, - "narHash": "sha256-NvYSSiKsC0rqn9yY0a9zglLXrFp92EwKhTFZC38voCQ=", + "lastModified": 1733286231, + "narHash": "sha256-mlIDSv1/jqWnH8JTiOV7GMUNPCXL25+6jmD+7hdxx5o=", "owner": "ipetkov", "repo": "crane", - "rev": "9ed3180f45c2d1499e5af98c4ab7ffee8e886f5f", + "rev": "af1556ecda8bcf305820f68ec2f9d77b41d9cc80", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733269028, + "narHash": "sha256-kVq/jAKKtbvWwbL9wf0SKDxtxsC5Gb+nlIYEFnyXhGA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "e37654df08605b510ad84eceaafcc7248495e843", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1732920523, - "narHash": "sha256-/Udch6RRLBSjluDXjQHWpiYFFJR15g+qV263ibVBwoc=", + "lastModified": 1733235265, + "narHash": "sha256-BZBmyv2gY4SmanxCM0ZVYhYx7t2/Az/okDOQj+4RIso=", "ref": "refs/heads/main", - "rev": "3c637a2777885dab9f8bb9d2b7c36411d62e1e4c", - "revCount": 8136, + "rev": "50dc4b75d73bab7631e22e19e940331ad7ac8cfd", + "revCount": 8155, "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" }, @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1733299177, + "narHash": "sha256-TvDEljXVpgJ7mPLyh9KKJLZkOypF+LCkcvJq/jBz9MU=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "70803283187c8f775ff561be4117e5b1a11b296e", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1732867327, - "narHash": "sha256-T6FXzbHUutnCS3+xI0oR62eUc0XQGDmdAiRmKtzB/L0=", + "lastModified": 1733299324, + "narHash": "sha256-OzXUawyTa/cTbGfDDg5dN0zO+D7e5fkgDCfgVOtUIA8=", "owner": "soopyc", "repo": "mystia", - "rev": "2f81f0c9834191c81b2533d6340686504a56ee6f", + "rev": "3a463894ab50b92b0d60ad0eb0a9eb0d54cff0dd", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -412,11 +412,11 @@ ] }, "locked": { - "lastModified": 1732176384, - "narHash": "sha256-gg4XsT54/JKm3SQ4bzhA8AqzMNF/nXtb6LaFethuuBU=", + "lastModified": 1733124015, + "narHash": "sha256-rPqOllvleOnYJaMU+zv+In7b2pTncRyRnzG7xjTZk8A=", "owner": "uku3lig", "repo": "ukubot-rs", - "rev": "a187df13aeeee5d50500dfb0e3f720f180dfd2c7", + "rev": "35067c20002e73d766836e6c6fa79b8937c2fe59", "type": "github" }, "original": { @@ -428,11 +428,11 @@ "vencord": { "flake": false, "locked": { - "lastModified": 1732919215, - "narHash": "sha256-2UOz8o+3jWppk6lWatbG0avcqBFpxHYSMEspCpFWWOk=", + "lastModified": 1733193056, + "narHash": "sha256-M2vFCtoeYhqnSsOiQ0eAwuTo2yhycr582wE7flY+LC8=", "owner": "Vendicated", "repo": "Vencord", - "rev": "fcece6199511108f7f9eeec65a6d9120f720deb2", + "rev": "df454ca95218dc32ef1521e5836f38c76bb24a61", "type": "github" }, "original": { @@ -452,11 +452,11 @@ ] }, "locked": { - "lastModified": 1732931481, - "narHash": "sha256-W4FRZVN3ExbjEQLoRijmmCu0vWJ5sYMRLzFCCsfDHhU=", + "lastModified": 1733277416, + "narHash": "sha256-+r1bhEqW0ACV+E8TID6FvW0/YJ+46SQ9yk6DpyHtRWg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ad53e4155149d1d69e45bc0ade1d9695d81a05b6", + "rev": "3ea774bace6ac2f8db48a1c1d59271e0209e4b96", "type": "github" }, "original": { From 8fbb9fc4cae9f79cc32903735753abe2f3c89e70 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 4 Dec 2024 10:54:34 +0100 Subject: [PATCH 2/2] fix(kilimandjaro): remove shitty rider fix --- programs/dotnet.nix | 10 +++++++--- systems/kilimandjaro/default.nix | 6 ------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/programs/dotnet.nix b/programs/dotnet.nix index 7d49d39..ea3c2ac 100644 --- a/programs/dotnet.nix +++ b/programs/dotnet.nix @@ -6,8 +6,12 @@ }: let inherit (config.lib.file) mkOutOfStoreSymlink; in { - home.file = { - ".dotnet/8".source = mkOutOfStoreSymlink "${pkgs.dotnetCorePackages.dotnet_8.sdk.unwrapped}/share/dotnet"; - ".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono; + home = { + packages = [pkgs.jetbrains.rider]; + + file = { + ".dotnet/8".source = mkOutOfStoreSymlink "${pkgs.dotnetCorePackages.dotnet_8.sdk.unwrapped}/share/dotnet"; + ".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono; + }; }; } diff --git a/systems/kilimandjaro/default.nix b/systems/kilimandjaro/default.nix index 1a7a3a5..91a7ae3 100644 --- a/systems/kilimandjaro/default.nix +++ b/systems/kilimandjaro/default.nix @@ -8,12 +8,6 @@ ../../programs/games.nix ]; - environment.systemPackages = [ - (pkgs.jetbrains.rider.overrideAttrs (old: { - postInstall = builtins.replaceStrings ["ln -s ${pkgs.dotnet-sdk_7}"] ["ln -s ${pkgs.dotnet-sdk_8.unwrapped}/share/dotnet"] old.postInstall or ""; - })) - ]; - hm.imports = [../../programs/dotnet.nix]; services.asus-numpad = {