diff --git a/flake.lock b/flake.lock index a44d384..c720231 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1717970544, - "narHash": "sha256-YX43aaegfqjXaZ3S+z0JI7SKOEE1Afqm/I9FBIezJ7A=", + "lastModified": 1718735045, + "narHash": "sha256-5PaPrMjQu0ojps12ecRO6qFntCU+pkUCrJIjDUFJknE=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "85c380e4e80fbc21d25165626ad2897cbb11af4d", + "rev": "2d4d6c0f286bd6901c8eab5e2d08593ca3394d6c", "type": "github" }, "original": { @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1718252558, - "narHash": "sha256-Yph5ocpdI3a1Ib+V9BQ4/0YyO4UVn8J0WeAvOLYGaGk=", + "lastModified": 1718403459, + "narHash": "sha256-6d+nrN/L8DUCCEioQkdXy71+lYs09sP4nExSMjEkw30=", "owner": "berberman", "repo": "flakes", - "rev": "73949fb5964f243ff9c28887bfc99c2fe12407c3", + "rev": "de292d23437ff2a6c41b32f3449fae83deb88cfb", "type": "github" }, "original": { @@ -53,11 +53,11 @@ ] }, "locked": { - "lastModified": 1718078026, - "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", + "lastModified": 1718730147, + "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", "owner": "ipetkov", "repo": "crane", - "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", + "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", "type": "github" }, "original": { @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1718242063, - "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", + "lastModified": 1718846788, + "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", "owner": "nix-community", "repo": "disko", - "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", + "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718788307, + "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "type": "github" }, "original": { @@ -221,11 +221,11 @@ ] }, "locked": { - "lastModified": 1718218065, - "narHash": "sha256-fKC7Ryg3AYykDrS2ilS1VqA8/9B2m3yFZcshK+7tIEc=", + "lastModified": 1718782018, + "narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "7cb05fab896bd542c0ca4260d74d9d664cd7b56e", + "rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1712745718, - "narHash": "sha256-pAPGjjPEC5Y3DeuqSlDgFRPAZStA1doWowOvmPY7jvk=", + "lastModified": 1718491861, + "narHash": "sha256-nnKZRkwXoCtGN8Rgv6FcHttX1JOPWQt2y7yY4Bz/hWk=", "owner": "Guanran928", "repo": "nvim", - "rev": "3fbc02368d9d554ac2918e48112fbc25957fb03a", + "rev": "49f55400d06fa113e4b4ae5a6fa97a6d83c59983", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1718345812, - "narHash": "sha256-FJhA+YFsOFrAYe6EaiTEfomNf7jeURaPiG5/+a3DRSc=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "ff988d78f2f55641efacdf9a585d2937f7e32a9b", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1718401149, - "narHash": "sha256-THXbbmhDZjEnc+372GYl3JpXKkkuo7nhShv66Reklsk=", + "lastModified": 1718833139, + "narHash": "sha256-m+7obxxZ6Fgjz/Cs3mkax8xec+0cDwnxb4Ti6jAP/ik=", "owner": "jacekszymanski", "repo": "nixcasks", - "rev": "d35924a6bd7c8a34f31e885754a5564ea06ab833", + "rev": "592abedb3df4d8d10107065c12632ce08d972d71", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718349360, - "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", + "lastModified": 1718806950, + "narHash": "sha256-E+W/kbedZAiOuPtT+KQRposLaXGDLd7lyK7oL3IH/5U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", + "rev": "acb4f0e9bfa8ca2d6fca5e692307b5c994e7dbda", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718276985, - "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", + "lastModified": 1718710757, + "narHash": "sha256-zzHTI7iQByeuGDto16eRwPflCf3xfVOJJSB0/cnEd2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f84a279f1a6290ce154c5531378acc827836fbb", + "rev": "56fc115880db6498245adecda277ccdb33025bc2", "type": "github" }, "original": { @@ -413,11 +413,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1718229064, - "narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=", + "lastModified": 1718447546, + "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c2ec3a5c2ee9909904f860dadc19bc12cd9cc44", + "rev": "842253bf992c3a7157b67600c2857193f126563a", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nur": { "locked": { - "lastModified": 1718400242, - "narHash": "sha256-gLX2eyWb8lVxwI5Uv0F5WKb+YwvlDYnI+sSQB2xMqhw=", + "lastModified": 1718873190, + "narHash": "sha256-puGZxr3LWT5DuHbpesgb8Hi2w0D07S7iJD92InUPU7c=", "owner": "nix-community", "repo": "NUR", - "rev": "d50ea2706590f0edce9f49d8990dbcf82cdb66ec", + "rev": "57f88b637d41f8f1f7c4a6d827ead6d9c4347e50", "type": "github" }, "original": { @@ -523,11 +523,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718872830, + "narHash": "sha256-1EIYImP6ROTu2IuQtTG1aVcbXli+CgIXP7NpHqt7EXY=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "e4ea49a8c0c35b5bea2d033263c6c6b4b2a19a41", "type": "github" }, "original": { @@ -573,19 +573,16 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1718331519, - "narHash": "sha256-6Ru37wS8uec626nHVIh6hSpCYB7eNc3RPFa2U//bhw4=", + "lastModified": 1718849885, + "narHash": "sha256-Qfc5HKpQvGhWXox0WJVzLqrAcFm3uy6xtWRvVmrkLYc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "419e7fae2731f41dd9b3e34dfe8802be68558b92", + "rev": "bc1a236757cd5f6622f73838e551fb2035afa44a", "type": "github" }, "original": { @@ -620,11 +617,11 @@ ] }, "locked": { - "lastModified": 1718137936, - "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", + "lastModified": 1718506969, + "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", + "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", "type": "github" }, "original": { @@ -640,11 +637,11 @@ ] }, "locked": { - "lastModified": 1718239576, - "narHash": "sha256-Afdz9oCQf8VCGXUhI8KxdJg9gc+fepZK//mYsijfhFw=", + "lastModified": 1718844164, + "narHash": "sha256-QUXWv6llKIQ5To2N24d9dRI78Hqfm9iFyhvmvlOICNo=", "owner": "nix-community", "repo": "srvos", - "rev": "d6280e5c12c4ddb26f0807387777786c66e4c552", + "rev": "557ff94aa1b48a723f8fa16eb9e7a2e6de991682", "type": "github" }, "original": { @@ -675,11 +672,11 @@ ] }, "locked": { - "lastModified": 1718271476, - "narHash": "sha256-35hUMmFesmchb+u7heKHLG5B6c8fBOcSYo0jj0CHLes=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e75ba0a6bb562d2ce275db28f6a36a2e4fd81391", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1d27d5c..67a76d7 100644 --- a/flake.nix +++ b/flake.nix @@ -141,7 +141,6 @@ rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; }; scss-reset = { url = "github:andreymatin/scss-reset"; diff --git a/hosts/aristotle/default.nix b/hosts/aristotle/default.nix index 688c154..8507c1a 100644 --- a/hosts/aristotle/default.nix +++ b/hosts/aristotle/default.nix @@ -54,6 +54,5 @@ programs.adb.enable = true; # fucking hell - # FIXME: IFD programs.anime-game-launcher.enable = true; } diff --git a/hosts/blacksteel/default.nix b/hosts/blacksteel/default.nix index cc8102b..76cecf8 100644 --- a/hosts/blacksteel/default.nix +++ b/hosts/blacksteel/default.nix @@ -2,7 +2,6 @@ pkgs, lib, config, - inputs, ... }: { imports = [ @@ -173,12 +172,7 @@ eula = true; openFirewall = true; - package = pkgs.callPackage "${inputs.nixpkgs}/pkgs/games/minecraft-servers/derivation.nix" { - version = "1.21"; - sha1 = "450698d1863ab5180c25d7c804ef0fe6369dd1ba"; - url = "https://piston-data.mojang.com/v1/objects/450698d1863ab5180c25d7c804ef0fe6369dd1ba/server.jar"; - jre_headless = pkgs.javaPackages.compiler.openjdk21.headless; - }; + package = pkgs.minecraftServers.vanilla-1-21; # Aikar's flag # https://aikar.co/2018/07/02/tuning-the-jvm-g1gc-garbage-collector-flags-for-minecraft/ diff --git a/hosts/lightsail-tokyo/default.nix b/hosts/lightsail-tokyo/default.nix index 13f077d..4ac3a87 100644 --- a/hosts/lightsail-tokyo/default.nix +++ b/hosts/lightsail-tokyo/default.nix @@ -89,12 +89,12 @@ "element" = pkgs.element-web.override { element-web-unwrapped = pkgs.element-web-unwrapped.overrideAttrs (oldAttrs: { - version = "1.11.69-rc.1"; + version = "1.11.69"; src = oldAttrs.src.overrideAttrs { - outputHash = "sha256-vL21wTI9qeIhrFdbI0WsehVy0ZLBj9rayuQnTPC7k8g="; + outputHash = "sha256-oFSaKtig1z3jepLpwJW4i5VskMBhKUIbPsCfLQuCgMY="; }; offlineCache = oldAttrs.offlineCache.overrideAttrs { - outputHash = "sha256-nZWclW2tEq7vPRPG5zzhYfExVnmPxYDm8DxME5w5ORI="; + outputHash = "sha256-ClpD/PIW3P1+d7KqDTl6gWNbqKaUi6JypE/yaVsB+Oc="; }; });