diff --git a/flake.lock b/flake.lock index 3421aa5..127570c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "aagl-gtk": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708104794, + "narHash": "sha256-Eq0MFpezo1lmP7sTVffHAvgOjjRFf4Eybllu1z2XZp0=", + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "rev": "b562d6df3eb34aa2bbb1bd894d26872ef5b7225e", + "type": "github" + }, + "original": { + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "type": "github" + } + }, "blobs": { "flake": false, "locked": { @@ -18,7 +39,7 @@ }, "cargo2nix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" @@ -44,11 +65,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1690083945, - "narHash": "sha256-UUBTcV6trDcvR8o/ocAO/tXcyI9z0wUltWqb2gzD2cE=", + "lastModified": 1708851887, + "narHash": "sha256-gMzpMV8sYuhuPniw/Yef7Sx0MOkP/QGCblm3CRI24EQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f50142b8483dfeb1f3725aae4064ffac20340cdb", + "rev": "42b8b4a59edbd70550ebc96e95c9258dbdefd753", "type": "github" }, "original": { @@ -79,6 +100,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1650374568, @@ -94,7 +131,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1668681692, @@ -110,14 +147,14 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -131,11 +168,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -149,11 +186,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1688254665, - "narHash": "sha256-8FHEgBrr7gYNiS/NzCxIO3m4hvtLRW9YY1nYo1ivm3o=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "267149c58a14d15f7f81b4d737308421de9d7152", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -170,11 +207,11 @@ ] }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -185,14 +222,18 @@ }, "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": [ + "nvim-overlay", + "hercules-ci-effects", + "nixpkgs" + ] }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -200,39 +241,16 @@ "type": "indirect" } }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "nvim-overlay", - "hercules-ci-effects", - "hercules-ci-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -273,14 +291,14 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -291,14 +309,14 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -307,56 +325,20 @@ "type": "github" } }, - "haskell-flake": { - "locked": { - "lastModified": 1684780604, - "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "0.3.0", - "repo": "haskell-flake", - "type": "github" - } - }, - "hercules-ci-agent": { - "inputs": { - "flake-parts": "flake-parts_5", - "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1688568579, - "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=", - "owner": "hercules-ci", - "repo": "hercules-ci-agent", - "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5", - "type": "github" - }, - "original": { - "id": "hercules-ci-agent", - "type": "indirect" - } - }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_4", - "hercules-ci-agent": "hercules-ci-agent", "nixpkgs": [ "nvim-overlay", "nixpkgs" ] }, "locked": { - "lastModified": 1689397210, - "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=", + "lastModified": 1708547820, + "narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce", + "rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a", "type": "github" }, "original": { @@ -372,11 +354,11 @@ ] }, "locked": { - "lastModified": 1690084763, - "narHash": "sha256-Nw680m/pyVoosSgXZW415Z657mfVM2BxaxDPjEk48Z0=", + "lastModified": 1708806879, + "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb03fa5516d4e86059d24ab35a611ffa3a359547", + "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", "type": "github" }, "original": { @@ -388,16 +370,18 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", "nixpkgs": "nixpkgs_5", + "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1690047096, - "narHash": "sha256-VvZqoWLscSlRonCGq+OdIgA9GkZJJ/Z4yyoXn7m8kjY=", + "lastModified": 1708817736, + "narHash": "sha256-GZEoru+4uNIGEZ8j1TPaxZwM+ApIngHU/iX3sIGgUO4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b21644b61143de0835fef9c3fa69fbdd2553cdfa", + "rev": "f534ac3fc462d8af923d2a1ab8ef58f62639a1ea", "type": "github" }, "original": { @@ -411,11 +395,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1690024028, - "narHash": "sha256-kqdROtklYwkN5z8ZQ/Sy7RpEH/wJmUuoT6bfLm8elMc=", + "lastModified": 1706198673, + "narHash": "sha256-bHlxFd+3QHy6eXtTzzhwVNcyxBSOxTvBuJGNUzI4C4M=", "owner": "hyprwm", "repo": "contrib", - "rev": "ff589bdf572b56016812ebea504e7e7bcf3478ef", + "rev": "16884001b26e6955ff4b88b4dfe4c8986e20f153", "type": "github" }, "original": { @@ -429,14 +413,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1684265364, - "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -445,23 +433,48 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1708681732, + "narHash": "sha256-ULZZLZ9C33G13IaXLuAc4oTzHUvnATI8Fj2u6gzMfT0=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f4466367ef0a92a6425d482050dc2b8840c0e644", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils_2" }, "locked": { - "lastModified": 1689610936, - "narHash": "sha256-g/+hhD6Kpz8EQvE93q3tpP58LBxNyR7f1UhREKZJvXM=", + "lastModified": 1706742486, + "narHash": "sha256-sv/MISTeD0rqeVivpZJpynboMWJp6i62OmrZX1rGl38=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "a3b03d1b5af5112bc94b448879a2f401043b42ea", + "rev": "9e36323ae3dde787f761420465c3ae560f3dbf29", "type": "gitlab" }, "original": { @@ -478,11 +491,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1689256076, - "narHash": "sha256-jkiSlo4R/5BahKBIwbQSUeB1IBKi/Ep89MmZYMjM3YI=", + "lastModified": 1708852221, + "narHash": "sha256-peS0e21QloCaVI8cI2njb8wP4cZJ3/O1HWZdltM8xrg=", "owner": "nbfc-linux", "repo": "nbfc-linux", - "rev": "0d109723b8c9c407d80272e22d5b2bb12765550b", + "rev": "4310b4e994f2575a75dfb599305a0e13cd0bf978", "type": "github" }, "original": { @@ -501,11 +514,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1690067801, - "narHash": "sha256-KBt1U+WXRRyL2uSaLxw5frQxhAB9hMTIvNUdQ4hL5nU=", + "lastModified": 1708818534, + "narHash": "sha256-f6kdXBRoQMyW3ffViEK8elYdcciUhNoY9JN9MOJaUBE=", "owner": "neovim", "repo": "neovim", - "rev": "a8cfdf43bc6226e32679ec59769ea3e48ca26193", + "rev": "091e374c7f4886ef875e801ae0473b88f6caefe2", "type": "github" }, "original": { @@ -521,11 +534,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1690100618, - "narHash": "sha256-+PU5Op8h0/m7Ncw8gl+zHEn+eZ/DWiTzHKZUj2mEUow=", + "lastModified": 1708823436, + "narHash": "sha256-c1eR4YGVrN+K/SFflfELzPvo4MW7SvNT1z4yzSVs95I=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "42e53a36cd1ee7a0e0d21687bdd7b13941d37595", + "rev": "8cc3a38288a632c423033a712c91e7acaf3207e4", "type": "github" }, "original": { @@ -536,11 +549,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690031011, - "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", + "lastModified": 1708655239, + "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12303c652b881435065a98729eb7278313041e49", + "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a", "type": "github" }, "original": { @@ -550,28 +563,13 @@ "type": "github" } }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, "nixpkgs-23_05": { "locked": { - "lastModified": 1684782344, - "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -580,14 +578,29 @@ "type": "indirect" } }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { @@ -601,29 +614,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_3": { - "locked": { - "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { @@ -636,32 +631,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1689956312, - "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=", + "lastModified": 1708702655, + "narHash": "sha256-qxT5jSLhelfLhQ07+AUxSTm1VnVH+hQxDkQSZ/m/Smo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967", + "rev": "c5101e457206dd437330d283d6626944e28794b3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_10": { - "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -684,11 +663,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "lastModified": 1667085444, + "narHash": "sha256-1SAlbifAAb+u8n52DUk6mB5oWv95o0qwRMHOMH3bS5g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "rev": "15093c384e8a099930d966232c79359b14adcb5a", "type": "github" }, "original": { @@ -716,11 +695,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1688500189, - "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78419edadf0fabbe5618643bd850b2f2198ed060", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -748,11 +727,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1688221086, - "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", + "lastModified": 1708751719, + "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", + "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", "type": "github" }, "original": { @@ -764,11 +743,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1708751719, + "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", "type": "github" }, "original": { @@ -780,34 +759,34 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1688322751, - "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=", + "lastModified": 1708751719, + "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f", + "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nvim-overlay": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_3", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1690070762, - "narHash": "sha256-Cor1qic27mQkgGHoaJMWTlaueKmUZxXkboBVAi1Ikw8=", + "lastModified": 1708819468, + "narHash": "sha256-TZB6DyO7+9WaLfhcp1/vwqucmkPTp42oJ7ObgUMrX8E=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "33dc18d6278f81ac272b28f5d1277bd9bc6e69b9", + "rev": "392a5933e6322fe8cddea0ecccb36e89283df08e", "type": "github" }, "original": { @@ -818,6 +797,7 @@ }, "root": { "inputs": { + "aagl-gtk": "aagl-gtk", "emacs-overlay": "emacs-overlay", "filehost": "filehost", "flake-parts": "flake-parts", @@ -887,11 +867,11 @@ ] }, "locked": { - "lastModified": 1690079014, - "narHash": "sha256-xLgQEfdb6LAzpwaLqNl1EIk1sl7jC85zVt0aVCVCv+o=", + "lastModified": 1708827164, + "narHash": "sha256-oBNS6pO04Y6gZBLThP3JDDgviex0+WTXz3bVBenyzms=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c707d9606ff9acea7f9508f5ad8218e36a96b126", + "rev": "e0626adabd5ea461f80b1b11390da2a6575adb30", "type": "github" }, "original": { @@ -933,16 +913,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -976,6 +956,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667077288, @@ -1008,7 +1003,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -1028,18 +1023,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1689611045, - "narHash": "sha256-3RTOlQabkNetQ4O4UzSf57JPco9VGVHhSU1ls5uKBeE=", + "lastModified": 1708558866, + "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", "owner": "wlroots", "repo": "wlroots", - "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" } }, @@ -1049,17 +1044,25 @@ "hyprland", "hyprland-protocols" ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1685385764, - "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", + "lastModified": 1708696469, + "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", + "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 71a074e..65a9012 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,10 @@ url = github:hyprwm/contrib; #inputs.nixpkgs.follows = "nixpkgs"; }; + aagl-gtk = { + url = github:ezKEa/aagl-gtk-on-nix; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ self, ... }: @@ -52,22 +56,27 @@ ./lib ]; - perSystem = { pkgs, system, ... }: rec { - legacyPackages = import inputs.nixpkgs { - inherit system; - config = { - allowUnfree = true; - allowBroken = true; - allowInsecure = true; + perSystem = { system, ... }: + let + pkgs = import inputs.nixpkgs { + inherit system; + config = { + allowUnfree = true; + allowBroken = true; + allowInsecure = true; + }; + overlays = [ + inputs.nvim-overlay.overlay + inputs.emacs-overlay.overlay + inputs.rust-overlay.overlays.default + ]; }; - overlays = [ - inputs.nvim-overlay.overlay - inputs.emacs-overlay.overlay - inputs.rust-overlay.overlays.default - ]; - }; + in + { + legacyPackages = pkgs; + _module.args.pkgs = pkgs; - formatter = pkgs.nixpkgs-fmt; - }; + formatter = pkgs.nixpkgs-fmt; + }; }; } diff --git a/hosts/default.nix b/hosts/default.nix index 5a71b9d..767bdfa 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -6,7 +6,11 @@ let ./modules/nvim globalArgs ]; - personalModules = [ ]; + personalModules = [ + ./modules/xorg.nix + ./modules/wayland.nix + ./modules/nix.nix + ]; serverModules = [ ./modules/minimal.nix ]; in { diff --git a/hosts/satori/nix.nix b/hosts/modules/nix.nix similarity index 100% rename from hosts/satori/nix.nix rename to hosts/modules/nix.nix diff --git a/hosts/satori/wayland.nix b/hosts/modules/wayland.nix similarity index 100% rename from hosts/satori/wayland.nix rename to hosts/modules/wayland.nix diff --git a/hosts/satori/xorg.nix b/hosts/modules/xorg.nix similarity index 100% rename from hosts/satori/xorg.nix rename to hosts/modules/xorg.nix diff --git a/hosts/satori/boot.nix b/hosts/satori/boot.nix index cc771a2..b738eaa 100644 --- a/hosts/satori/boot.nix +++ b/hosts/satori/boot.nix @@ -24,25 +24,10 @@ }; grub = { enable = true; - # useOSProber = true; efiSupport = true; device = "nodev"; - theme = pkgs.stdenvNoCC.mkDerivation rec { - version = "1.2.0"; - name = "minegrub-theme"; - src = pkgs.fetchFromGitHub { - owner = "Lxtharia"; - repo = "minegrub-theme"; - rev = "v${version}"; - sha256 = "sha256-n/fJSFrrPPyTBS8/XHaARyCxccRZiqPhhNFq0x8Q2kA="; - }; - installPhase = "cp -r . $out"; - }; - #splashImage = ./cirno.png; splashMode = "stretch"; - configurationName = "nixbruh"; }; }; - binfmt.emulatedSystems = [ "aarch64-linux" ]; }; } diff --git a/hosts/satori/cirno.png b/hosts/satori/cirno.png deleted file mode 100644 index 2cfcadd..0000000 Binary files a/hosts/satori/cirno.png and /dev/null differ diff --git a/hosts/satori/colemak b/hosts/satori/colemak deleted file mode 100644 index 1aeab23..0000000 --- a/hosts/satori/colemak +++ /dev/null @@ -1,19 +0,0 @@ -default partial alphanumeric_keys modifier_keys -xkb_symbols "dhz" { - name[Group1] = "English (Colemak-DHz)"; - include "us(colemak_dh)" - key { [ z, Z, ae, AE ] }; - key { [ x, X, dead_circumflex, asciitilde ] }; - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ d, D, dead_diaeresis, asciitilde ] }; - key { [ v, V, oe, OE ] }; - include "level3(ralt_switch)" -}; - -partial alphanumeric_keys -xkb_symbols "cta-dhz" { - include "colemak(dhz)" - name[Group1] = "English (cta-DHz)"; - key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; - include "level3(ralt_switch)" -}; diff --git a/hosts/satori/default.nix b/hosts/satori/default.nix index ad168a4..9f0d13a 100644 --- a/hosts/satori/default.nix +++ b/hosts/satori/default.nix @@ -9,9 +9,6 @@ ./boot.nix ./services.nix ./graphics.nix - ./xorg.nix - ./wayland.nix - ./nix.nix ]; system.stateVersion = "23.05"; } diff --git a/hosts/satori/hardware.nix b/hosts/satori/hardware.nix index 7f133ec..0660226 100644 --- a/hosts/satori/hardware.nix +++ b/hosts/satori/hardware.nix @@ -19,20 +19,6 @@ fsType = "vfat"; }; - fileSystems."/media/real" = - { - device = "/dev/disk/by-uuid/8086be20-c770-46be-bd8f-5bd2d7735c7d"; - fsType = "btrfs"; - options = [ "rw" ]; - }; - - fileSystems."/media/ntfs" = - { - device = "/dev/disk/by-uuid/A4CC66B6CC668282"; - fsType = "ntfs"; - options = [ "uid=natto" "gid=users" "umask=0022" "rw" ]; - }; - zramSwap = { enable = true; algorithm = "lz4"; diff --git a/hosts/satori/mesa-vulkan-layer-nvidia.patch b/hosts/satori/mesa-vulkan-layer-nvidia.patch deleted file mode 100644 index 143536c..0000000 --- a/hosts/satori/mesa-vulkan-layer-nvidia.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --color -u -r b/src/vulkan/device-select-layer/device_select_layer.c a/src/vulkan/device-select-layer/device_select_layer.c ---- b/src/vulkan/device-select-layer/device_select_layer.c 2022-03-22 11:18:04.309569433 +0530 -+++ a/src/vulkan/device-select-layer/device_select_layer.c 2022-03-22 11:18:17.944644235 +0530 -@@ -454,12 +454,8 @@ - exit(0); - } else { - unsigned selected_index = get_default_device(info, selection, physical_device_count, physical_devices); -- selected_physical_device_count = physical_device_count; -+ selected_physical_device_count = 1; - selected_physical_devices[0] = physical_devices[selected_index]; -- for (unsigned i = 0; i < physical_device_count - 1; ++i) { -- unsigned this_idx = i < selected_index ? i : i + 1; -- selected_physical_devices[i + 1] = physical_devices[this_idx]; -- } - } - - if (selected_physical_device_count == 0) { diff --git a/hosts/satori/networking.nix b/hosts/satori/networking.nix index 3facea8..7d82dd2 100644 --- a/hosts/satori/networking.nix +++ b/hosts/satori/networking.nix @@ -10,7 +10,7 @@ }; firewall = { - allowedTCPPorts = [ 22 18172 6600 8001 7590 25565 ]; + allowedTCPPorts = [ 22 18172 6600 8001 7590 25565 9092 ]; allowedUDPPorts = [ 22 17840 18172 ]; trustedInterfaces = [ "docker0" ]; }; @@ -19,15 +19,13 @@ ips = [ satori ]; listenPort = 17840; privateKeyFile = "/var/secrets/wg.key"; - peers = [ - { - #Oracle VM1 - publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM="; - allowedIPs = [ remilia ]; - endpoint = "${lib'.network.addresses.domain.natto}:17840"; - persistentKeepalive = 25; - } - ]; + peers = [{ + #Oracle VM1 + publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM="; + allowedIPs = [ remilia ]; + endpoint = "${lib'.network.addresses.domain.natto}:17840"; + persistentKeepalive = 25; + }]; }; defaultGateway = "192.168.1.1"; diff --git a/hosts/satori/services.nix b/hosts/satori/services.nix index a245a16..beeb227 100644 --- a/hosts/satori/services.nix +++ b/hosts/satori/services.nix @@ -1,23 +1,4 @@ { lib, config, pkgs, ... }: -let - udev-cypherock = pkgs.stdenvNoCC.mkDerivation { - name = "udev-cypher"; - - dontBuild = true; - dontConfigure = true; - dontUnpack = true; - - installPhase = '' - mkdir -p $out/lib/udev/rules.d - touch $out/lib/udev/rules.d/21-cypherock.rules - cat << 'EOF' >> $out/lib/udev/rules.d/21-cypherock.rules - SUBSYSTEM=="input", GROUP="input", MODE="0666" - SUBSYSTEM=="usb", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="666", GROUP="plugdev" - KERNEL=="hidraw*", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="0666", GROUP="plugdev" - EOF - ''; - }; -in { services = { tor.enable = true; @@ -27,9 +8,6 @@ in }; ratbagd.enable = true; btrfs.autoScrub.enable = true; - udev = { - packages = [ pkgs.stlink udev-cypherock ]; - }; gvfs.enable = true; tlp = { enable = true; @@ -40,6 +18,20 @@ in logind.extraConfig = "RuntimeDirectorySize=30%"; mysql.enable = true; mysql.package = pkgs.mariadb; + + /* nomad = { + enable = true; + enableDocker = true; + dropPrivileges = false; + extraPackages = with pkgs; [ consul cni-plugins ]; + extraSettingsPaths = [ "/home/natto/hclconfigs/nomad/nomad.json" ]; + }; + + consul = { + enable = true; + package = pkgs.consul; + extraConfigFiles = [ "/home/natto/hclconfigs/consul/consul.json" ]; + };*/ }; systemd.services = { @@ -52,7 +44,6 @@ in docker = { enable = true; enableNvidia = true; - autoPrune.enable = true; }; libvirtd = { enable = true; diff --git a/hosts/satori/stuff.nix b/hosts/satori/stuff.nix index b34f61f..c23837c 100644 --- a/hosts/satori/stuff.nix +++ b/hosts/satori/stuff.nix @@ -22,7 +22,7 @@ }; console.useXkbConfig = true; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ fira-code fira-mono monoid @@ -46,6 +46,7 @@ }; virtualisation = { + waydroid.enable = true; podman = { enable = true; enableNvidia = true; @@ -66,4 +67,32 @@ socketActivation = true; wireplumber.enable = true; }; + /* + environment.etc = + let + json = pkgs.formats.json { }; + in + { + "pipewire/pipewire.conf.d/50-noise.conf".source = json.generate "50-noise.conf" { + context.modules = [ + { + name = "libpipewire-module-echo-cancel"; + args = { + capture.props = { + node.name = "Echo Cancellation Capture"; + }; + source.props = { + node.name = "Echo Cancellation Source"; + }; + sink.props = { + node.name = "Echo Cancellation Sink"; + }; + playback.props = { + node.name = "Echo Cancellation Playback"; + }; + }; + } + ]; + }; + };*/ }