From f11def9807760d9dac24cdd1352dc285de7f1b7f Mon Sep 17 00:00:00 2001 From: Tasia Iso Date: Sun, 9 Feb 2025 22:03:02 +0100 Subject: [PATCH] bwaaaa :3333 --- flake.lock | 214 ++++++++++++++++++++++---- home/tasia-but-old-username/home.nix | 2 - home/tasia/home.nix | 2 - hosts/cave/configuration.nix | 10 ++ hosts/cave/fuckery.nix | 1 - hosts/vulpecula-vps/configuration.nix | 1 + hosts/vulpecula-vps/linkding.nix | 1 + hosts/vulpecula-vps/uptime-kuma.nix | 14 ++ 8 files changed, 206 insertions(+), 39 deletions(-) create mode 100644 hosts/vulpecula-vps/uptime-kuma.nix diff --git a/flake.lock b/flake.lock index 8dbbcde..92f6b72 100644 --- a/flake.lock +++ b/flake.lock @@ -76,6 +76,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -97,6 +113,28 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "thymis", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -187,6 +225,41 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "thymis", + "nix" + ], + "gitignore": [ + "thymis", + "nix" + ], + "nixpkgs": [ + "thymis", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "thymis", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -333,6 +406,30 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": "nixpkgs_2", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1737727335, + "narHash": "sha256-1T7WRNfUMsiiNB77BuHElzjavguL8oJx+wBtfMcobq8=", + "owner": "NixOS", + "repo": "nix", + "rev": "36bd92736faaf81c6af3dff8f560963eb4e76b14", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.26.1", + "repo": "nix", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -394,11 +491,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737751639, - "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", + "lastModified": 1738638143, + "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", + "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", "type": "github" }, "original": { @@ -409,11 +506,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738277201, - "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", + "lastModified": 1738843498, + "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", + "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", "type": "github" }, "original": { @@ -423,6 +520,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-for-playwright-browsers": { "locked": { "lastModified": 1736916166, @@ -439,6 +552,22 @@ "type": "github" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -456,6 +585,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1738702386, + "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1736061677, "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", @@ -471,7 +616,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1717281328, "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", @@ -487,7 +632,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1717144377, "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", @@ -518,15 +663,15 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736884309, - "narHash": "sha256-eiCqmKl0BIRiYk5/ZhZozwn4/7Km9CWTbc15Cv+VX5k=", - "owner": "nix-community", + "lastModified": 1738007779, + "narHash": "sha256-5A1PoxCCylMKPDSkeywHiTKYkmRHrfOZmPrTVHehNa0=", + "owner": "thymis-io", "repo": "poetry2nix", - "rev": "75d0515332b7ca269f6d7abfd2c44c47a7cbca7b", + "rev": "0d2f8ac4910a4d1e3ba8fea4e746857db674b805", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "thymis-io", "repo": "poetry2nix", "type": "github" } @@ -562,7 +707,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -742,11 +887,11 @@ }, "stable": { "locked": { - "lastModified": 1738277201, - "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", + "lastModified": 1738843498, + "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", + "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", "type": "github" }, "original": { @@ -869,11 +1014,11 @@ ] }, "locked": { - "lastModified": 1738448802, - "narHash": "sha256-29r5/GCGgAHgV7S/GblO0bz4mf4A7wxnjgK3R/7cMS4=", + "lastModified": 1739134922, + "narHash": "sha256-gHbSXLMlhT+OA71nWDCb2+C4vEHxnxQ5LpF+6EF4JnU=", "ref": "refs/heads/main", - "rev": "27ce8d82ace4e4523f7be750467b1ab1d720d701", - "revCount": 76, + "rev": "df57ef8ca3dc336fbb68dac3a2f113fa28025861", + "revCount": 80, "type": "git", "url": "https://git.vulpecula.zone/tasiaiso/tasiaiso.vulpecula.zone" }, @@ -886,6 +1031,7 @@ "inputs": { "flake-utils": "flake-utils_2", "home-manager": "home-manager_3", + "nix": "nix", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": [ @@ -896,11 +1042,11 @@ "raspberry-pi-nix": "raspberry-pi-nix" }, "locked": { - "lastModified": 1738343209, - "narHash": "sha256-RsSBqC+nDUhvj2HjCKk+benr+VHiQ6VWxuwXCM7ULGQ=", + "lastModified": 1739121960, + "narHash": "sha256-ryXTsqPnCIK7zgWh8ylVbFshZT+HB7bJzsn8M8u4wfI=", "owner": "Thymis-io", "repo": "thymis", - "rev": "5dfe2c8204fdd8da4ee172faeb6adac3ff36e4c5", + "rev": "a7ba63b32979afecb4a1d83be700fdb6a6e4b8fd", "type": "github" }, "original": { @@ -912,14 +1058,14 @@ "tildefriends": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1738448368, - "narHash": "sha256-yO+5l8+K+2Ibma2jStO/Lj/3x2be644Cqvw7D6kkQME=", + "lastModified": 1739106793, + "narHash": "sha256-9ZYdmXQeXFWmcjVpe1L9211qbGny7d7qtMGr/0IBI2s=", "ref": "main", - "rev": "f03a5918d148cf5d0322e25e515642b6738b916a", - "revCount": 2316, + "rev": "8679d090407c57bc75ec3355251b3eea22796755", + "revCount": 2360, "type": "git", "url": "https://dev.tildefriends.net/cory/tildefriends" }, @@ -967,7 +1113,7 @@ "vedirect-reader": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1717688985, @@ -991,11 +1137,11 @@ ] }, "locked": { - "lastModified": 1737714317, - "narHash": "sha256-2/ShZv7nfMMBmL4SKUUQRrRxkwW5ISpR8hJYm+eBdTU=", + "lastModified": 1739134002, + "narHash": "sha256-ZLAvn+PkHHel6cUmaxLNwGzM6T63cwwjbQpCgoUce7E=", "ref": "refs/heads/main", - "rev": "0e5b1e3d24fd5383f2389f43ba718a77288af292", - "revCount": 12, + "rev": "f695998f63e84a35cfdadcebac4945be6a0607bd", + "revCount": 15, "type": "git", "url": "https://git.vulpecula.zone/tasiaiso/vulpecula.zone" }, diff --git a/home/tasia-but-old-username/home.nix b/home/tasia-but-old-username/home.nix index 65f7867..dcdd5ce 100644 --- a/home/tasia-but-old-username/home.nix +++ b/home/tasia-but-old-username/home.nix @@ -31,7 +31,6 @@ }; home.packages = with pkgs; [ - bitwarden # android-tools gocryptfs #endless-sky @@ -45,7 +44,6 @@ # wireshark # appimage-run #ssb-patchwork - simplex-chat-desktop #android-studio #swig picard diff --git a/home/tasia/home.nix b/home/tasia/home.nix index 751e1ba..2023274 100644 --- a/home/tasia/home.nix +++ b/home/tasia/home.nix @@ -68,8 +68,6 @@ jdk17 # Dektop apps - bitwarden - simplex-chat-desktop picard kleopatra # qbittorrent diff --git a/hosts/cave/configuration.nix b/hosts/cave/configuration.nix index a567cad..0adb197 100644 --- a/hosts/cave/configuration.nix +++ b/hosts/cave/configuration.nix @@ -114,11 +114,21 @@ in { yubikey-manager signal-desktop + + element-desktop + # element-web + fluffychat + # fluffychat-web ]; nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" + "fluffychat-linux-1.22.1" + "fluffychat-web-1.22.1" + "olm-3.2.16" ]; + + # services.systembus-notify.enable = true; services.printing.drivers = [pkgs.cnijfilter2]; diff --git a/hosts/cave/fuckery.nix b/hosts/cave/fuckery.nix index f9729bf..a4bd9f2 100644 --- a/hosts/cave/fuckery.nix +++ b/hosts/cave/fuckery.nix @@ -88,7 +88,6 @@ # }; security.acme.acceptTerms = true; - # services.uptime-kuma.enable = true; # programs.adb.enable = true; diff --git a/hosts/vulpecula-vps/configuration.nix b/hosts/vulpecula-vps/configuration.nix index dd7e4c4..e5e221c 100644 --- a/hosts/vulpecula-vps/configuration.nix +++ b/hosts/vulpecula-vps/configuration.nix @@ -17,6 +17,7 @@ in { ./nextcloud.nix ./vaultwarden.nix ./linkding.nix + ./uptime-kuma.nix # ./thymis.nix ]; diff --git a/hosts/vulpecula-vps/linkding.nix b/hosts/vulpecula-vps/linkding.nix index 89f3f66..bad8e4d 100644 --- a/hosts/vulpecula-vps/linkding.nix +++ b/hosts/vulpecula-vps/linkding.nix @@ -6,4 +6,5 @@ }; # linkding is managed through docker. + # TODO see https://linkding.link/installation/ config } diff --git a/hosts/vulpecula-vps/uptime-kuma.nix b/hosts/vulpecula-vps/uptime-kuma.nix new file mode 100644 index 0000000..0b587b2 --- /dev/null +++ b/hosts/vulpecula-vps/uptime-kuma.nix @@ -0,0 +1,14 @@ +{config, ...}: { + services.nginx.virtualHosts."status.vulpecula.zone" = { + addSSL = true; + enableACME = true; + locations."/".proxyPass = "http://localhost:${toString config.services.uptime-kuma.settings.PORT}"; + }; + + services.uptime-kuma = { + enable = true; + settings = { + PORT = "4000"; + }; + }; +} \ No newline at end of file