diff --git a/flake.lock b/flake.lock index 858d808..347515c 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1720546205, + "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", "type": "github" }, "original": { @@ -21,11 +21,64 @@ "type": "github" } }, - "cohost-blogger": { + "ameba-src": { + "flake": false, + "locked": { + "lastModified": 1690573222, + "narHash": "sha256-TdyEnTloaciSpkPmnm+OM75sz9jaCaQ3VoDEepfescU=", + "owner": "crystal-ameba", + "repo": "ameba", + "rev": "7b8316f0616ef140cd29b7bf9d7e242009f80d1c", + "type": "github" + }, + "original": { + "owner": "crystal-ameba", + "ref": "v1.5.0", + "repo": "ameba", + "type": "github" + } + }, + "bdwgc-src": { + "flake": false, + "locked": { + "lastModified": 1685120683, + "narHash": "sha256-KHijT4BBKfDvTpHpwognN+3ZXoC6JabBTFSYFyOUT9o=", + "owner": "ivmai", + "repo": "bdwgc", + "rev": "d1ff06cc503a74dca0150d5e988f2c93158b0cdf", + "type": "github" + }, + "original": { + "owner": "ivmai", + "ref": "v8.2.4", + "repo": "bdwgc", + "type": "github" + } + }, + "cardgen": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, + "locked": { + "lastModified": 1709734007, + "narHash": "sha256-6WMaUvhMdiEUZWtmS0yaezqDmK+f6uo+EDyEDqUWbsM=", + "ref": "refs/heads/main", + "rev": "d8de108153420e79a99ad57808d262bbf5033a13", + "revCount": 1, + "type": "git", + "url": "https://git.oat.zone/oat/cardgen" + }, + "original": { + "type": "git", + "url": "https://git.oat.zone/oat/cardgen" + } + }, + "cohost-blogger": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, "locked": { "lastModified": 1692493363, "narHash": "sha256-Y/nefO52W64AtXdEGFVMMBwXw+3m1SswOaO7Dq8b5UA=", @@ -40,6 +93,105 @@ "url": "https://git.oat.zone/oat/cohost-blogger" } }, + "crystal-aarch64-darwin": { + "flake": false, + "locked": { + "lastModified": 1697184042, + "narHash": "sha256-zHvZo/t13QsKTJOOp6v6ZNw7cwjKZ29TajRNC3vUaCI=", + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.10.1/crystal-1.10.1-1-darwin-universal.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.10.1/crystal-1.10.1-1-darwin-universal.tar.gz" + } + }, + "crystal-flake": { + "inputs": { + "ameba-src": "ameba-src", + "bdwgc-src": "bdwgc-src", + "crystal-aarch64-darwin": "crystal-aarch64-darwin", + "crystal-src": "crystal-src", + "crystal-x86_64-darwin": "crystal-x86_64-darwin", + "crystal-x86_64-linux": "crystal-x86_64-linux", + "crystalline-src": "crystalline-src", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1697498174, + "narHash": "sha256-cuGNIqwO8Zdex277Fp+pwwPfjxS44Kpnbggj5Cv2RhQ=", + "owner": "manveru", + "repo": "crystal-flake", + "rev": "2b34b26d2969e862282e83e85e59899d41cafeab", + "type": "github" + }, + "original": { + "owner": "manveru", + "repo": "crystal-flake", + "type": "github" + } + }, + "crystal-src": { + "flake": false, + "locked": { + "lastModified": 1697181881, + "narHash": "sha256-+ytVFf0t6ZDcJ+bQaDC012/YlOTpo7G6WGBMGlRltt4=", + "owner": "crystal-lang", + "repo": "crystal", + "rev": "c6f3552f5be159eb06c8f348c6b9e23ff7f17dbc", + "type": "github" + }, + "original": { + "owner": "crystal-lang", + "ref": "1.10.1", + "repo": "crystal", + "type": "github" + } + }, + "crystal-x86_64-darwin": { + "flake": false, + "locked": { + "lastModified": 1697184042, + "narHash": "sha256-zHvZo/t13QsKTJOOp6v6ZNw7cwjKZ29TajRNC3vUaCI=", + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.10.1/crystal-1.10.1-1-darwin-universal.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.10.1/crystal-1.10.1-1-darwin-universal.tar.gz" + } + }, + "crystal-x86_64-linux": { + "flake": false, + "locked": { + "lastModified": 1697182606, + "narHash": "sha256-QhWySbDISW3GNcNXpTJN7tucbW5sTTeo0r2D/T7VHwo=", + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.10.1/crystal-1.10.1-1-linux-x86_64.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.10.1/crystal-1.10.1-1-linux-x86_64.tar.gz" + } + }, + "crystalline-src": { + "flake": false, + "locked": { + "lastModified": 1696955782, + "narHash": "sha256-EMRq8FqVhzdrlH/HPlJnE3DhjdEIsdxFV69jA1VvTpk=", + "owner": "elbywan", + "repo": "crystalline", + "rev": "48f4b48658ba9268db8b2d56d402ce659d019e54", + "type": "github" + }, + "original": { + "owner": "elbywan", + "ref": "v0.11.0", + "repo": "crystalline", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -64,16 +216,16 @@ }, "emacs-overlay": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708679224, - "narHash": "sha256-V66NAQSTakocPST2GYv4SKK+ALBg3sgCNq0jIOpNkpc=", + "lastModified": 1721266930, + "narHash": "sha256-V8UuYJyWqKPgDPEaOBduwg2IXVNWzdJkSQvsd3XPBgQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "841abef01afbd293aa80130bcbd811e4102d5770", + "rev": "3bbe0ad8b6c1f771b1777022d9aa69f83dbe7f3b", "type": "github" }, "original": { @@ -98,16 +250,34 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1672152762, + "narHash": "sha256-U8iWWHgabN07zfbgedogMVWrEP1Zywyf3Yx3OYHSSgE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "19e0f88324d90509141e192664ded98bb88ef9b2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -120,24 +290,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -152,9 +304,27 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1705309234, @@ -172,7 +342,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -188,6 +358,62 @@ "type": "github" } }, + "flake-utils_6": { + "inputs": { + "systems": "systems_9" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_10" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gd-icon-renderer-web": { + "inputs": { + "crystal-flake": "crystal-flake", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1713365381, + "narHash": "sha256-0IgXcF7aKKv3dqLP7vz+t97qQODl8IlvFSXQFxjnDP0=", + "owner": "oatmealine", + "repo": "gd-icon-renderer-web", + "rev": "8e08709fe3ca0aef9e7727c1b6529a482e524600", + "type": "github" + }, + "original": { + "owner": "oatmealine", + "repo": "gd-icon-renderer-web", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -211,14 +437,14 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1719827415, + "narHash": "sha256-pvh+1hStXXAZf0sZ1xIJbWGx4u+OGBC1rVx6Wsw0fBw=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "f2e3c19867262dbe84fdfab42467fc8dd83a2005", "type": "github" }, "original": { @@ -228,21 +454,51 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1720108799, + "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_5", - "systems": "systems_4", - "wlroots": "wlroots", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs_8", + "systems": "systems_6", "xdph": "xdph" }, "locked": { - "lastModified": 1708650152, - "narHash": "sha256-OZUS5FED7KKAPpNaJYQr4BPGXQzGrDFgkKVg9U2aZh8=", + "lastModified": 1721248202, + "narHash": "sha256-bcr7L30L6Gg28CuVaG1e3GAqD3riy8SScQVKxLep6Rg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "8c3613632a6ccebf9fb797ec756ecfce99514eec", + "rev": "300228b503b36e5977b0d58713c5b4cf1f07b8a9", "type": "github" }, "original": { @@ -255,19 +511,21 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1718746314, + "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", "type": "github" }, "original": { @@ -278,17 +536,25 @@ }, "hyprlang": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1708005943, - "narHash": "sha256-9TT3xk++LI5/SPYgjYX34xZ4ebR93c1uerIq+SE/ues=", + "lastModified": 1720381373, + "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "aeb3e012adc7b3235335c540b214b82267c2b983", + "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", "type": "github" }, "original": { @@ -299,36 +565,25 @@ }, "hyprlang_2": { "inputs": { + "hyprutils": [ + "hyprpaper", + "hyprutils" + ], "nixpkgs": [ - "hyprland", - "xdph", + "hyprpaper", "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1720381373, + "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_3": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1704230242, - "narHash": "sha256-S8DM+frECqmAdaUb3y5n3RjY73ajZcL5rnmx5YO+CkY=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "db5e1399b90d5a339330bdd49c5bca6fe58d6f60", + "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", "type": "github" }, "original": { @@ -339,15 +594,18 @@ }, "hyprpaper": { "inputs": { - "hyprlang": "hyprlang_3", - "nixpkgs": "nixpkgs_7" + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": "nixpkgs_9", + "systems": "systems_7" }, "locked": { - "lastModified": 1708532919, - "narHash": "sha256-G4PX7NlRLIlBYTDisbWx/Sif01SLSVzLThGU6v6Wrgg=", + "lastModified": 1721226775, + "narHash": "sha256-dO+jd4i9vitOnSNgJSR6zjS2Gi/mDscLwfo5OY9geN0=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "897cf0ae26c7c54ce15c4946efe63970be75dadb", + "rev": "cbc16f939fc0ac742ac681c86e9009b9d48e1bfc", "type": "github" }, "original": { @@ -358,14 +616,14 @@ }, "hyprpicker": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1703987863, - "narHash": "sha256-MHhAk74uk0qHVwSkLCcXLXMe4478M2oZEFPXwjSoo2E=", + "lastModified": 1721228890, + "narHash": "sha256-si0Xl2ClApldSkgxR1ufUuVyw1tKdFWThZ/umKjSa0s=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "2ef703474fb96e97e03e66e8820f213359f29382", + "rev": "cffd2ca3f88f51b9ab38bf69aea288064a77d3a8", "type": "github" }, "original": { @@ -374,18 +632,118 @@ "type": "github" } }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721071737, + "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprpaper", + "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" + ] + }, + "locked": { + "lastModified": 1721071737, + "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1720215857, + "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprpaper", + "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" + ] + }, + "locked": { + "lastModified": 1720215857, + "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_9" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1708650820, - "narHash": "sha256-O6nq8oHT4iPrWuBoKH0/9B7QC91N/zPnns8QYxPJniY=", + "lastModified": 1721266005, + "narHash": "sha256-YTrojAxT4WrTFafLjcR64ajX8W9DV/sUgChWY8hWoTc=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "fe3753b7025fd7f3a302be698a0896e70ea24450", + "rev": "6a3d0a0af401c6900de72149287690d9b86dddec", "type": "github" }, "original": { @@ -396,11 +754,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1708594753, - "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -425,29 +783,47 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-lib": { "locked": { - "lastModified": 1708566995, - "narHash": "sha256-e/THimsoxxMAHSbwMKov5f5Yg+utTj6XVGEo24Lhx+0=", + "dir": "lib", + "lastModified": 1671359686, + "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3cb4ae6689d2aa3f363516234572613b31212b78", + "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { @@ -457,147 +833,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1708566995, - "narHash": "sha256-e/THimsoxxMAHSbwMKov5f5Yg+utTj6XVGEo24Lhx+0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3cb4ae6689d2aa3f363516234572613b31212b78", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1706826059, - "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1682134069, - "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1685533922, - "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1705331948, - "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1702645756, - "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1683014792, "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", @@ -613,13 +848,13 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_11": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -629,17 +864,190 @@ "type": "github" } }, + "nixpkgs_12": { + "locked": { + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, + "nixpkgs_13": { + "locked": { + "lastModified": 1706826059, + "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_14": { + "locked": { + "lastModified": 1682134069, + "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1709569716, + "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "617579a787259b9a6419492eaac670a5f7663917", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1685533922, + "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1677543769, + "narHash": "sha256-LwbqS8vGisXl2WHpK9r5+kodr0zoIT8F2YB0R4y1TsA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b26d52c9feb6476580016e78935cbf96eb3e2115", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1705331948, + "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nlw-api": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_11" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1708639350, - "narHash": "sha256-g7LL658p4deIme0fPq+WceTNGigXcN6uPNrVraZN3RY=", + "lastModified": 1718917287, + "narHash": "sha256-WJXBSOSMhUAigm4pdcqmbxZ2VWr8yTjPhx/grue5Jfg=", "ref": "refs/heads/main", - "rev": "704581d013b9d16fda5dc8e30d448b358c4e127d", - "revCount": 23, + "rev": "21a6fce8e13df178a7e349df0782438f0c376cee", + "revCount": 31, "type": "git", "url": "https://git.oat.zone/oat/nlw-api" }, @@ -651,15 +1059,17 @@ "root": { "inputs": { "agenix": "agenix", + "cardgen": "cardgen", "cohost-blogger": "cohost-blogger", "emacs-overlay": "emacs-overlay", + "gd-icon-renderer-web": "gd-icon-renderer-web", "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprpaper": "hyprpaper", "hyprpicker": "hyprpicker", "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_12", "nixpkgs-unstable": "nixpkgs-unstable", "nlw-api": "nlw-api", "vscode-server": "vscode-server" @@ -680,6 +1090,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -712,16 +1137,16 @@ }, "systems_4": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -741,6 +1166,36 @@ } }, "systems_6": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_7": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -755,7 +1210,7 @@ "type": "github" } }, - "systems_7": { + "systems_9": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -772,15 +1227,15 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1684517665, - "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=", + "lastModified": 1713958148, + "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=", "owner": "nix-community", "repo": "nixos-vscode-server", - "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6", + "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc", "type": "github" }, "original": { @@ -789,32 +1244,13 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", - "type": "gitlab" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ + "hyprland-protocols": "hyprland-protocols", + "hyprlang": [ "hyprland", - "hyprland-protocols" + "hyprlang" ], - "hyprlang": "hyprlang_2", "nixpkgs": [ "hyprland", "nixpkgs" @@ -825,11 +1261,11 @@ ] }, "locked": { - "lastModified": 1706521509, - "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", + "lastModified": 1720194466, + "narHash": "sha256-Rizg9efi6ue95zOp0MeIV2ZedNo+5U9G2l6yirgBUnA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", + "rev": "b9b97e5ba23fe7bd5fa4df54696102e8aa863cf6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 402efe8..08d1472 100755 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,8 @@ }; nlw-api.url = "git+https://git.oat.zone/oat/nlw-api"; + cardgen.url = "git+https://git.oat.zone/oat/cardgen"; + gd-icon-renderer-web.url = "github:oatmealine/gd-icon-renderer-web"; emacs-overlay = { url = "github:nix-community/emacs-overlay"; diff --git a/hosts/lucent-firepit/authorizedKeys.nix b/hosts/lucent-firepit/authorizedKeys.nix index 99aef79..dac54d4 100644 --- a/hosts/lucent-firepit/authorizedKeys.nix +++ b/hosts/lucent-firepit/authorizedKeys.nix @@ -48,5 +48,6 @@ # marco { hostname = "marco@the-flesh-portal"; wg = "mttUSatpYdEOmHqnzo7HdhuvTkMpz1Np8kMtsIz6nTY="; + ssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCAI5AdCZ2IrlR3F9vOnG8AEsLXQFx42L4vQNwQ3hiU3cbf5cVxkARCHOqs7eWgpX2RsToilBz6zP7RHaGMLsSP+VkKQlPAvZhH8J6rDXp8Bavzp9Tigpfhvhjhngedb3CuztUdNKggoWs49aeYUO+47EFYQI5n7qAiGf2mOh9OtD6YsItz4nfN5BVXclE1KLXGWjsMyst4Hi8wnBVHcoT4uTwwmuKuPc4PouueaPiFuG9NysaG5qv3bC1pRZChJWJhEUp97WGRdL4t1b7/n44kAdNzh6LZEyWnVeOpfJvAtsayCJVAd3EXRs9QD5BnQQxtVFVg2ST8mNpT5QZY+xrt"; } ] diff --git a/hosts/lucent-firepit/default.nix b/hosts/lucent-firepit/default.nix index 489bea2..55719fb 100644 --- a/hosts/lucent-firepit/default.nix +++ b/hosts/lucent-firepit/default.nix @@ -17,6 +17,8 @@ in { #inputs.watch-party.nixosModules.watch-party inputs.cohost-blogger.nixosModules.cohost-blogger inputs.nlw-api.nixosModules.nlw-api + inputs.cardgen.nixosModules.cardgen + inputs.gd-icon-renderer-web.nixosModules.default inputs.vscode-server.nixosModules.default ]; @@ -60,7 +62,7 @@ in { # oatmealine ?? is that a reference to jill oatmealine monoids from the beloved videogame franchise "oateamelin jill monoids???" .oat. zone??? from va11hall-a??? video game???? woman????? minecraft??????? oatmealine = { conf = { - packages = with pkgs; [ bat tmux micro direnv nix-direnv ripgrep agenixPkg ]; + packages = with pkgs; [ bat tmux micro direnv nix-direnv ripgrep agenixPkg htop unzip zip ]; shell = pkgs.unstable.fish; extraGroups = [ "wheel" "nix-users" "dotfiles" "yugoslavia" ]; initialHashedPassword = "!"; @@ -81,6 +83,7 @@ in { }; }; # i yearn for the day this name ceases to mean + # boy what the FUCK were you cooking with this mayflower = { conf = { packages = with pkgs; [ micro tmux ]; @@ -145,11 +148,13 @@ in { requirePassword = false; }; + update-idl.enable = true; + postgres.enable = true; - mosh = { - enable = true; - }; + mosh.enable = true; + + mpd.enable = true; wireguard = { enable = true; @@ -199,20 +204,23 @@ in { nowplaying = [ "np" "current" ]; play = [ "p" ]; queue = [ "list" "q" ]; - remove = [ "delete" "d" ]; + remove = [ "delete" ]; skip = [ "s" ]; forceskip = [ "fs" ]; movetrack = [ "move" "m" ]; + stop = [ "leave" "disconnect" "dc" ]; }; queuetype = "REGULAR"; }; in { enable = true; - instances = { + instances = let + pkg = pkgs.jmusicbot; + in { "jomble" = { enable = true; - package = pkgs._.gmusicbot; + package = pkg; options = baseOptions // { token = lib.removeSuffix "\n" (builtins.readFile /etc/jomble_token); @@ -221,11 +229,11 @@ in { }; "jillo" = { enable = true; - package = pkgs._.gmusicbot; + package = pkg; options = baseOptions // { token = lib.removeSuffix "\n" (builtins.readFile /etc/jillo_token); - prefix = ":"; + prefix = "+"; }; }; }; diff --git a/hosts/lucent-firepit/minecraft/default.nix b/hosts/lucent-firepit/minecraft/default.nix index fecebee..257d68c 100644 --- a/hosts/lucent-firepit/minecraft/default.nix +++ b/hosts/lucent-firepit/minecraft/default.nix @@ -40,6 +40,15 @@ in { config = { modules.services.minecraft.enable = true; modules.services.minecraft.servers = { + "lockout" = import ./lockout.nix { + inherit pkgs; + + enable = true; + server-port = 25959; + + inherit (gayrats) whitelist; + }; + "gayrats" = import ./gayrats.nix { inherit pkgs; @@ -102,6 +111,14 @@ in { }; }; + "minehattan" = import ./minehattan.nix { + inherit pkgs; + inherit lib; + + enable = true; + server-port = 25984; + }; + "modfest-build" = let unsupINI = mkUnsupINI { url = "https://raw.githack.com/ModFest/modfest-1-20/main/pack/pack.toml"; diff --git a/hosts/lucent-firepit/minecraft/lockout.nix b/hosts/lucent-firepit/minecraft/lockout.nix new file mode 100644 index 0000000..9817fab --- /dev/null +++ b/hosts/lucent-firepit/minecraft/lockout.nix @@ -0,0 +1,26 @@ +{ pkgs, enable ? false, server-port, whitelist, ... }: + +{ + inherit enable; + autoStart = true; + openFirewall = true; + + inherit whitelist; + serverProperties = { + inherit server-port; + gamemode = 0; + motd = "Bingo Lockout, 1.21 Fabric"; + white-list = true; + max-players = 8; + allow-flight = true; + enable-command-block = true; + enforce-secure-profile = false; + snooper-enabled = false; + spawn-protection = 0; + }; + + #package = pkgs.fabricServers."fabric-1_20_1".override { loaderVersion = "0.15.6"; }; + package = pkgs.fabricServers."fabric-1_21".override { jre_headless = pkgs.unstable.temurin-bin; }; + + jvmOpts = "-Xmx6G"; +} diff --git a/hosts/lucent-firepit/minecraft/minehattan.nix b/hosts/lucent-firepit/minecraft/minehattan.nix new file mode 100644 index 0000000..9333d46 --- /dev/null +++ b/hosts/lucent-firepit/minecraft/minehattan.nix @@ -0,0 +1,34 @@ +{ pkgs, lib, enable ? false, server-port, ... }: + +{ + inherit enable; + autoStart = true; + openFirewall = true; + + serverProperties = { + inherit server-port; + gamemode = "survival"; + motd = "The Minehattan Project, Forge 1.19.2"; + max-players = 8; + allow-flight = true; + enable-command-block = false; + enforce-secure-profile = false; + snooper-enabled = false; + spawn-protection = 0; + #white-list = true; + white-list = false; + view-distance = 16; + level-type = "terra:overworld/overworld"; + }; + + #whitelist = { + # oatmealine = "241d7103-4c9d-4c45-9464-83b5365ce48e"; + # numpad_7 = "44e6e6d7-770d-4afc-96b1-9999b61ced1d"; + # Jollysivie = "0303c83f-d260-48de-a19c-feb4cc67d99f"; + #}; + + # this is UGLY as FUCK; but unfortunately https://github.com/Infinidoge/nix-minecraft/issues/15 + package = pkgs.jdk17; + jvmOpts = "-Xmx8G " + + lib.replaceStrings ["\n"] [" "] (lib.readFile "/srv/minecraft/minehattan/libraries/net/minecraftforge/forge/1.19.2-43.3.0/unix_args.txt"); +} diff --git a/hosts/lucent-firepit/webapps/default.nix b/hosts/lucent-firepit/webapps/default.nix index 922b31b..e20621a 100644 --- a/hosts/lucent-firepit/webapps/default.nix +++ b/hosts/lucent-firepit/webapps/default.nix @@ -112,6 +112,8 @@ in { lightweight = false; # enable if shit gets wild; check config for more info port = 3005; domain = "nitter.oat.zone"; + # i don't care a huge amount about having this plaintext, so.. here goes + password = "awawa"; }; libreddit = { diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 2b31c69..f7843e2 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -31,14 +31,14 @@ in { virtualisation.docker.enable = cfg.enableActions; services = { - gitea = { + forgejo = { enable = true; package = cfg.package; stateDir = "/var/lib/${cfg.domain}"; appName = "Forgejo: dark-firepit hosted Git"; database = { type = "postgres"; - name = "gitea"; + # leaving this blank intentionally }; settings = mkMerge [ (builtins.fromTOML (builtins.readFile "/etc/dotfiles/config/forgejo/app.toml")) { "ui.meta" = { @@ -56,6 +56,7 @@ in { }]; }; + # todo: why is this failing? gitea-actions-runner = mkIf cfg.enableActions { instances."${config.networking.hostName}" = { enable = true; diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix index c526607..d3bc30d 100644 --- a/modules/services/mpd.nix +++ b/modules/services/mpd.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, options, ... }: with lib; -let - audioSupport = config.modules.hardware.audio.enable; - cfg = config.modules.services.mpd; +let cfg = config.modules.services.mpd; in { options.modules.services.mpd = { @@ -11,42 +9,25 @@ in { type = types.bool; default = false; }; - - user = mkOption { - type = types.str; - default = ""; - description = "Which user MPD should run on"; - }; - - musicDir = mkOption { - type = types.str; - defaultText = "$XDG_MUSIC_DIR"; - }; }; config = mkIf cfg.enable { services.mpd = { enable = true; - user = cfg.user; + extraConfig = '' + audio_output { + type "httpd" + name "lucent.fm" + encoder "opus" + port "6605" + bitrate "96000" + format "48000:16:1" + always_on "yes" + tags "yes" + } + ''; }; - home._.services.mpd = { - enable = true; - musicDirectory = cfg.musicDir; - extraConfig = -'' -zeroconf_enabled "no" -restore_paused "yes" -replaygain "track" -'' -+ (if audioSupport then -'' -audio_output { - type "pipewire" - name "PipeWire Audio Server" - server "127.0.0.1" -} -'' else ""); - }; + networking.firewall.allowedTCPPorts = [ 6600 6605 ]; }; } diff --git a/modules/services/nitter.nix b/modules/services/nitter.nix index 2634bfc..aeea0ae 100644 --- a/modules/services/nitter.nix +++ b/modules/services/nitter.nix @@ -27,6 +27,11 @@ in { Some functionality gets removed (videos are not proxied, etc) in exchange for less RAM usage and CPU usage ''; }; + password = mkOption { + type = types.nullOr types.str; + default = null; + description = "Password locks the site"; + }; }; # force unstable @@ -39,11 +44,12 @@ in { services = { nitter = { enable = true; - package = pkgs.unstable.nitter.overrideAttrs (old: { - patches = old.patches ++ [ - ./nitter-age-check.patch - ]; - }); + #package = pkgs.unstable.nitter.overrideAttrs (old: { + # patches = old.patches ++ [ + # ./nitter-age-check.patch + # ]; + #}); + package = pkgs.unstable.nitter; config = { proxy = ""; # https://github.com/NixOS/nixpkgs/issues/235359 }; @@ -63,37 +69,54 @@ in { }; # https://github.com/zedeus/nitter/wiki/Nginx - nginx.virtualHosts."${cfg.domain}" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://127.0.0.1:${toString cfg.port}"; - extraConfig = '' - #add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always; - #add_header Content-Security-Policy "default-src 'none'; script-src 'self' 'unsafe-inline'; img-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self'; object-src 'none'; media-src 'self' blob:; worker-src 'self' blob:; base-uri 'self'; form-action 'self'; frame-ancestors 'self'; connect-src 'self' https://*.twimg.com; manifest-src 'self'"; - #add_header X-Content-Type-Options nosniff; - #add_header X-Frame-Options DENY; - #add_header X-XSS-Protection "1; mode=block"; - - if ($http_user_agent = 'Mozilla/5.0 (compatible; Discordbot/2.0; +https://discordapp.com)') { - return 302 $scheme://fxtwitter.com$request_uri; - } - ''; - }; - locations."= /robots.txt" = { - extraConfig = '' - # re-defining - #add_header Strict-Transport-Security $hsts_header; - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always; - add_header Referrer-Policy origin-when-cross-origin; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; + nginx.virtualHosts."${cfg.domain}" = mkMerge [ + { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString cfg.port}"; + extraConfig = '' + #add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always; + #add_header Content-Security-Policy "default-src 'none'; script-src 'self' 'unsafe-inline'; img-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self'; object-src 'none'; media-src 'self' blob:; worker-src 'self' blob:; base-uri 'self'; form-action 'self'; frame-ancestors 'self'; connect-src 'self' https://*.twimg.com; manifest-src 'self'"; + #add_header X-Content-Type-Options nosniff; + #add_header X-Frame-Options DENY; + #add_header X-XSS-Protection "1; mode=block"; + + if ($http_user_agent = 'Mozilla/5.0 (compatible; Discordbot/2.0; +https://discordapp.com)') { + return 302 $scheme://fxtwitter.com$request_uri; + } + ''; + }; + locations."= /robots.txt" = { + extraConfig = '' + # re-defining + #add_header Strict-Transport-Security $hsts_header; + add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always; + add_header Referrer-Policy origin-when-cross-origin; + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; - add_header Content-Type text/plain; - return 200 "User-agent: *\nDisallow: /\n"; + add_header Content-Type text/plain; + return 200 "User-agent: *\nDisallow: /\n"; + ''; + }; + } + (mkIf (cfg.password != null) { + extraConfig = let + mkHtpasswd = name: authDef: pkgs.writeText "${name}.htpasswd" ( + concatStringsSep "\n" (mapAttrsToList (user: password: '' + ${user}:{PLAIN}${password} + '') authDef) + ); + authFile = mkHtpasswd "nitter" ({ + nitter = cfg.password; + }); + in '' + auth_basic "contact me at oat.zone for access"; + auth_basic_user_file ${authFile}; ''; - }; - }; + }) + ]; }; # fix for a dumb error diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix index 0d90369..0341c65 100644 --- a/modules/services/ssh.nix +++ b/modules/services/ssh.nix @@ -19,6 +19,8 @@ in { }; config = mkIf cfg.enable { + programs.ssh.package = pkgs.unstable.openssh_hpn; + services.openssh = { enable = true; diff --git a/modules/services/update-itl.nix b/modules/services/update-itl.nix index 2e73fb5..41622d4 100644 --- a/modules/services/update-itl.nix +++ b/modules/services/update-itl.nix @@ -23,7 +23,7 @@ in { systemd.services."update-itl" = { script = '' - ${pkgs.curl} -X POST https://mayf.pink/itl/update -H "Connection: Spiritual" + ${pkgs.curl}/bin/curl -X POST https://mayf.pink/itl/update -H "X-Connection: Spiritual" ''; serviceConfig = { Type = "oneshot";