From 855dd5d445847d294d601fd4d1816d17accaa2d1 Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Sun, 25 Feb 2024 17:07:30 +0530 Subject: [PATCH] satori: yearly visit Signed-off-by: Amneesh Singh --- flake.lock | 449 ++++++++++---------- flake.nix | 39 +- hosts/default.nix | 6 +- hosts/{satori => modules}/nix.nix | 0 hosts/{satori => modules}/wayland.nix | 0 hosts/{satori => modules}/xorg.nix | 0 hosts/satori/boot.nix | 15 - hosts/satori/cirno.png | Bin 34953 -> 0 bytes hosts/satori/colemak | 19 - hosts/satori/default.nix | 3 - hosts/satori/hardware.nix | 14 - hosts/satori/mesa-vulkan-layer-nvidia.patch | 17 - hosts/satori/networking.nix | 18 +- hosts/satori/services.nix | 37 +- hosts/satori/stuff.nix | 31 +- 15 files changed, 307 insertions(+), 341 deletions(-) rename hosts/{satori => modules}/nix.nix (100%) rename hosts/{satori => modules}/wayland.nix (100%) rename hosts/{satori => modules}/xorg.nix (100%) delete mode 100644 hosts/satori/cirno.png delete mode 100644 hosts/satori/colemak delete mode 100644 hosts/satori/mesa-vulkan-layer-nvidia.patch 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 2cfcadd71572fe20529bbebb12e0d0a85be7208a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34953 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 LS3j3^P6 { [ 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"; + }; + }; + } + ]; + }; + };*/ }