Update flake inputs

pinwheel: Remove retroarch
pinwheel: Remove mullvad
2024-09-16 21:12:25 +02:00 · 2024-09-12 15:53:40 +02:00 · 2024-09-12 15:39:35 +02:00 · 2024-09-12 15:39:07 +02:00 · 2024-09-12 15:39:05 +02:00 · 2024-09-12 15:28:12 +02:00
86 changed files with 347 additions and 1840 deletions
--- a/README.md
+++ b/README.md
@@ -25,13 +25,3 @@ EDITOR=vim agenix -d "some-secret.age" -i ~/.ssh/alex.pinwheel

 Or use some other SSH key that is has been used to key the secret.

-# Test VM
-Build the test VM with the command:
-```
-cm  --build-test-vm
-```
-
-and test it with:
-```
-cm  --run-test-vm
-```
--- a/alex.tadpole-git.ppp.pm
+++ b/alex.tadpole-git.ppp.pm
@@ -0,0 +1,8 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABDJGnS+ne
+CYQhwLNFuW0lORAAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIFoVMhke2g8n48Fa
+nAdf8Q0K52iHn62D37Zq7MVDbAjEAAAAoLI0dbPITXAhkRXqAKJUh9IsWmviAJE8XMUAMQ
+WPKr2GUxRwf9rVrIB3/VEhY2xfTFzFOiyPkMu4zFvBFoYyqlpXaojihfJv+obV+SgtxnPT
+PxmUG5X0HMryYxswpY/kAG4c2Y7iDQZOuN504WSlDV8ZNkmEzr05Nc+JqaY8J70k7Kl1Wr
+qqtbilUNtETsEGUgXaQ/msYWRmt2K8EwiyhdY=
+-----END OPENSSH PRIVATE KEY-----
--- a/alex.tadpole-git.ppp.pm.pub
+++ b/alex.tadpole-git.ppp.pm.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoVMhke2g8n48FanAdf8Q0K52iHn62D37Zq7MVDbAjE alex.tadpole-git.ppp.pm
--- a/config-manager/default.nix
+++ b/config-manager/default.nix
@@ -33,7 +33,7 @@ let

                update() {
                  echo -e "\033[0;31mUPDATING FLAKE\033[0m"
-                  nix flake update --flake ${flakePath}
+                  nix flake update ${flakePath}
                }

                switch() {
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1760836749,
-        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
+        "lastModified": 1723293904,
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
        "type": "github"
      },
      "original": {
@@ -31,11 +31,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1744478979,
-        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
        "type": "github"
      },
      "original": {
@@ -45,39 +45,20 @@
        "type": "github"
      }
    },
-    "disko": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1760701190,
-        "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
    "emacs-overlay": {
      "inputs": {
+        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
        ],
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1760951609,
-        "narHash": "sha256-rWkUWKWcLin0+dKvinWC1IZVxJnIvXV3q/wlmmKkzo4=",
+        "lastModified": 1726477211,
+        "narHash": "sha256-42boTsTLIUxalTeJSRWiTRCs30wfXu8KTDLbZc32BBk=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "41bee8f6a80b36b0348a8e750e5db88fea528171",
+        "rev": "f4acc62c00a67e5b71ce11e0ee2c3e1b3928c681",
        "type": "github"
      },
      "original": {
@@ -91,11 +72,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@@ -112,11 +93,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745494811,
-        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
+        "lastModified": 1703113217,
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
        "type": "github"
      },
      "original": {
@@ -132,11 +113,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760969583,
-        "narHash": "sha256-vsf5mvR0xxK4GsfLx5bMJAQ4ysdrKymMIifNw+4TP7g=",
+        "lastModified": 1726440980,
+        "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c9d758b500e53db5b74aa02d17dc45b65229e8e9",
+        "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
        "type": "github"
      },
      "original": {
@@ -152,11 +133,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759613406,
-        "narHash": "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg=",
+        "lastModified": 1725551787,
+        "narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "32e1a75b65553daefb419f0906ce19e04815aa3a",
+        "rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072",
        "type": "github"
      },
      "original": {
@@ -165,27 +146,6 @@
        "type": "github"
      }
    },
-    "naviterm": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1757496832,
-        "narHash": "sha256-R5EMcms24G6QGk62iNAMApeZmKsHwCDLj68UUdkhSLw=",
-        "owner": "detoxify92",
-        "repo": "naviterm",
-        "rev": "3b3bd2bace3676000f530b2f47fa28f431c56761",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "detoxify92",
-        "repo": "naviterm",
-        "type": "gitlab"
-      }
-    },
    "nh": {
      "inputs": {
        "nixpkgs": [
@@ -193,11 +153,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760961269,
-        "narHash": "sha256-Udg6DnM6scJj+imbttJR7GQpG2WWeDZ1JOtySTY99M0=",
+        "lastModified": 1725746760,
+        "narHash": "sha256-p38Uini6lChBCF0mZndHXTAy7ZH/OQLY696BFCHg92g=",
        "owner": "viperML",
        "repo": "nh",
-        "rev": "e27508e06f74c7f03616150c1ac1431eaef7f443",
+        "rev": "7650b372e55a36d7765ee0a5e59b142731bc8b3d",
        "type": "github"
      },
      "original": {
@@ -223,11 +183,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1760958188,
-        "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
+        "lastModified": 1726489388,
+        "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
+        "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9",
        "type": "github"
      },
      "original": {
@@ -239,11 +199,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1760878510,
-        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
+        "lastModified": 1726243404,
+        "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+        "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
        "type": "github"
      },
      "original": {
@@ -255,16 +215,16 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1760862643,
-        "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
+        "lastModified": 1726320982,
+        "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
+        "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -293,18 +253,14 @@
    "root": {
      "inputs": {
        "agenix": "agenix",
-        "disko": "disko",
        "emacs-overlay": "emacs-overlay",
        "home-manager": "home-manager_2",
        "hyprland-contrib": "hyprland-contrib",
-        "naviterm": "naviterm",
        "nh": "nh",
        "nix-gc-env": "nix-gc-env",
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs",
-        "pppdotpm-site": "pppdotpm-site",
-        "whib-backend": "whib-backend",
-        "whib-frontend": "whib-frontend"
+        "pppdotpm-site": "pppdotpm-site"
      }
    },
    "systems": {
@@ -336,48 +292,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "whib-backend": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739029248,
-        "narHash": "sha256-ux/Udy0Mhs66P/EQQ8S+xIuXRm9UHEYwSy12IZtlbnA=",
-        "ref": "master",
-        "rev": "222a8f6dde2e9270f6390b5e1e83c7ae1ea48290",
-        "revCount": 371,
-        "type": "git",
-        "url": "ssh://gitea@git.ppp.pm:1122/alex/whib.git"
-      },
-      "original": {
-        "ref": "master",
-        "type": "git",
-        "url": "ssh://gitea@git.ppp.pm:1122/alex/whib.git"
-      }
-    },
-    "whib-frontend": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1761508816,
-        "narHash": "sha256-adV/lyxcmuopyuzZ49v46Yt0gft+ioEL4yl1S+vUbus=",
-        "ref": "master",
-        "rev": "ab10bf50cb6b023a1b99f91c7e8d550231135eef",
-        "revCount": 223,
-        "type": "git",
-        "url": "ssh://gitea@git.ppp.pm:1122/alex/whib-react.git"
-      },
-      "original": {
-        "ref": "master",
-        "type": "git",
-        "url": "ssh://gitea@git.ppp.pm:1122/alex/whib-react.git"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -6,11 +6,6 @@

    nixos-hardware.url = "github:nixos/nixos-hardware/master";

-    disko = {
-      url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
    nh = {
      url = "github:viperML/nh";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -38,25 +33,10 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    naviterm = {
-      url = "gitlab:detoxify92/naviterm";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
    pppdotpm-site = {
      url = "git+ssh://gitea@git.ppp.pm:1122/alex/ppp.pm-site.git?ref=main";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-
-    whib-backend = {
-      url = "git+ssh://gitea@git.ppp.pm:1122/alex/whib.git?ref=master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    whib-frontend = {
-      url = "git+ssh://gitea@git.ppp.pm:1122/alex/whib-react.git?ref=master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
  };

  outputs =
@@ -75,17 +55,6 @@
          ];
        };

-        manatee = inputs.nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = {
-            inherit inputs;
-          };
-          modules = [
-            ./hosts/manatee/configuration.nix
-            ./hosts/manatee/home.nix
-          ];
-        };
-
        backwards = inputs.nixpkgs.lib.nixosSystem {
          system = "x86_64-linux";
          specialArgs = {
@@ -97,38 +66,24 @@
          ];
        };

-        tadpole =
-          let
-            system = "x86_64-linux";
-          in
-          inputs.nixpkgs.lib.nixosSystem {
-            inherit system;
-            specialArgs = {
-              inherit inputs;
-            };
-            modules = [
-              ./hosts/tadpole/configuration.nix
-              ./hosts/tadpole/home.nix
-              inputs.whib-backend.nixosModules.${system}.default
-              inputs.whib-frontend.nixosModules.${system}.default
-            ];
+        tadpole = inputs.nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = {
+            inherit inputs;
          };
+          modules = [
+            ./hosts/tadpole/configuration.nix
+            ./hosts/tadpole/home.nix
+          ];
+        };

-        test-vm =
-          let
-            system = "x86_64-linux";
-          in
-          inputs.nixpkgs.lib.nixosSystem {
-            inherit system;
-            specialArgs = {
-              inherit inputs;
-            };
-            modules = [
-              ./hosts/test-vm/configuration.nix
-              inputs.whib-backend.nixosModules.${system}.default
-              inputs.whib-frontend.nixosModules.${system}.default
-            ];
+        test-vm = inputs.nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = {
+            inherit inputs;
          };
+          modules = [ ./hosts/test-vm/configuration.nix ];
+        };
      };

      devShells =
--- a/hosts/backwards/configuration.nix
+++ b/hosts/backwards/configuration.nix
@@ -15,7 +15,7 @@

  console.keyMap = "sv-latin1";

-  services.pulseaudio.enable = false;
+  hardware.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
    enable = true;
@@ -24,24 +24,12 @@
    pulse.enable = true;
  };

-  hardware = {
-    graphics = {
-      enable = true;
-      extraPackages = [
-        pkgs.intel-media-driver
-        pkgs.libvdpau-va-gl
-      ];
-    };
-  };
-
  users.users.alex = {
    isNormalUser = true;
    description = "alex";
    extraGroups = [
      "networkmanager"
      "wheel"
-      "video"
-      "render"
    ];
    packages = [ ];
  };
--- a/hosts/backwards/modules/audiobookshelf/default.nix
+++ b/hosts/backwards/modules/audiobookshelf/default.nix
@@ -10,17 +10,17 @@ in
  };

  config = lib.mkIf enabled {
-    users.users.audiobookshelf = {
-      isSystemUser = true;
-      description = "audiobookshelf";
-      group = "storage";
+    fileSystems."/home/alex/media" = {
+      device = "/dev/disk/by-uuid/ad4acc0f-172c-40f8-8473-777c957e8764";
+      fsType = "ext4";
+      options = [ "nofail" ];
    };

    services.audiobookshelf = {
      enable = true;

-      user = "audiobookshelf";
-      group = "storage";
+      user = "alex";
+      group = "users";

      host = "0.0.0.0";
      port = 8000;
--- a/hosts/backwards/modules/calibre-web/default.nix
+++ b/hosts/backwards/modules/calibre-web/default.nix
@@ -14,34 +14,19 @@ in
      calibre-web = {
        enable = true;

-        user = "storage";
-        group = "storage";
+        user = "alex";
+        group = "users";

        listen = {
          ip = "0.0.0.0";
          port = 8083;
        };

-        dataDir = "/mnt/media/public/books";
-
        options = {
-          calibreLibrary = "/mnt/media/public/books";
+          calibreLibrary = "/home/alex/sync/books";
          enableBookUploading = true;
        };
      };
-
-      nginx = {
-        virtualHosts."books.ppp.pm" = {
-
-          extraConfig = ''
-            client_max_body_size 1024M;
-          '';
-
-          locations."/" = {
-            proxyPass = "http://0.0.0.0:8083"; # TODO add option for port + host
-          };
-        };
-      };
    };
  };
 }
--- a/hosts/backwards/modules/default.nix
+++ b/hosts/backwards/modules/default.nix
@@ -12,9 +12,11 @@ in

      ssh.enable = true;
      git.enable = true;
-      nginx.enable = true;
      syncthing.enable = true;
      restic.enable = true;
+      transmission.enable = true;
+      audiobookshelf.enable = true;
+      calibre-web.enable = true;
    };
  };
 }
--- a/hosts/backwards/modules/firefox/default.nix
+++ b/hosts/backwards/modules/firefox/default.nix
@@ -1,99 +0,0 @@
-{ pkgs, ... }:
-let
-  wrapped = pkgs.wrapFirefox pkgs.firefox-devedition-unwrapped {
-    extraPolicies = {
-      DisableFirefoxAccounts = false;
-      CaptivePortal = false;
-      DisableFirefoxStudies = true;
-      DisablePocket = true;
-      DisableTelemetry = true;
-      OfferToSaveLogins = false;
-      OfferToSaveLoginsDefault = false;
-      PasswordManagerEnabled = false;
-
-      FirefoxHome = {
-        Search = false;
-        Pocket = false;
-        Snippets = false;
-        TopSites = false;
-        Highlights = false;
-      };
-
-      UserMessaging = {
-        ExtensionRecommendations = false;
-        SkipOnboarding = true;
-      };
-    };
-  };
-
-  ff-alex = pkgs.writeShellApplication {
-    name = "ff-alex";
-    text = ''
-      ${wrapped}/bin/firefox-devedition -P alex --new-window "$@"
-    '';
-  };
-
-  sharedSettings = {
-    "general.smoothScroll" = true;
-    "apz.gtk.kinetic_scroll.enabled" = false;
-    "network.dns.force_waiting_https_rr" = false;
-  };
-in
-{
-  home-manager.users.alex = {
-    programs.firefox = {
-      enable = true;
-
-      package = wrapped;
-
-      profiles = {
-        alex = {
-          id = 0;
-          name = "alex";
-          isDefault = true;
-
-          settings = sharedSettings // { };
-        };
-      };
-    };
-
-    xdg = {
-      # /etc/profiles/per-user/alex/share/applications
-      desktopEntries = {
-        ff-alex = {
-          name = "ff-alex";
-          exec = "${ff-alex}/bin/ff-alex %U";
-          terminal = false;
-        };
-      };
-
-      mimeApps = {
-        enable = true;
-
-        defaultApplications = {
-          "text/html" = "ff-alex.desktop";
-          "x-scheme-handler/http" = "ff-alex.desktop";
-          "x-scheme-handler/https" = "ff-alex.desktop";
-          "application/x-exension-htm" = "ff-alex.desktop";
-          "application/x-exension-html" = "ff-alex.desktop";
-          "application/x-exension-shtml" = "ff-alex.desktop";
-          "application/xhtml+xml" = "ff-alex.desktop";
-          "application/x-exension-xhtml" = "ff-alex.desktop";
-          "application/x-exension-xht" = "ff-alex.desktop";
-        };
-      };
-
-      # https://github.com/nix-community/home-manager/issues/1213
-      configFile."mimeapps.list".force = true;
-    };
-
-    home.packages = [
-      ff-alex
-    ];
-  };
-
-  environment.variables = {
-    MOZ_ENABLE_WAYLAND = 1;
-    BROWSER = "${ff-alex}/bin/ff-alex $@";
-  };
-}
--- a/hosts/backwards/modules/games/default.nix
+++ b/hosts/backwards/modules/games/default.nix
@@ -2,16 +2,13 @@
 {
  home-manager.users.alex = {
    home.packages = [
-      pkgs.nethack
-
-      pkgs.moonlight-qt
-
-      pkgs.pcsx2
-      (pkgs.retroarch.withCores (cores: [
-        pkgs.libretro.snes9x
-        pkgs.libretro.genesis-plus-gx
-        pkgs.libretro.swanstation
-      ]))
+      (pkgs.retroarch.override {
+        cores = [
+          pkgs.libretro.snes9x
+          pkgs.libretro.genesis-plus-gx
+          pkgs.libretro.swanstation
+        ];
+      })
    ];
  };
 }
--- a/hosts/backwards/modules/jellyfin/default.nix
+++ b/hosts/backwards/modules/jellyfin/default.nix
@@ -0,0 +1,44 @@
+{ pkgs, ... }:
+{
+  fileSystems."/home/alex/media" = {
+    device = "/dev/disk/by-uuid/ad4acc0f-172c-40f8-8473-777c957e8764";
+    fsType = "ext4";
+    options = [ "nofail" ];
+  };
+
+  # 1. enable vaapi on OS-level
+  nixpkgs.config.packageOverrides = pkgs: {
+    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  };
+
+  hardware = {
+    graphics = {
+      enable = true;
+
+      extraPackages = with pkgs; [
+        intel-media-driver
+        intel-vaapi-driver # previously vaapiIntel
+        vaapiVdpau
+        libvdpau-va-gl
+        intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
+        vpl-gpu-rt # QSV on 11th gen or newer
+      ];
+    };
+  };
+
+  services.jellyfin = {
+    enable = true;
+    openFirewall = true;
+
+    user = "alex";
+    group = "users";
+
+    dataDir = "/home/alex/media/jellyfin";
+  };
+
+  environment.systemPackages = [
+    pkgs.jellyfin
+    pkgs.jellyfin-web
+    pkgs.jellyfin-ffmpeg
+  ];
+}
--- a/hosts/backwards/modules/network/default.nix
+++ b/hosts/backwards/modules/network/default.nix
@@ -1,22 +1,10 @@
-{ config, ... }:
 {
  networking = {
    hostName = "backwards";

    networkmanager.enable = false;
-
+    wireless.enable = true;
    #wireless.networks are defined in the secret `wpa_supplicant.conf`
-    wireless = {
-      enable = true;
-
-      secretsFile = config.age.secrets.wireless-network-secrets.path;
-
-      networks = {
-        "w1-f1_5G" = {
-          pskRaw = "ext:w1-f1_psk";
-        };
-      };
-    };

    defaultGateway = "192.168.50.1";
    nameservers = [ "1.1.1.1" ];
@@ -36,6 +24,9 @@
  };

  age.secrets = {
-    "wireless-network-secrets".file = ../../../../secrets/backwards/wireless-network-secrets.age;
+    "wpa_supplicant.conf" = {
+      file = ../../../../secrets/backwards/wpa_supplicant.conf.age;
+      path = "/etc/wpa_supplicant.conf";
+    };
  };
 }
--- a/hosts/backwards/modules/nginx/default.nix
+++ b/hosts/backwards/modules/nginx/default.nix
@@ -1,22 +0,0 @@
-{ lib, config, ... }:
-let
-  enabled = config.mod.nginx.enable;
-in
-{
-  options = {
-    mod.nginx = {
-      enable = lib.mkEnableOption "Enable nginx module";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    services = {
-      nginx = {
-        enable = true;
-
-        recommendedProxySettings = true;
-        recommendedTlsSettings = true;
-      };
-    };
-  };
-}
--- a/hosts/backwards/modules/restic/default.nix
+++ b/hosts/backwards/modules/restic/default.nix
@@ -46,7 +46,6 @@ in
          repositoryFile = config.age.secrets.restic-cloud-sync-repository.path;

          paths = [ "/home/alex/sync" ];
-          exclude = [ "/home/alex/sync/reading-material" ];

          timerConfig = {
            OnCalendar = "*-*-* 0/12:00:00"; # Every 12th hour, i.e. twice a day
@@ -66,8 +65,7 @@ in
      secrets = {
        "restic-password".file = ../../../../secrets/backwards/restic-password.age;
        "restic-cloud-sync-key".file = ../../../../secrets/backwards/restic-cloud-sync-key.age;
-        "restic-cloud-sync-repository".file =
-          ../../../../secrets/backwards/restic-cloud-sync-repository.age;
+        "restic-cloud-sync-repository".file = ../../../../secrets/backwards/restic-cloud-sync-repository.age;
      };
    };
  };
--- a/hosts/backwards/modules/ssh/default.nix
+++ b/hosts/backwards/modules/ssh/default.nix
@@ -23,13 +23,6 @@ in
        enable = true;

        matchBlocks = {
-          "manatee" = {
-            hostname = "manatee";
-            user = "alex";
-            identityFile = "/home/alex/.ssh/alex.backwards-manatee";
-            port = 1122;
-          };
-
          "git.ppp.pm" = {
            hostname = "git.ppp.pm";
            identityFile = "/home/alex/.ssh/alex.backwards-git.ppp.pm";
@@ -41,8 +34,6 @@ in
          };
        };
      };
-
-      home.packages = [ pkgs.sshfs ];
    };

    environment.etc."ssh/authorized_keys_command" = {
@@ -93,19 +84,6 @@ in
        path = "${rootSSHKeyPath}/root.backwards.pub";
      };

-      "alex.backwards-manatee" = {
-        file = ../../../../secrets/backwards/alex.backwards-manatee.age;
-        path = "/home/alex/.ssh/alex.backwards-manatee";
-        owner = "alex";
-        group = "users";
-      };
-      "alex.backwards-manatee.pub" = {
-        file = ../../../../secrets/backwards/alex.backwards-manatee.pub.age;
-        path = "/home/alex/.ssh/alex.backwards-manatee.pub";
-        owner = "alex";
-        group = "users";
-      };
-
      "alex.pinwheel-backwards.pub" = {
        file = ../../../../secrets/pinwheel/alex.pinwheel-backwards.pub.age;
        path = "${authorizedKeysPath}/alex.pinwheel-backwards.pub";
--- a/hosts/backwards/modules/syncthing/default.nix
+++ b/hosts/backwards/modules/syncthing/default.nix
@@ -34,7 +34,6 @@ in
        devices = {
          phone.id = config.lib.syncthing.phone;
          pinwheel.id = config.lib.syncthing.pinwheel;
-          tablet.id = config.lib.syncthing.tablet;
        };

        folders = {
@@ -75,7 +74,7 @@ in
          };

          books = {
-            path = "/home/alex/sync/reading-material/books";
+            path = "/home/alex/sync/books";
            devices = [ "pinwheel" ];
            versioning = {
              type = "staggered";
--- a/hosts/backwards/modules/transmission/default.nix
+++ b/hosts/backwards/modules/transmission/default.nix
@@ -21,26 +21,25 @@ in
        package = pkgs.transmission_4;

        openFirewall = true;
+        openRPCPort = true;

-        user = "storage";
-        group = "storage";
+        user = "alex";
+        group = "users";

-        home = "/mnt/media/public/.ts-home";
+        home = "/home/alex/media/ts-home";
        downloadDirPermissions = "775";

        settings = {
-          incomplete-dir-enabled = false;
-          download-dir = "/mnt/media/public/downloads";
-
          rpc-bind-address = "0.0.0.0";
+          rpc-port = 9191;
+
+          incomplete-dir-enabled = false;
+          download-dir = "/home/alex/media/downloads";

-          # Required to have empty user/pass to satisfy transmissionA
-          # https://github.com/transmission/transmission/discussions/1941#discussioncomment-1472352
-          rpc-whitelist-enabled = false;
          rpc-authentication-required = true;
-          rpc-username = "";
-          rpc-password = "";
-
+          rpc-whitelist-enabled = false;
+          rpc-username = "transmission";
+          rpc-password = "{55d884e4042db67313da49e05d7089a368eb64b3Br.3X.Xi";
        };
      };
    };
--- a/hosts/manatee/configuration.nix
+++ b/hosts/manatee/configuration.nix
@@ -1,56 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ../../config-manager/default.nix
-    ../../shared-modules/syncthing.nix
-    ./hardware-configuration.nix
-    ./disk-config.nix
-    ./modules
-  ];
-
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-  nixpkgs.config.allowUnfree = true;
-
-  users.users.alex = {
-    isNormalUser = true;
-    description = "alex";
-    extraGroups = [
-      "wheel"
-      "storage"
-    ];
-  };
-
-  environment.variables.EDITOR = "vim";
-
-  environment.systemPackages = with pkgs; [
-    vim
-    git
-  ];
-
-  config-manager = {
-    flakePath = "/home/alex/config";
-  };
-
-  # This option defines the first version of NixOS you have installed on this particular machine,
-  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
-  #
-  # Most users should NEVER change this value after the initial install, for any reason,
-  # even if you've upgraded your system to a new NixOS release.
-  #
-  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-  # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
-  # to actually do that.
-  #
-  # This value being lower than the current NixOS release does NOT mean your system is
-  # out of date, out of support, or vulnerable.
-  #
-  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-  # and migrated your data accordingly.
-  #
-  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-  system.stateVersion = "24.11"; # Did you read the comment?
-
-}
--- a/hosts/manatee/disk-config.nix
+++ b/hosts/manatee/disk-config.nix
@@ -1,243 +0,0 @@
-{
-  inputs,
-  pkgs,
-  config,
-  ...
-}:
-{
-  imports = [ inputs.disko.nixosModules.disko ];
-
-  config = {
-    users.groups.storage = { };
-
-    users.users.storage = {
-      isSystemUser = true;
-      description = "storage";
-      group = "storage";
-    };
-
-    systemd.tmpfiles.settings = {
-      "10-media-public" = {
-        "/mnt/media/public" = {
-          d = {
-            # Create directory
-            user = "storage";
-            group = "storage";
-            mode = "2775";
-          };
-          z = {
-            # Ensure permissions are inherited
-            user = "storage";
-            group = "storage";
-            mode = "2775";
-          };
-        };
-      };
-
-      "10-cameras-public" = {
-        "/mnt/cameras/public" = {
-          d = {
-            # Create directory
-            user = "storage";
-            group = "storage";
-            mode = "2775";
-          };
-          z = {
-            # Ensure permissions are inherited
-            user = "storage";
-            group = "storage";
-            mode = "2775";
-          };
-        };
-      };
-
-      "10-sync-public" = {
-        "/mnt/sync/public" = {
-          d = {
-            # Create directory
-            user = "storage";
-            group = "storage";
-            mode = "2775";
-          };
-          z = {
-            # Ensure permissions are inherited
-            user = "storage";
-            group = "storage";
-            mode = "2775";
-          };
-        };
-      };
-    };
-
-    environment.systemPackages = [
-      pkgs.smartmontools
-    ];
-
-    services.smartd = {
-      enable = true;
-      devices = [
-        { device = config.disko.devices.disk.root.device; }
-        { device = config.disko.devices.disk.disk1.device; }
-        { device = config.disko.devices.disk.disk2.device; }
-      ];
-    };
-
-    services.zfs.autoScrub.enable = true;
-
-    networking.hostId = "0a9474e7"; # Required by ZFS
-    disko.devices = {
-      disk = {
-        root = {
-          type = "disk";
-          device = "/dev/nvme0n1";
-          content = {
-            type = "gpt";
-            partitions = {
-              ESP = {
-                size = "500M";
-                type = "EF00";
-                content = {
-                  type = "filesystem";
-                  format = "vfat";
-                  mountpoint = "/boot";
-                  mountOptions = [ "umask=0077" ];
-                };
-              };
-
-              root = {
-                size = "100%";
-                content = {
-                  type = "filesystem";
-                  format = "ext4";
-                  mountpoint = "/";
-                };
-              };
-            };
-          };
-        };
-
-        disk1 = {
-          type = "disk";
-          device = "/dev/disk/by-id/ata-ST8000VN004-3CP101_WWZ8QCG4";
-          content = {
-            type = "gpt";
-            partitions = {
-              zfs = {
-                size = "100%";
-                content = {
-                  type = "zfs";
-                  pool = "storage";
-                };
-              };
-            };
-          };
-        };
-
-        disk2 = {
-          type = "disk";
-          device = "/dev/disk/by-id/ata-ST8000VN004-3CP101_WWZ8QDJ5";
-          content = {
-            type = "gpt";
-            partitions = {
-              zfs = {
-                size = "100%";
-                content = {
-                  type = "zfs";
-                  pool = "storage";
-                };
-              };
-            };
-          };
-        };
-        disk3 = {
-          type = "disk";
-          device = "/dev/disk/by-id/ata-TOSHIBA_MG10ACA20TE_85K2A0UCF4MJ";
-          content = {
-            type = "gpt";
-            partitions = {
-              zfs = {
-                size = "100%";
-                content = {
-                  type = "zfs";
-                  pool = "storage";
-                };
-              };
-            };
-          };
-        };
-
-        disk4 = {
-          type = "disk";
-          device = "/dev/disk/by-id/ata-TOSHIBA_MG10ACA20TE_85K2A0V6F4MJ";
-          content = {
-            type = "gpt";
-            partitions = {
-              zfs = {
-                size = "100%";
-                content = {
-                  type = "zfs";
-                  pool = "storage";
-                };
-              };
-            };
-          };
-        };
-      };
-
-      zpool = {
-        storage = {
-          type = "zpool";
-
-          mode = {
-            topology = {
-              type = "topology";
-              vdev = [
-                {
-                  mode = "mirror";
-                  members = [
-                    "disk1"
-                    "disk2"
-                  ];
-                }
-                {
-                  mode = "mirror";
-                  members = [
-                    "disk3"
-                    "disk4"
-                  ];
-                }
-              ];
-            };
-          };
-
-          rootFsOptions = {
-            mountpoint = "none";
-            compression = "zstd";
-            xattr = "sa";
-            "com.sun:auto-snapshot" = "false";
-          };
-
-          datasets = {
-            media = {
-              type = "zfs_fs";
-              mountpoint = "/mnt/media";
-              options.mountpoint = "legacy"; # otherwise we get a race between systemd and zfs; https://github.com/nix-community/disko/issues/214
-            };
-
-            cameras = {
-              type = "zfs_fs";
-              mountpoint = "/mnt/cameras";
-              options.mountpoint = "legacy"; # otherwise we get a race between systemd and zfs; https://github.com/nix-community/disko/issues/214
-            };
-
-            sync = {
-              type = "zfs_fs";
-              mountpoint = "/mnt/sync";
-              options.mountpoint = "legacy"; # otherwise we get a race between systemd and zfs; https://github.com/nix-community/disko/issues/214
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/hosts/manatee/hardware-configuration.nix
+++ b/hosts/manatee/hardware-configuration.nix
@@ -1,39 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "nvme"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/hosts/manatee/home.nix
+++ b/hosts/manatee/home.nix
@@ -1,22 +0,0 @@
-{ inputs, ... }:
-{
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
-
-  config = {
-    home-manager = {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-
-      users.alex = {
-        programs.home-manager.enable = true;
-
-        home.username = "alex";
-        home.homeDirectory = "/home/alex";
-
-        home.packages = [ ];
-
-        home.stateVersion = "24.11";
-      };
-    };
-  };
-}
--- a/hosts/manatee/modules/age/default.nix
+++ b/hosts/manatee/modules/age/default.nix
@@ -1,14 +0,0 @@
-{ inputs, pkgs, ... }:
-{
-  imports = [ inputs.agenix.nixosModules.default ];
-
-  config = {
-    age = {
-      identityPaths = [ "/etc/ssh/manatee" ];
-    };
-
-    environment.systemPackages = [
-      inputs.agenix.packages."${pkgs.system}".default
-    ];
-  };
-}
--- a/hosts/manatee/modules/boot/default.nix
+++ b/hosts/manatee/modules/boot/default.nix
@@ -1,43 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  ...
-}:
-let
-  configurationLimit = config.mod.gc.configurationLimit;
-in
-{
-  imports = [ inputs.nix-gc-env.nixosModules.default ];
-
-  options = {
-    mod.gc = {
-      configurationLimit = lib.mkOption {
-        type = lib.types.int;
-        default = 10;
-        description = "number of configuration generations to keep";
-      };
-    };
-  };
-
-  config = {
-    nix.gc = {
-      automatic = true;
-      dates = "weekly";
-
-      # `delete_generations` added by nix-gc-env
-      delete_generations = "+${builtins.toString configurationLimit}";
-    };
-
-    boot = {
-      loader = {
-        systemd-boot = {
-          enable = true;
-          inherit configurationLimit;
-        };
-
-        efi.canTouchEfiVariables = true;
-      };
-    };
-  };
-}
--- a/hosts/manatee/modules/default.nix
+++ b/hosts/manatee/modules/default.nix
@@ -1,26 +0,0 @@
-{ lib, ... }:
-let
-  toModulePath = dir: _: ./. + "/${dir}";
-  filterDirs = dirs: lib.attrsets.filterAttrs (_: type: type == "directory") dirs;
-in
-{
-  imports = lib.mapAttrsToList toModulePath (filterDirs (builtins.readDir ./.));
-
-  config = {
-    mod = {
-      gc.configurationLimit = 10;
-
-      ssh.enable = true;
-      git.enable = true;
-
-      nginx.enable = true;
-      syncthing.enable = true;
-      transmission.enable = true;
-      calibre-web.enable = true;
-      audiobookshelf.enable = true;
-      jellyfin.enable = true;
-      immich.enable = true;
-      navidrome.enable = true;
-    };
-  };
-}
--- a/hosts/manatee/modules/git/default.nix
+++ b/hosts/manatee/modules/git/default.nix
@@ -1,39 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  enabled = config.mod.git.enable;
-in
-{
-  options = {
-    mod.git = {
-      enable = lib.mkEnableOption "enable git module";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    home-manager.users.alex = {
-      programs.git = {
-        enable = true;
-
-        includes = [
-          { path = ./gitconfig; }
-        ];
-
-        extraConfig = {
-          rerere.enable = true;
-        };
-      };
-
-      home.packages = [ pkgs.tig ];
-
-      home.file.".tigrc".text = ''
-        set main-view-line-number = yes
-        set main-view-line-number-interval = 1
-      '';
-    };
-  };
-}
--- a/hosts/manatee/modules/git/gitconfig
+++ b/hosts/manatee/modules/git/gitconfig
@@ -1,9 +0,0 @@
-[user]
-    name = Alexander Heldt
-    email = me@alexanderheldt.se
-
-[url "git@github.com:"]
-    insteadOf = https://github.com/
-
-[url "gitea@git.ppp.pm:"]
-    insteadOf = https://git.ppp.pm/
--- a/hosts/manatee/modules/immich/default.nix
+++ b/hosts/manatee/modules/immich/default.nix
@@ -1,35 +0,0 @@
-{ lib, config, ... }:
-let
-  enabled = config.mod.immich.enable;
-in
-{
-  options = {
-    mod.immich = {
-      enable = lib.mkEnableOption "Enable immich module";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    users.users.immich = {
-      isSystemUser = true;
-      group = "storage";
-
-      extraGroups = [
-        "render"
-        "video"
-      ];
-    };
-
-    services.immich = {
-      enable = true;
-
-      user = "immich";
-      group = "storage";
-
-      host = "0.0.0.0";
-
-      mediaLocation = "/mnt/cameras/public";
-      accelerationDevices = [ "/dev/dri/renderD128" ];
-    };
-  };
-}
--- a/hosts/manatee/modules/jellyfin/default.nix
+++ b/hosts/manatee/modules/jellyfin/default.nix
@@ -1,55 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-let
-  enabled = config.mod.jellyfin.enable;
-in
-{
-  options = {
-    mod.jellyfin = {
-      enable = lib.mkEnableOption "Enable jellyfin module";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    users.users.jellyfin = {
-      isSystemUser = true;
-      group = "storage";
-
-      extraGroups = [
-        "render"
-        "video"
-      ];
-    };
-
-    hardware = {
-      graphics = {
-        enable = true;
-        extraPackages = [
-          pkgs.intel-media-driver # Modern Intel VA-API driver (needed for N305)
-          pkgs.libvdpau-va-gl # VDPAU backend for VA-API GLX interop
-        ];
-
-      };
-    };
-
-    services = {
-      jellyfin = {
-        enable = true;
-        openFirewall = true;
-
-        user = "jellyfin";
-        group = "storage";
-      };
-    };
-
-    environment.systemPackages = [
-      pkgs.jellyfin
-      pkgs.jellyfin-web
-      pkgs.jellyfin-ffmpeg
-    ];
-  };
-}
--- a/hosts/manatee/modules/navidrome/default.nix
+++ b/hosts/manatee/modules/navidrome/default.nix
@@ -1,33 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-let
-  navidromeEnabled = config.mod.navidrome.enable;
-in
-{
-  options = {
-    mod.navidrome = {
-      enable = lib.mkEnableOption "Enable navidrome module";
-    };
-  };
-
-  config = {
-    services = lib.mkIf navidromeEnabled {
-      navidrome = {
-        enable = true;
-        openFirewall = true;
-
-        user = "navidrome";
-        group = "storage";
-        settings = {
-          Port = 4533;
-          Address = "0.0.0.0";
-          MusicFolder = "/mnt/media/public/music";
-        };
-      };
-    };
-  };
-}
--- a/hosts/manatee/modules/network/default.nix
+++ b/hosts/manatee/modules/network/default.nix
@@ -1,22 +0,0 @@
-{ ... }:
-{
-  networking = {
-    hostName = "manatee";
-
-    defaultGateway = "192.168.50.1";
-    nameservers = [ "1.1.1.1" ];
-    interfaces = {
-      enp3s0 = {
-        useDHCP = false;
-        ipv4 = {
-          addresses = [
-            {
-              address = "192.168.50.203";
-              prefixLength = 24;
-            }
-          ];
-        };
-      };
-    };
-  };
-}
--- a/hosts/manatee/modules/nginx/default.nix
+++ b/hosts/manatee/modules/nginx/default.nix
@@ -1,22 +0,0 @@
-{ lib, config, ... }:
-let
-  enabled = config.mod.nginx.enable;
-in
-{
-  options = {
-    mod.nginx = {
-      enable = lib.mkEnableOption "Enable nginx module";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    services = {
-      nginx = {
-        enable = true;
-
-        recommendedProxySettings = true;
-        recommendedTlsSettings = true;
-      };
-    };
-  };
-}
--- a/hosts/manatee/modules/ssh/default.nix
+++ b/hosts/manatee/modules/ssh/default.nix
@@ -1,106 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  enabled = config.mod.ssh.enable;
-
-  authorizedKeysPath = "/home/alex/.ssh/authorized-keys";
-  rootSSHKeyPath = "/etc/ssh";
-in
-{
-  options = {
-    mod.ssh = {
-      enable = lib.mkEnableOption "enable ssh module";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    home-manager.users.alex = {
-      programs.ssh = {
-        enable = true;
-
-        matchBlocks = {
-          "git.ppp.pm" = {
-            hostname = "git.ppp.pm";
-            identityFile = "/home/alex/.ssh/alex.manatee-git.ppp.pm";
-          };
-        };
-      };
-    };
-
-    environment.etc."ssh/authorized_keys_command" = {
-      mode = "0755";
-      text = ''
-        #!${pkgs.bash}/bin/bash
-        for file in ${authorizedKeysPath}/*; do
-          ${pkgs.coreutils}/bin/cat "$file"
-        done
-      '';
-    };
-
-    services = {
-      openssh = {
-        enable = true;
-        ports = [ 1122 ];
-
-        hostKeys = [
-          {
-            path = "${rootSSHKeyPath}/root.manatee";
-            type = "ed25519";
-          }
-        ];
-
-        settings = {
-          PasswordAuthentication = false;
-          KbdInteractiveAuthentication = false;
-        };
-
-        authorizedKeysCommand = "/etc/ssh/authorized_keys_command";
-        authorizedKeysCommandUser = "root";
-      };
-    };
-
-    networking = {
-      firewall = {
-        allowedTCPPorts = [ 1122 ];
-      };
-    };
-
-    age.secrets = {
-      "root.manatee" = {
-        file = ../../../../secrets/manatee/root.manatee.age;
-        path = "${rootSSHKeyPath}/root.manatee";
-      };
-      "root.manatee.pub" = {
-        file = ../../../../secrets/manatee/root.manatee.pub.age;
-        path = "${rootSSHKeyPath}/root.manatee.pub";
-      };
-
-      "alex.pinwheel-manatee.pub" = {
-        file = ../../../../secrets/pinwheel/alex.pinwheel-manatee.pub.age;
-        path = "${authorizedKeysPath}/alex.pinwheel-manatee.pub";
-      };
-
-      "alex.backwards-manatee.pub" = {
-        file = ../../../../secrets/backwards/alex.backwards-manatee.pub.age;
-        path = "${authorizedKeysPath}/alex.backwards-manatee.pub";
-      };
-
-      "alex.manatee-git.ppp.pm" = {
-        file = ../../../../secrets/manatee/alex.manatee-git.ppp.pm.age;
-        path = "/home/alex/.ssh/alex.manatee-git.ppp.pm";
-        owner = "alex";
-        group = "users";
-      };
-      "alex.manatee-git.ppp.pm.pub" = {
-        file = ../../../../secrets/manatee/alex.manatee-git.ppp.pm.pub.age;
-        path = "/home/alex/.ssh/alex.manatee-git.ppp.pm.pub";
-        owner = "alex";
-        group = "users";
-      };
-    };
-  };
-}
--- a/hosts/manatee/modules/syncthing/default.nix
+++ b/hosts/manatee/modules/syncthing/default.nix
@@ -1,61 +0,0 @@
-{ lib, config, ... }:
-let
-  enabled = config.mod.syncthing.enable;
-in
-{
-  options = {
-    mod.syncthing = {
-      enable = lib.mkEnableOption "Enable syncthing module";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    services.syncthing = {
-      enable = true;
-
-      cert = config.age.secrets.syncthing-cert.path;
-      key = config.age.secrets.syncthing-key.path;
-
-      user = "storage";
-      group = "storage";
-
-      dataDir = "/mnt/sync/public";
-
-      guiAddress = "0.0.0.0:8384";
-
-      settings = {
-        gui = {
-          user = "syncthing";
-          password = "$2a$12$YBcqhl8AXpoLmIWikuMtkOQLcrPXKKj0xY/qy4hggWnfjeVLQ3Ct6";
-          insecureSkipHostcheck = false;
-        };
-
-        devices = {
-          pinwheel.id = config.lib.syncthing.pinwheel;
-        };
-
-        folders = {
-          org = {
-            path = "/mnt/sync/public/org";
-            devices = [
-              "pinwheel"
-            ];
-            versioning = {
-              type = "staggered";
-              params = {
-                maxage = "2592000"; # 30 days
-              };
-            };
-          };
-        };
-      };
-    };
-
-    age = {
-      secrets = {
-        "syncthing-cert".file = ../../../../secrets/manatee/syncthing-cert.age;
-        "syncthing-key".file = ../../../../secrets/manatee/syncthing-key.age;
-      };
-    };
-  };
-}
--- a/hosts/manatee/modules/tailscale/default.nix
+++ b/hosts/manatee/modules/tailscale/default.nix
@@ -1,11 +0,0 @@
-{ ... }:
-{
-  # If an exit node is used, set:
-  # tailscale set --exit-node-allow-lan-access
-  services.tailscale.enable = true;
-
-  networking.firewall = {
-    checkReversePath = "loose";
-    allowedUDPPorts = [ 41641 ];
-  };
-}
--- a/hosts/pinwheel/hardware-configuration.nix
+++ b/hosts/pinwheel/hardware-configuration.nix
@@ -39,7 +39,7 @@
  swapDevices = [
    {
      device = "/swapfile";
-      size = 48 * 1024; # 48GB
+      size = 24 * 1024; # 24GB
    }
  ];

--- a/hosts/pinwheel/home.nix
+++ b/hosts/pinwheel/home.nix
@@ -14,9 +14,6 @@
        home.homeDirectory = "/home/alex";

        home.packages = [
-          inputs.whib-backend.packages.${pkgs.system}.whib-import
-          # pkgs.beekeeper-studio
-          pkgs.bitwarden-desktop
          pkgs.gimp
          pkgs.zip
          pkgs.unar
@@ -25,7 +22,6 @@
          pkgs.htop
          pkgs.onlyoffice-bin
          pkgs.wdisplays
-          pkgs.vlc
        ];

        home.stateVersion = "23.05";
--- a/hosts/pinwheel/modules/colors/default.nix
+++ b/hosts/pinwheel/modules/colors/default.nix
@@ -3,7 +3,7 @@
    colors = {
      foreground = "bd93f9";
      foreground-dim = "644294";
-      background = "1E1E2F";
+      background = "1E2029";

      gray = "3a3a3a";
      warning = "ff6969";
--- a/hosts/pinwheel/modules/default.nix
+++ b/hosts/pinwheel/modules/default.nix
@@ -33,7 +33,6 @@ in
      rust.enable = true;
      scala.enable = true;
      python.enable = true;
-      gleam.enable = true;

      keyboard.enable = true;
      containers = {
--- a/hosts/pinwheel/modules/dunst/default.nix
+++ b/hosts/pinwheel/modules/dunst/default.nix
@@ -7,6 +7,8 @@
      settings = {
        global = {
          monitor = 1;
+          width = 300;
+          height = 300;
          offset = "10x10";
          origin = "top-right";
          transparency = 10;
--- a/hosts/pinwheel/modules/emacs/config.org
+++ b/hosts/pinwheel/modules/emacs/config.org
@@ -479,34 +479,7 @@ Setup prefix for keybindings.

 * Flycheck
 #+BEGIN_SRC emacs-lisp
-  (use-package flycheck
-    :preface
-    (defun mp-flycheck-eldoc (callback &rest _ignored)
-      "Print flycheck messages at point by calling CALLBACK."
-      (when-let ((flycheck-errors (and flycheck-mode (flycheck-overlay-errors-at (point)))))
-        (mapc
-         (lambda (err)
-           (funcall callback
-             (format "%s: %s"
-                     (let ((level (flycheck-error-level err)))
-                       (pcase level
-                         ('info (propertize "I" 'face 'flycheck-error-list-info))
-                         ('error (propertize "E" 'face 'flycheck-error-list-error))
-                         ('warning (propertize "W" 'face 'flycheck-error-list-warning))
-                         (_ level)))
-                     (flycheck-error-message err))
-             :thing (or (flycheck-error-id err)
-                        (flycheck-error-group err))
-             :face 'font-lock-doc-face))
-         flycheck-errors)))
-
-    (defun mp-flycheck-prefer-eldoc ()
-      (add-hook 'eldoc-documentation-functions #'mp-flycheck-eldoc nil t)
-      (setq eldoc-documentation-strategy 'eldoc-documentation-compose-eagerly)
-      (setq flycheck-display-errors-function nil)
-      (setq flycheck-help-echo-function nil))
-
-    :hook ((flycheck-mode . mp-flycheck-prefer-eldoc)))
+  (use-package flycheck)

  (use-package flycheck-eglot
    :after (flycheck eglot)
@@ -530,12 +503,6 @@ Setup prefix for keybindings.
        (add-hook 'before-save-hook #'eglot-format-buffer -10 t))))

  (use-package eglot
-    :preface
-    (defun mp-eglot-eldoc ()
-  	(setq eldoc-echo-area-use-multiline-p nil)
-      (setq eldoc-documentation-strategy
-        'eldoc-documentation-compose-eagerly))
-
    :config
    (add-to-list 'eglot-server-programs
      '(scala-mode .
@@ -544,9 +511,6 @@ Setup prefix for keybindings.
    (add-to-list 'eglot-server-programs
       '(nix-mode . ("nixd")))

-    (add-to-list 'eglot-server-programs
-      '(gleam-ts-mode . ("gleam" "lsp")))
-
    (setq-default eglot-workspace-configuration
      '(
        :metals (
@@ -556,7 +520,6 @@ Setup prefix for keybindings.
    )

    :hook (
-           (eglot-managed-mode . mp-eglot-eldoc)
           (go-mode . eglot-ensure)
           (go-mode . alex/organize-imports-on-save)
           (go-mode . alex/format-on-save)
@@ -566,10 +529,6 @@ Setup prefix for keybindings.
           (nix-mode . eglot-ensure)
           (nix-mode . alex/format-on-save)

-           (gleam-ts-mode . eglot-ensure)
-           (gleam-ts-mode . alex/format-on-save)
-
-           (python-mode . eglot-ensure)
           (javascript-mode . eglot-ensure)
           (js-mode . eglot-ensure)
           (js-jsx-mode . eglot-ensure)
@@ -589,6 +548,13 @@ Setup prefix for keybindings.
    :after eglot
    :config (eglot-booster-mode))
 #+END_SRC
+** Eldoc-box
+#+BEGIN_SRC emacs-lisp
+  (use-package eldoc-box
+    :after eglot
+    :bind (:map eglot-mode-map
+              ("M-h" . eldoc-box-help-at-point)))
+#+END_SRC
 ** Go
 #+BEGIN_SRC emacs-lisp
  (use-package go-mode
@@ -606,12 +572,6 @@ Setup prefix for keybindings.
    )
  )
 #+END_SRC
-** Gleam
-#+BEGIN_SRC emacs-lisp
-  (use-package gleam-ts-mode
-    :mode "\\.gleam\\'"
-  )
-#+END_SRC
 ** YAML
 #+BEGIN_SRC emacs-lisp
  (use-package yaml-mode
@@ -643,8 +603,7 @@ Setup prefix for keybindings.
 #+BEGIN_SRC emacs-lisp
  (setq
   js-indent-level 2
-   js2-basic-offset 2
-   indent-tabs-mode nil)
+   js2-basic-offset 2)

  (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode))
 #+END_SRC
--- a/hosts/pinwheel/modules/firefox/default.nix
+++ b/hosts/pinwheel/modules/firefox/default.nix
@@ -29,14 +29,14 @@ let
  ff = pkgs.writeShellApplication {
    name = "ff";
    text = ''
-      ${wrapped}/bin/firefox-devedition --ProfileManager
+      ${wrapped}/bin/firefox --ProfileManager
    '';
  };

  ff-alex = pkgs.writeShellApplication {
    name = "ff-alex";
    text = ''
-      ${wrapped}/bin/firefox-devedition -P alex --new-window "$@"
+      ${wrapped}/bin/firefox -P alex --new-window "$@"
    '';
  };

--- a/hosts/pinwheel/modules/fonts/default.nix
+++ b/hosts/pinwheel/modules/fonts/default.nix
@@ -2,9 +2,9 @@
 {
  fonts.packages = [
    pkgs.noto-fonts
-    pkgs.noto-fonts-cjk-sans
+    pkgs.noto-fonts-cjk
    pkgs.noto-fonts-emoji
-    pkgs.nerd-fonts.jetbrains-mono
+    pkgs.nerdfonts
    pkgs.liberation_ttf
  ];
 }
--- a/hosts/pinwheel/modules/gleam/default.nix
+++ b/hosts/pinwheel/modules/gleam/default.nix
@@ -1,25 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  enabled = config.mod.gleam.enable;
-in
-{
-  options = {
-    mod.gleam = {
-      enable = lib.mkEnableOption "enable gleam module";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    home-manager.users.alex = {
-      home.packages = [
-        pkgs.gleam
-        pkgs.erlang
-      ];
-    };
-  };
-}
--- a/hosts/pinwheel/modules/go/default.nix
+++ b/hosts/pinwheel/modules/go/default.nix
@@ -15,14 +15,26 @@ in
  };

  config = lib.mkIf enabled {
+    nixpkgs.overlays =
+      let
+        buildGo122 = pkgs: pkg: pkg.override { buildGoModule = pkgs.buildGo122Module; };
+      in
+      [
+        (final: prev: {
+          go = prev.go_1_22;
+          gopls = buildGo122 prev prev.gopls;
+          go-tools = buildGo122 prev prev.go-tools;
+          govulncheck = buildGo122 prev prev.govulncheck;
+          gotestsum = buildGo122 prev prev.gotestsum;
+        })
+      ];
+
    home-manager.users.alex = {
      programs.go = {
        enable = true;

        package = pkgs.go;
-        env = {
-          GOPATH = "/home/alex/code/go";
-        };
+        goPath = "code/go";
      };

      home.packages = [
--- a/hosts/pinwheel/modules/hyprland/default.nix
+++ b/hosts/pinwheel/modules/hyprland/default.nix
@@ -25,14 +25,11 @@ in

        extraConfig = ''
          exec-once=waybar
-          exec-once=hyprctl setcursor Adwaita 24

          env = GDK_DPI_SCALE,1.5
-          env = HYPRCURSOR_THEME,Adwaita
-          env = HYPRCURSOR_SIZE,24
+          env = XCURSOR_SIZE,64

-          monitor=eDP-1, 1920x1200, auto-center-down, 1
-          monitor=HDMI-A-1, 2560x1440@100, auto-center-up, 1
+          monitor=eDP-1, 1920x1200, 0x0, 1

          workspace = 1, monitor:HDMI-A-1
          workspace = 2, monitor:HDMI-A-1
@@ -45,13 +42,6 @@ in
          workspace = 9, monitor:eDP-1
          workspace = 10, monitor:eDP-1

-          workspace = w[tv1], gapsout:0, gapsin:0
-          workspace = f[1], gapsout:0, gapsin:0
-          windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1]
-          windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1]
-          windowrulev2 = bordersize 0, floating:0, onworkspace:f[1]
-          windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
-
          exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
        '';

@@ -94,6 +84,7 @@ in

          dwindle = {
            force_split = 2;
+            no_gaps_when_only = 1;
          };

          bind =
@@ -180,5 +171,88 @@ in

    # openGL is needed for wayland/hyprland
    hardware.graphics.enable = true;
+
+    systemd.user.services.hyprland-monitors = {
+      # systemctl --user restart hyprland-monitors.service
+      # journalctl --user -u hyprland-monitors.service -e -f
+      unitConfig = {
+        Description = "handles hyprland monitor connect/disconnect";
+      };
+
+      wantedBy = [ "graphical-session.target" ];
+      requires = [ "graphical-session.target" ];
+      after = [ "graphical-session.target" ];
+
+      path = [
+        pkgs.coreutils # to include `cat`
+        pkgs.waybar
+        pkgs.hyprland
+        pkgs.socat
+        pkgs.jq
+        pkgs.bc
+        pkgs.libnotify
+      ];
+
+      script =
+        let
+          moveWSToMonitor =
+            monitor: first: last:
+            if last < first then
+              throw "'first' has to be less than or equal to 'last'"
+            else
+              builtins.genList (
+                n: "dispatch moveworkspacetomonitor ${builtins.toString (first + n)} ${monitor}"
+              ) (last - first + 1);
+
+          external = moveWSToMonitor "HDMI-A-1" 1 5;
+          internal = moveWSToMonitor "eDPI-1" 6 10;
+          onlyInternal = moveWSToMonitor "eDPI-1" 1 10;
+        in
+        ''
+          update() {
+            HDMI_STATUS=$(cat /sys/class/drm/card1-HDMI-A-1/status)
+
+            INTERNAL_WIDTH=1920
+            INTERNAL_HEIGHT=1200
+
+            if [ $HDMI_STATUS = "connected" ]; then
+              notify-send "Using external and laptop monitor"
+
+              hyprctl keyword monitor HDMI-A-1,preferred,0x0,1
+
+              HDMI=$(hyprctl monitors -j | jq '.[] | select(.name=="HDMI-A-1")')
+              HDMI_WIDTH=$(echo $HDMI | jq .width)
+              HDMI_HEIGHT=$(echo $HDMI | jq .height)
+
+              INTERNAL_POS_X=$(echo "($HDMI_WIDTH - $INTERNAL_WIDTH) / 2" | bc)
+              if (( $(echo "$INTERNAL_POS_X < 0" | bc) )); then INTERNAL_POS_X=0; fi
+              INTERNAL_POS_Y=$HDMI_HEIGHT
+
+              hyprctl keyword monitor eDP-1,$INTERNAL_WIDTH"x"$INTERNAL_HEIGHT,$INTERNAL_POS_X"x"$INTERNAL_POS_Y,1
+              hyprctl --batch "${lib.strings.concatStringsSep ";" (external ++ internal)}"
+            else
+              notify-send "Using only laptop monitor"
+
+              hyprctl --batch "keyword monitor HDMI-A,disable; keyword monitor eDP-1,$INTERNAL_WIDTH"x"$INTERNAL_HEIGHT,0x0,1"
+              hyprctl --batch "${lib.strings.concatStringsSep ";" onlyInternal}"
+            fi
+          }
+
+          handle() {
+            case $1 in
+              monitoradded\>\>*|monitorremoved\>\>*)
+                echo "handling event: \"$1\""
+                update ;;
+            esac
+          }
+
+          echo "Starting service with instance \"$HYPRLAND_INSTANCE_SIGNATURE\""
+
+          # Do initial configuration
+          update
+
+          socat -U - UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock | while read -r line; do handle "$line"; done
+        '';
+    };
  };
 }
--- a/hosts/pinwheel/modules/openvpn/default.nix
+++ b/hosts/pinwheel/modules/openvpn/default.nix
@@ -18,12 +18,13 @@ in
    home-manager.users.alex = {
      home.packages = [
        pkgs.openvpn
+        pkgs.update-systemd-resolved
      ];
    };

    services.resolved = {
-      enable = true;
-      dnssec = "false";
+      enable = false;
+      dnssec = "true";
      domains = [ "~." ];
      fallbackDns = [
        "1.1.1.1#one.one.one.one"
--- a/hosts/pinwheel/modules/sound/default.nix
+++ b/hosts/pinwheel/modules/sound/default.nix
@@ -10,7 +10,7 @@ in
 {
  users.users.alex.extraGroups = [ "audio" ];

-  services.pulseaudio.enable = false;
+  hardware.pulseaudio.enable = false;
  security.rtkit.enable = true;

  services.pipewire = {
--- a/hosts/pinwheel/modules/spotify/default.nix
+++ b/hosts/pinwheel/modules/spotify/default.nix
@@ -1,5 +1,4 @@
 {
-  inputs,
  pkgs,
  lib,
  config,
@@ -14,18 +13,18 @@ in
      settings = {
        bind =
          let
-            prev = "${pkgs.playerctl}/bin/playerctl -p naviterm,spotify previous";
-            next = "${pkgs.playerctl}/bin/playerctl -p naviterm,spotify next";
+            prev = "${pkgs.playerctl}/bin/playerctl -p spotify previous";
+            next = "${pkgs.playerctl}/bin/playerctl -p spotify next";
          in
          [
            ", XF86AudioPrev, exec, ${prev}"
            ", XF86AudioNext, exec, ${next}"
-            ", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl -p naviterm,spotify play-pause"
-            ", XF86AudioPause, exec, ${pkgs.playerctl}/bin/playerctl -p naviterm,spoitfy play-pause"
+            ", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl -p spotify play-pause"
+            ", XF86AudioPause, exec, ${pkgs.playerctl}/bin/playerctl -p spoitfy play-pause"

            "$mod ALT, LEFT, exec, ${prev}"
            "$mod ALT, RIGHT, exec, ${next}"
-            "$mod ALT, DOWN, exec, ${pkgs.playerctl}/bin/playerctl -p naviterm,spotify play-pause"
+            "$mod ALT, DOWN, exec, ${pkgs.playerctl}/bin/playerctl -p spotify play-pause"
          ];
      };
    };
@@ -33,7 +32,6 @@ in
    home.packages = [
      pkgs.playerctl
      pkgs.spotify
-      inputs.naviterm.packages.${pkgs.system}.default
    ];
  };

--- a/hosts/pinwheel/modules/ssh/default.nix
+++ b/hosts/pinwheel/modules/ssh/default.nix
@@ -5,13 +5,6 @@
      enable = true;

      matchBlocks = {
-        "manatee" = {
-          hostname = "manatee";
-          user = "alex";
-          identityFile = "/home/alex/.ssh/alex.pinwheel-manatee";
-          port = 1122;
-        };
-
        "backwards" = {
          hostname = "backwards";
          user = "alex";
@@ -19,6 +12,12 @@
          port = 1122;
        };

+        "andromeda" = {
+          hostname = "andromeda.a2x.se";
+          user = "alex";
+          identityFile = "/home/alex/.ssh/alex.pinwheel-andromeda";
+        };
+
        "tadpole" = {
          hostname = "65.21.106.222";
          user = "alex";
@@ -47,19 +46,6 @@
  };

  age.secrets = {
-    "alex.pinwheel-manatee" = {
-      file = ../../../../secrets/pinwheel/alex.pinwheel-manatee.age;
-      path = "/home/alex/.ssh/alex.pinwheel-manatee";
-      owner = "alex";
-      group = "users";
-    };
-    "alex.pinwheel-manatee.pub" = {
-      file = ../../../../secrets/pinwheel/alex.pinwheel-manatee.pub.age;
-      path = "/home/alex/.ssh/alex.pinwheel-manatee.pub";
-      owner = "alex";
-      group = "users";
-    };
-
    "alex.pinwheel-backwards" = {
      file = ../../../../secrets/pinwheel/alex.pinwheel-backwards.age;
      path = "/home/alex/.ssh/alex.pinwheel-backwards";
@@ -112,6 +98,19 @@
      group = "users";
    };

+    "alex.pinwheel-andromeda" = {
+      file = ../../../../secrets/pinwheel/alex.pinwheel-andromeda.age;
+      path = "/home/alex/.ssh/alex.pinwheel-andromeda";
+      owner = "alex";
+      group = "users";
+    };
+    "alex.pinwheel-andromeda.pub" = {
+      file = ../../../../secrets/pinwheel/alex.pinwheel-andromeda.pub.age;
+      path = "/home/alex/.ssh/alex.pinwheel-andromeda.pub";
+      owner = "alex";
+      group = "users";
+    };
+
    "alex.pinwheel-tadpole" = {
      file = ../../../../secrets/pinwheel/alex.pinwheel-tadpole.age;
      path = "/home/alex/.ssh/alex.pinwheel-tadpole";
--- a/hosts/pinwheel/modules/syncthing/default.nix
+++ b/hosts/pinwheel/modules/syncthing/default.nix
@@ -16,7 +16,6 @@
      devices = {
        phone.id = config.lib.syncthing.phone;
        backwards.id = config.lib.syncthing.backwards;
-        manatee.id = config.lib.syncthing.manatee;
      };

      folders = {
@@ -25,7 +24,6 @@
          devices = [
            "phone"
            "backwards"
-            "manatee"
          ];
          versioning = {
            type = "staggered";
@@ -58,7 +56,7 @@
        };

        books = {
-          path = "/home/alex/sync/reading-material/books";
+          path = "/home/alex/sync/books";
          devices = [ "backwards" ];
          versioning = {
            type = "staggered";
--- a/hosts/pinwheel/modules/vm/default.nix
+++ b/hosts/pinwheel/modules/vm/default.nix
@@ -17,10 +17,7 @@ in
  config = lib.mkIf enabled {
    virtualisation = {
      spiceUSBRedirection.enable = true; # Allow redirecting USB to the VM
-      libvirtd = {
-        enable = true;
-        qemu.vhostUserPackages = [ pkgs.virtiofsd ];
-      };
+      libvirtd.enable = true;
    };

    users.users.alex = {
--- a/hosts/pinwheel/modules/waybar/default.nix
+++ b/hosts/pinwheel/modules/waybar/default.nix
@@ -7,14 +7,14 @@
 let
  hyprlandEnabled = config.mod.hyprland.enable;

-  music-status = pkgs.writeShellScript "music-status" ''
-    STATUS=$(${pkgs.playerctl}/bin/playerctl -p naviterm,spotify status 2>&1)
+  spotify-status = pkgs.writeShellScript "spotify-status" ''
+    STATUS=$(${pkgs.playerctl}/bin/playerctl -p spotify status 2>&1)

    if [ "$STATUS" = "No players found" ]; then
      echo ""
    else
      FORMAT="{{markup_escape(xesam:title)}} - {{markup_escape(xesam:artist)}}"
-      OUTPUT=$(${pkgs.playerctl}/bin/playerctl -p naviterm,spotify metadata --format "$FORMAT")
+      OUTPUT=$(${pkgs.playerctl}/bin/playerctl -p spotify metadata --format "$FORMAT")
      case "$STATUS" in
        "Playing")
          echo "<span font='14' rise='-3000'></span> $OUTPUT"
@@ -126,7 +126,7 @@ in
          modules-left = lib.mkIf hyprlandEnabled [ "hyprland/workspaces" ];
          modules-right = [
            "custom/work-vpn-status"
-            "custom/music"
+            "custom/spotify"
            "custom/container-status"
            "custom/dunst"
            "bluetooth"
@@ -142,8 +142,8 @@ in
            interval = 2;
          };

-          "custom/music" = {
-            exec = music-status;
+          "custom/spotify" = {
+            exec = spotify-status;
            interval = 2;
            max-length = 70;
            tooltip = false;
@@ -222,10 +222,7 @@ in
          height = 30;
          spacing = 20;
          fixed-center = false;
-          output = [
-            "HDMI-A-1"
-            "DP-3"
-          ];
+          output = [ "HDMI-A-1" ];

          modules-left = lib.mkIf hyprlandEnabled [ "hyprland/workspaces" ];
          modules-right = [
--- a/hosts/pinwheel/modules/work/default.nix
+++ b/hosts/pinwheel/modules/work/default.nix
@@ -17,16 +17,16 @@ in
    };

    home.packages = [
-      # (pkgs.callPackage ./pants.nix { inherit (pkgs) system; })
-      # (pkgs.callPackage ./syb-cli.nix { })
+      (pkgs.callPackage ./syb-cli.nix { })

      (pkgs.jetbrains.plugins.addPlugins pkgs.jetbrains.idea-ultimate [ "ideavim" ])
-
      (pkgs.google-cloud-sdk.withExtraComponents [
        pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin
      ])
-
-      pkgs.graphite-cli
+      (pkgs.graphite-cli.overrideAttrs (_: {
+        version = "1.4.3";
+      }))
+      pkgs.xdg-utils # needed by graphite-cli

      pkgs.postman
      pkgs.grpcurl
@@ -37,9 +37,7 @@ in
    ];

    programs.go = lib.mkIf goEnabled {
-      env = {
-        GOPRIVATE = [ "$(${pkgs.coreutils}/bin/cat ${config.age.secrets.work-go-private.path})" ];
-      };
+      goPrivate = [ "$(${pkgs.coreutils}/bin/cat ${config.age.secrets.work-go-private.path})" ];
    };

    programs.git = lib.mkIf gitEnabled {
--- a/hosts/pinwheel/modules/work/pants.nix
+++ b/hosts/pinwheel/modules/work/pants.nix
@@ -1,69 +0,0 @@
-{
-  system,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  version = "0.12.0";
-
-  if_let = v: p: if lib.attrsets.matchAttrs p v then v else null;
-  match =
-    v: l: builtins.elemAt (lib.lists.findFirst (x: (if_let v (builtins.elemAt x 0)) != null) null l) 1;
-
-  package = match { platform = system; } [
-    [
-      { platform = "aarch64-linux"; }
-      {
-        url = "https://github.com/pantsbuild/scie-pants/releases/download/v${version}/scie-pants-linux-aarch64";
-        hash = lib.fakeSha256;
-      }
-    ]
-    [
-      { platform = "x86_64-linux"; }
-      {
-        url = "https://github.com/pantsbuild/scie-pants/releases/download/v${version}/scie-pants-linux-x86_64";
-        hash = "sha256-9PjgobndxVqDTYGtw1HESrtzwzH2qE9zFwR26xtwZrM=";
-      }
-    ]
-    [
-      { platform = "aarch64-darwin"; }
-      {
-        url = "https://github.com/pantsbuild/scie-pants/releases/download/v${version}/scie-pants-macos-aarch64";
-        hash = "sha256-1Ha8GAOl7mWVunGKf7INMjar+jnLXaDEPStqE+kK3D4=";
-      }
-    ]
-  ];
-
-  unpatched = pkgs.stdenv.mkDerivation {
-    name = "scie-pants";
-    version = version;
-    sourceRoot = ".";
-    phases = [
-      "installPhase"
-      "patchPhase"
-    ];
-
-    src = pkgs.fetchurl package;
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/bin
-      cp $src $out/bin/pants
-      chmod +x $out/bin/pants
-
-      runHook postInstall
-    '';
-  };
-
-  patched = pkgs.buildFHSEnv {
-    name = "pants";
-    targetPackages = [ pkgs.python39 ];
-    runScript = "${unpatched}/bin/pants";
-    profile = ''
-      export NIX_SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
-      export SSL_CERT_FILE="/etc/ssl/certs/ca-bundle.crt"
-    '';
-  };
-in
-if pkgs.stdenv.isDarwin then unpatched else patched
--- a/hosts/pinwheel/modules/zsh/default.nix
+++ b/hosts/pinwheel/modules/zsh/default.nix
@@ -54,7 +54,7 @@ in
          }
        ];

-        initContent = lib.strings.concatStringsSep "\n" [
+        initExtra = lib.strings.concatStringsSep "\n" [
          "export KEYTIMEOUT=1"
          "bindkey -v '^?' backward-delete-char"
          "bindkey '^a' beginning-of-line"
--- a/hosts/tadpole/modules/certs/default.nix
+++ b/hosts/tadpole/modules/certs/default.nix
@@ -1,35 +1,16 @@
 { ... }:
 {
  security.acme = {
-    acceptTerms = true;
-
-    defaults = {
-      email = "acme@ppp.pm";
-    };
-
    certs = {
      "ppp.pm" = {
        webroot = "/var/lib/acme/acme-challenge/";
+        email = "p@ppp.pm";
        group = "nginx";
      };

      "git.ppp.pm" = {
        webroot = "/var/lib/acme/acme-challenge/";
-        group = "nginx";
-      };
-
-      "whib.ppp.pm" = {
-        webroot = "/var/lib/acme/acme-challenge/";
-        group = "nginx";
-      };
-
-      "api.whib.ppp.pm" = {
-        webroot = "/var/lib/acme/acme-challenge/";
-        group = "nginx";
-      };
-
-      "grafana.whib.ppp.pm" = {
-        webroot = "/var/lib/acme/acme-challenge/";
+        email = "p@ppp.pm";
        group = "nginx";
      };
    };
--- a/hosts/tadpole/modules/default.nix
+++ b/hosts/tadpole/modules/default.nix
@@ -22,8 +22,6 @@ in
      };

      pppdotpm-site.enable = true;
-      whib-backend.enable = true;
-      whib-frontend.enable = true;
    };
  };
 }
--- a/hosts/tadpole/modules/gitea/default.nix
+++ b/hosts/tadpole/modules/gitea/default.nix
@@ -7,6 +7,8 @@
 let
  conf = config.mod.gitea;
  gitDomain = "git.${conf.baseDomain}";
+
+  nginxEnable = config.mod.nginx.enable;
 in
 {
  options = {
@@ -35,16 +37,20 @@ in
    };
  };

-  config = lib.mkIf conf.enable {
+  config = lib.mkIf (conf.enable && nginxEnable) {
    assertions = [
-      {
-        assertion = config.services.nginx.enable;
-        message = "Option 'config.services.nginx' must be enabled";
-      }
      {
        assertion = conf.baseDomain != "";
        message = "Option 'mod.gitea.baseDomain' cannot be empty";
      }
+      {
+        assertion = builtins.hasAttr gitDomain config.security.acme.certs;
+        message = "There is no cert configured for ${gitDomain} used by gitea";
+      }
+      {
+        assertion = conf.webfingerEnable && builtins.hasAttr conf.baseDomain config.security.acme.certs;
+        message = "There is no cert configured for ${conf.baseDomain} used by webfinger";
+      }
      {
        assertion = conf.webfingerEnable && conf.webfingerAccounts != [ ];
        message = "Option 'mod.gitea.webfingerAccounts' cannot be empty";
@@ -64,7 +70,6 @@ in
          ROOT_URL = "https://${gitDomain}";

          SSH_PORT = 1122; # see `ssh` module
-          HTTP_PORT = 3001;
        };

        database = {
@@ -124,7 +129,7 @@ in
        useACMEHost = gitDomain;

        locations."/" = {
-          proxyPass = "http://0.0.0.0:3001";
+          proxyPass = "http://0.0.0:3000";
          proxyWebsockets = true;
        };
      };
--- a/hosts/tadpole/modules/nginx/default.nix
+++ b/hosts/tadpole/modules/nginx/default.nix
@@ -10,6 +10,16 @@ in
  };

  config = lib.mkIf enabled {
+    security = {
+      acme = {
+        acceptTerms = true;
+
+        defaults = {
+          email = "p@ppp.pm";
+        };
+      };
+    };
+
    services = {
      nginx = {
        enable = true;
--- a/hosts/tadpole/modules/ppp.pm-site/default.nix
+++ b/hosts/tadpole/modules/ppp.pm-site/default.nix
@@ -6,6 +6,8 @@
 }:
 let
  enabled = config.mod.pppdotpm-site.enable;
+
+  nginxEnabled = config.mod.nginx.enable;
 in
 {
  imports = [ inputs.pppdotpm-site.nixosModules.default ];
@@ -16,14 +18,7 @@ in
    };
  };

-  config = lib.mkIf enabled {
-    assertions = [
-      {
-        assertion = config.services.nginx.enable;
-        message = "Option 'config.services.nginx' must be enabled";
-      }
-    ];
-
+  config = lib.mkIf (enabled && nginxEnabled) {
    services.pppdotpm-site = {
      enable = true;
      domain = "ppp.pm";
--- a/hosts/tadpole/modules/whib/default.nix
+++ b/hosts/tadpole/modules/whib/default.nix
@@ -1,79 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}:
-let
-  backendEnabled = config.mod.whib-backend.enable;
-  frontendEnabled = config.mod.whib-frontend.enable;
-in
-{
-  options = {
-    mod.whib-backend = {
-      enable = lib.mkEnableOption "enable WHIB backend";
-    };
-
-    mod.whib-frontend = {
-      enable = lib.mkEnableOption "enable WHIB frontend";
-    };
-  };
-
-  config = {
-    assertions = [
-      {
-        assertion = backendEnabled && config.services.nginx.enable;
-        message = "Option 'config.services.nginx' must be enabled";
-      }
-    ];
-
-    services = {
-      whib-backend = lib.mkIf backendEnabled {
-        enable = true;
-
-        backend = {
-          domain = "api.whib.ppp.pm";
-          useACMEHost = "api.whib.ppp.pm";
-
-          environmentFile = config.age.secrets.whib-backend-env-vars.path;
-        };
-
-        postgres = {
-          environmentFile = config.age.secrets.whib-postgres-env-vars.path;
-
-          backup = {
-            interval = "*-*-* 00:00:00 UTC";
-
-            environmentFile = config.age.secrets.whib-postgres-backup-env-vars.path;
-            gpgPassphraseFile = config.age.secrets.whib-gpg-key.path;
-          };
-        };
-
-        grafana = {
-          domain = "grafana.whib.ppp.pm";
-          useACMEHost = "grafana.whib.ppp.pm";
-
-          environmentFile = config.age.secrets.whib-grafana-env-vars.path;
-        };
-      };
-
-      whib-frontend = lib.mkIf frontendEnabled {
-        enable = true;
-
-        domain = "whib.ppp.pm";
-        useACMEHost = "whib.ppp.pm";
-        backendHost = "https://api.whib.ppp.pm";
-      };
-    };
-
-    age.secrets = {
-      "whib-backend-env-vars".file = ../../../../secrets/tadpole/whib-backend-env-vars.age;
-      "whib-postgres-env-vars".file = ../../../../secrets/tadpole/whib-postgres-env-vars.age;
-
-      "whib-postgres-backup-env-vars".file =
-        ../../../../secrets/tadpole/whib-postgres-backup-env-vars.age;
-      "whib-gpg-key".file = ../../../../secrets/tadpole/whib-gpg-key.age;
-
-      "whib-grafana-env-vars".file = ../../../../secrets/tadpole/whib-grafana-env-vars.age;
-    };
-  };
-}
--- a/hosts/test-vm/configuration.nix
+++ b/hosts/test-vm/configuration.nix
@@ -2,8 +2,6 @@
 {
  imports = [
    ./ppp.pm-site.nix
-    ./whib-backend.nix
-    ./whib-frontend.nix
  ];

  config = {
@@ -12,9 +10,7 @@
    networking.hostName = "test-vm";

    mod = {
-      pppdotpm-site.enable = false;
-      whib-backend.enable = true;
-      whib-frontend.enable = true;
+      pppdotpm-site.enable = true;
    };

    users.users.a = {
@@ -22,30 +18,16 @@
      extraGroups = [ "wheel" ];
      password = "a";
    };
-    services.getty.autologinUser = "a";
-    security.sudo.wheelNeedsPassword = false;

    virtualisation.vmVariant = {
-      # following configuration is added only when building VM the *first* time with `build-vm`
+      # following configuration is added only when building VM with build-vm
      virtualisation = {
-        diskSize = 8192;
        memorySize = 2048;
        cores = 3;
        graphics = false;
      };
    };

-    # Resize terminal to host terminal size
-    environment.loginShellInit = ''
-      ${pkgs.xterm}/bin/resize
-
-      echo alias 'sd' can be used to shutdown the VM
-    '';
-
-    environment.interactiveShellInit = ''
-      alias sd='sudo shutdown now'
-    '';
-
    environment.systemPackages = [ ];

    system.stateVersion = "24.05";
--- a/hosts/test-vm/whib-backend.nix
+++ b/hosts/test-vm/whib-backend.nix
@@ -1,124 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  enabled = config.mod.whib-backend.enable;
-in
-{
-  options = {
-    mod.whib-backend = {
-      enable = lib.mkEnableOption "enable WHIB backend";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    services.whib-backend =
-      let
-        backendEnvVars = pkgs.writeText "backend-env-vars" ''
-          SIGNING_KEY=signingkey
-          POSTGRES_DB=whib
-          POSTGRES_USER=whib
-          POSTGRES_PASSWORD=pgpassword
-        '';
-
-        postgresEnvVars = pkgs.writeText "postgres-env-vars" ''
-          POSTGRES_DB=whib
-          POSTGRES_USER=whib
-          POSTGRES_PASSWORD=pgpassword
-        '';
-
-        postgresBackupEnvVars = pkgs.writeText "postgres-backup-env-vars" ''
-          PGDATABASE=whib
-          PGUSER=whib
-          PGPASSWORD=pgpassword
-          B2_BUCKET=a
-          B2_APPLICATION_KEY_ID=b
-          B2_APPLICATION_KEY=c
-        '';
-
-        gpgPassphraseFile = pkgs.writeText "gpg-passphrase" ''
-          foobar
-        '';
-
-        grafanaEnvVars = pkgs.writeText "grafana-env-vars" ''
-          GF_SECURITY_ADMIN_PASSWORD=grafanapassword
-          GF_USERS_ALLOW_SIGN_UP=false
-        '';
-
-      in
-      {
-        enable = true;
-
-        backend = {
-          domain = "whib-backend.local";
-
-          environmentFile = backendEnvVars;
-        };
-
-        postgres = {
-          environmentFile = postgresEnvVars;
-
-          backup = {
-            interval = "*-*-* *:*:00 UTC"; # Every minute, for testing
-
-            environmentFile = postgresBackupEnvVars;
-            gpgPassphraseFile = gpgPassphraseFile;
-
-          };
-        };
-
-        grafana = {
-          domain = "grafana.local";
-
-          environmentFile = grafanaEnvVars;
-        };
-      };
-
-    virtualisation.vmVariant = {
-      virtualisation = {
-        sharedDirectories = {
-          my-shared = {
-            source = "/home/alex/whib-backup";
-            target = "/mnt/shared";
-          };
-        };
-
-        forwardPorts = [
-          {
-            # Service API
-            from = "host";
-            host.port = 8080;
-            guest.port = 8080;
-          }
-          {
-            # Service Metrics
-            from = "host";
-            host.port = 8181;
-            guest.port = 8181;
-          }
-          {
-            # Postgres
-            from = "host";
-            host.port = 5432;
-            guest.port = 5432;
-          }
-          {
-            # Grafana
-            from = "host";
-            host.port = 3000;
-            guest.port = 3000;
-          }
-          {
-            # Prometheus
-            from = "host";
-            host.port = 9090;
-            guest.port = 9090;
-          }
-        ];
-      };
-    };
-  };
-}
--- a/hosts/test-vm/whib-frontend.nix
+++ b/hosts/test-vm/whib-frontend.nix
@@ -1,34 +0,0 @@
-{ lib, config, ... }:
-let
-  enabled = config.mod.whib-frontend.enable;
-in
-{
-  options = {
-    mod.whib-frontend = {
-      enable = lib.mkEnableOption "enable WHIB backend";
-    };
-  };
-
-  config = lib.mkIf enabled {
-    services.whib-frontend = {
-      enable = true;
-
-      domain = "whib-frontend.local";
-      port = "8081";
-      backendHost = "https://api.whib.ppp.pm/"; # "whib-backend.local";
-    };
-
-    virtualisation.vmVariant = {
-      virtualisation = {
-        forwardPorts = [
-          {
-            # Service API
-            from = "host";
-            host.port = 8081;
-            guest.port = 8081;
-          }
-        ];
-      };
-    };
-  };
-}
--- a/secrets/backwards/alex.backwards-manatee.age
+++ b/secrets/backwards/alex.backwards-manatee.age
--- a/secrets/backwards/alex.backwards-manatee.pub.age
+++ b/secrets/backwards/alex.backwards-manatee.pub.age
--- a/secrets/backwards/wireless-network-secrets.age
+++ b/secrets/backwards/wireless-network-secrets.age
--- a/secrets/backwards/wpa_supplicant.conf.age
+++ b/secrets/backwards/wpa_supplicant.conf.age
--- a/secrets/manatee/alex.manatee-git.ppp.pm.age
+++ b/secrets/manatee/alex.manatee-git.ppp.pm.age
--- a/secrets/manatee/alex.manatee-git.ppp.pm.pub.age
+++ b/secrets/manatee/alex.manatee-git.ppp.pm.pub.age
@@ -1,7 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 wkRvNA NmI7zT9UKGRlh3wQIt61Xww4p4pHMf9dtbZjYoWZ8Uw
-f+zEnvRCRG5jg/jvJyhn7cDwNQiQdycS1MjbEnD64Tc
-> ssh-ed25519 +oNaHQ 73NC7E0ns+6Y5mSZFdlkPhZHWsqxe61CMnEqFEMZ90I
-hRfah4GDNd7Jcrfy0Xc6mGtTFGugm1R9EQTXWIQ3Dlo
--- nCgXbaJ4nU1ovuOTtD025pzEwmtr2svW2XXj+oqd49g
-<EFBFBD><EFBFBD><EFBFBD>○<EFBFBD>.<2E><><EFBFBD>Q1pUv<55>i@<40><>yQ<79>h7<16><>n.r	<09><>%<25><>"YL<59>Rmw<6D><77>܌<><DC8C><EFBFBD>$g<14><>j<EFBFBD><6A>ϸ<EFBFBD><CFB8><EFBFBD>KY<4B>Ő<><14>g&<26>Me<>w<EFBFBD>o<><6F><EFBFBD>﨡<EFBFBD><EFA8A1><EFBFBD><EFBFBD>*<2A><>4W<34>8<EFBFBD><38>һN<D2BB><4E>n<EFBFBD>@Q<><51>c^<5E><> WƋ<57><C68B><08><>8S<53>
--- a/secrets/manatee/root.manatee.age
+++ b/secrets/manatee/root.manatee.age
--- a/secrets/manatee/root.manatee.pub.age
+++ b/secrets/manatee/root.manatee.pub.age
@@ -1,8 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 wkRvNA UqHbjXvBR0t5JDL698Ir+5Ea/8P12dlRwf8s8K4DLxU
-T4hCFBfgcGjX4bdcY3FAOAT+Y//gigh2wD+tulkzYg0
-> ssh-ed25519 +oNaHQ rYO/FGLizmtgBbaum8n7Ey/fxLLzBY+qdCGEGA2eglg
-wWzReIBthn3dm8yfSljaIkyTVcegNQBFyUbUyWRpryU
--- 4LIzUebAHUKqBwVaLPQntXiuj1hfyTvoRb9VusyQ01w
-ϪI<EFBFBD>k^<0F>f<EFBFBD><66>L2<4C><32>Y<EFBFBD><59><03><12>Ki<4B><69>kR<6B>;<3B><>O<EFBFBD><4F><EFBFBD>ժ9<D5AA><39>.hA
-<EFBFBD><18>^<5E>Bl%<25>1U<31><55>y}Y<>0c<30>!vHƋ<><C68B><EFBFBD>Ͻtjv<6A>߅<EFBFBD>AoE<6F><45><EFBFBD><EFBFBD>D<EFBFBD>جtCb<43>i5<69>4ab[<1D>og<6F><67>c<EFBFBD><12>9<EFBFBD>X@
--- a/secrets/manatee/syncthing-cert.age
+++ b/secrets/manatee/syncthing-cert.age
--- a/secrets/manatee/syncthing-key.age
+++ b/secrets/manatee/syncthing-key.age
@@ -1,7 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 wkRvNA YbZzduvipUNKn6QnmQu9b/qFNLKXZ4rIykPEBUvvGGs
-aITJQ+ska4vfDL0Z7+wocYZYi5/QjodjHGJj7caE2+Q
-> ssh-ed25519 +oNaHQ s8fl+itCgMK/Hl621+xEdlXl3w1v+Zyx/XihIvh1ahk
-BuumBEu6B2Csxr2VRRagyPnF/T7Thoz1Fq9F/NIAa0o
--- /VPi7PCZNCHPL5dSS+QeSsZLUqBzJZygOWHKVYMyLIM
-<EFBFBD> <20><>qA<71>s<EFBFBD>	<09>x
--- a/secrets/pinwheel/alex.pinwheel-manatee.age
+++ b/secrets/pinwheel/alex.pinwheel-manatee.age
--- a/secrets/pinwheel/alex.pinwheel-manatee.pub.age
+++ b/secrets/pinwheel/alex.pinwheel-manatee.pub.age
@@ -1,9 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 vxPbZg eRWhz6fZKuP5v5E16uZg6si0/vlp3FdzcWud0OfAV38
-9ipUEQuy7IZZRi5RtoiH5/f093YCicJ/3VpH0TC7lh4
-> ssh-ed25519 wkRvNA 938EBkoteypEXGVYII8KP1sm4fpN7MmasqN+lxW70DQ
-qt5DS5u1oCPvlOwO0DsoZp0OdEgZ/hRIJkD77c19Kts
-> ssh-ed25519 +oNaHQ LJSsvOsWwHm+JygGKZ31+IBLKPNadx1OvIcA4Zm34G8
-AtSUR73XCikmAovR8YidLDy7WqZhsvjozzZM82qLsQA
--- wDbiqcaXCRtSYx4qTqxFe8xn56J5ZkdtPrMs5Ba+4No
-<EFBFBD>d<1A><><EFBFBD><EFBFBD>RM<52>E<EFBFBD><45><EFBFBD><04>4<EFBFBD>\<5C>`<60><><EFBFBD><EFBFBD>X<EFBFBD>0<EFBFBD><30><EFBFBD>=<3D><><EFBFBD>l<EFBFBD><6C>.<2E>3ҡ<>d&`<60><>C<EFBFBD><43>'<27>Ͽ<EFBFBD>'<27>~<18>+<2B><>ܽ0<DCBD><10>`Ga<47><61>b<EFBFBD><1E>R,d<14>:<18><1A>Q|є<><D194><EFBFBD><EFBFBD><EFBFBD><16>}B<>Iߪ#<23>c<EFBFBD><63>L<EFBFBD><4C>%<10><>eD<65>Rp<52><70>ۘ6
--- a/secrets/pinwheel/work-github-token.age
+++ b/secrets/pinwheel/work-github-token.age
@@ -1,7 +1,8 @@
 age-encryption.org/v1
-> ssh-ed25519 vxPbZg kPlQg/h4GOsYY4xhXBt7tf3FKpRLKcCWJ++qzFyEW0U
-HPEO63dlU+IxFyRH11bBRDi0mCeW8CGgMChm6s62JHs
-> ssh-ed25519 +oNaHQ uVezQzhewJvvudpJHCqFDRikj/J4tJXN85ESjkXoJjU
-cGUGizHtXZ/d+vO9jVoURNC19vHo77rXq5Cnd4cRwUU
--- DtoPmQklXZeD4zDS/wJvQhx26S8kM2S64Rf9R+AlO2Y
-'<1B>r<EFBFBD>|j<><6A>.<2E>ɭ<EFBFBD><C9AD><EFBFBD>{<7B>A<><41>_4<5F><34>q<EFBFBD>M<EFBFBD>mE7<><37>پ<EFBFBD>
+-> ssh-ed25519 vxPbZg Bmvy3//fQLVj/L4NPxOJ97lZi3mnr4JRYd4LMsQhZFo
+AUKgDUPbXxY9hdvw/p227xJs1zy97bZdzSq+dU8SvjI
+-> ssh-ed25519 +oNaHQ GLTMdsKIZZQBuTUQGfNvow1vawla7/MHIBHMzeIjp1w
+HcbCdXR0TkTe7MxctOubSCB00zc2LD8mmQsluhYxIMs
+--- jg1CbPpvJyFLXfpizH6ibgJ8Fil8lsxjpysOk2QOJks
+<05><>W7L<>g)]<5D><><EFBFBD><EFBFBD><6;U<><1C>\<5C><> <20><><EFBFBD>E<EFBFBD>
+r<EFBFBD><EFBFBD><01>A<EFBFBD><41><EFBFBD>'<06>8|<7C>xX<78><58><EFBFBD>jޜ<6A>=#Tùήէ<>/
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,7 +1,6 @@
 let
-  # see `<host>/modules/age/default.nix` where these are defined
+  # see `modules/age/default.nix` where these are defined
  pinwheel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMoI7Q4zT2AGXU+i8fLmzcNLdfMkEnfHYh4PmaEmo2QW root@pinwheel";
-  manatee = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBqJi/Oml2s/2KBqzLrCF77YJKn36Gute8jaTCEkHEZN root.manatee";
  backwards = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBcTK3CUtTsgavuLlbfOqCbHYLtUrIKqnSqYmtzGCZnv root.backwards";
  tadpole = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDbyj/vYafqpJH33jFz5HV+gwCiEIJTpxKrEFrBWx73A root@tadpole";
  alex = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTgiHYcdhS87pPnduLunZVEgLVj4EtbG9XVSZP1l5s5 alex";
@@ -9,14 +8,14 @@ in {
  "pinwheel/syncthing-cert.age".publicKeys = [ pinwheel alex ];
  "pinwheel/syncthing-key.age".publicKeys = [ pinwheel alex ];
  "pinwheel/tailscale-preferred-exit-node.age".publicKeys = [ pinwheel alex ];
-  "pinwheel/alex.pinwheel-manatee.age".publicKeys = [ pinwheel alex ];
-  "pinwheel/alex.pinwheel-manatee.pub.age".publicKeys = [ pinwheel manatee alex ];
  "pinwheel/alex.pinwheel-backwards.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-backwards.pub.age".publicKeys = [ pinwheel backwards alex ];
  "pinwheel/alex.pinwheel-tadpole.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-tadpole.pub.age".publicKeys = [ pinwheel tadpole alex ];
  "pinwheel/alex.pinwheel-github.com.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-github.com.pub.age".publicKeys = [ pinwheel alex ];
+  "pinwheel/alex.pinwheel-andromeda.age".publicKeys = [ pinwheel alex ];
+  "pinwheel/alex.pinwheel-andromeda.pub.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-codeberg.org.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-codeberg.org.pub.age".publicKeys = [ pinwheel alex ];
  "pinwheel/alex.pinwheel-git.ppp.pm.age".publicKeys = [ pinwheel alex ];
@@ -28,27 +27,18 @@ in {
  "pinwheel/work-staging-ovpn.age".publicKeys = [ pinwheel alex ];
  "pinwheel/work-production-ovpn.age".publicKeys = [ pinwheel alex ];

-  "manatee/root.manatee.age".publicKeys = [ manatee alex ];
-  "manatee/root.manatee.pub.age".publicKeys = [ manatee alex ];
-  "manatee/alex.manatee-git.ppp.pm.age".publicKeys = [ manatee alex ];
-  "manatee/alex.manatee-git.ppp.pm.pub.age".publicKeys = [ manatee alex ];
-  "manatee/syncthing-cert.age".publicKeys = [ manatee alex ];
-  "manatee/syncthing-key.age".publicKeys = [ manatee alex ];
-
  "backwards/root.backwards.age".publicKeys = [ backwards alex ];
  "backwards/root.backwards.pub.age".publicKeys = [ backwards alex ];
-  "backwards/alex.backwards-manatee.age".publicKeys = [ backwards alex ];
-  "backwards/alex.backwards-manatee.pub.age".publicKeys = [ backwards manatee alex ];
  "backwards/syncthing-cert.age".publicKeys = [ backwards alex ];
  "backwards/syncthing-key.age".publicKeys = [ backwards alex ];
-  "backwards/restic-password.age".publicKeys = [ backwards alex ];
+  "backwards/restic-sync-password.age".publicKeys = [ backwards alex ];
  "backwards/restic-cloud-sync-key.age".publicKeys = [ backwards alex ];
  "backwards/restic-cloud-sync-repository.age".publicKeys = [ backwards alex ];
  "backwards/alex.backwards-codeberg.org.age".publicKeys = [ backwards alex ];
  "backwards/alex.backwards-codeberg.org.pub.age".publicKeys = [ backwards alex ];
  "backwards/alex.backwards-git.ppp.pm.age".publicKeys = [ backwards alex ];
  "backwards/alex.backwards-git.ppp.pm.pub.age".publicKeys = [ backwards alex ];
-  "backwards/wireless-network-secrets.age".publicKeys = [ backwards alex ];
+  "backwards/wpa_supplicant.conf.age".publicKeys = [ backwards alex ];

  "tadpole/root.tadpole.age".publicKeys = [ tadpole alex ];
  "tadpole/root.tadpole.pub.age".publicKeys = [ tadpole alex ];
@@ -57,10 +47,4 @@ in {
  "tadpole/alex.tadpole-git.ppp.pm.age".publicKeys = [ tadpole alex ];
  "tadpole/alex.tadpole-git.ppp.pm.pub.age".publicKeys = [ tadpole alex ];
  "tadpole/gitea-dbpassword.age".publicKeys = [ tadpole alex ];
-
-  "tadpole/whib-backend-env-vars.age".publicKeys = [ tadpole alex ];
-  "tadpole/whib-postgres-env-vars.age".publicKeys = [ tadpole alex ];
-  "tadpole/whib-postgres-backup-env-vars.age".publicKeys = [ tadpole alex ];
-  "tadpole/whib-gpg-key.age".publicKeys = [ tadpole alex ];
-  "tadpole/whib-grafana-env-vars.age".publicKeys = [ tadpole alex ];
 }
--- a/secrets/tadpole/whib-backend-env-vars.age
+++ b/secrets/tadpole/whib-backend-env-vars.age
--- a/secrets/tadpole/whib-gpg-key.age
+++ b/secrets/tadpole/whib-gpg-key.age
@@ -1,7 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 5R7G9A Q6V8S5312DQhP0QtPbAlbn+uDER6jpi+gvn40ndmnn0
-soymoaAKbNlYicSbtHhqn54D0zVBHBuHUKngex/VgoM
-> ssh-ed25519 +oNaHQ cpzCyu/9Jrm9Rx5C/rhuZku6uJWjrlHpCYxWOwuwQWw
-1GA8NsLeOTo/zHs/k0vt/N8hH+2MXfMNRy+qKBqi3fM
--- 5O74sFn1xDZ53xHM7KHZ+ge7DzdnhyeB0W0znMk7NYQ
-u<EFBFBD><1E><><EFBFBD>w<EFBFBD>D<EFBFBD>ms"<22><>4<EFBFBD><34><EFBFBD><EFBFBD>w<EFBFBD><77>G<7F>L<>ur	7V`G=	<09><><EFBFBD><EFBFBD>C<EFBFBD><43>n2<6E><32>n<0C><0C>3S~go<67><18><><EFBFBD><EFBFBD>cs<63>@7Ƴ
--- a/secrets/tadpole/whib-grafana-env-vars.age
+++ b/secrets/tadpole/whib-grafana-env-vars.age
--- a/secrets/tadpole/whib-postgres-backup-env-vars.age
+++ b/secrets/tadpole/whib-postgres-backup-env-vars.age
--- a/secrets/tadpole/whib-postgres-env-vars.age
+++ b/secrets/tadpole/whib-postgres-env-vars.age
--- a/shared-modules/syncthing.nix
+++ b/shared-modules/syncthing.nix
@@ -1,11 +1,9 @@
 {
  lib = {
    syncthing = {
-      phone = "WLDQC7C-EFOW5HM-R3PULLO-ZMADECF-6FK73FD-FRK5NF4-J6UB7DY-7B4DFQR";
+      phone = "HCL2CKI-SA3NWOT-PMJZNFP-I7QETYE-JOKZHXN-TSI74FV-ZA6RDO2-QQMXPAP";
      pinwheel = "AKS5L2A-NFCG5GV-3U5SSSZ-PLOX6BQ-ZL5ALXI-D7OK4KE-R2JPWRJ-B6AQJQ7";
-      manatee = "6YDVLXR-NZV6XKD-ASWPZQS-WKBRHAD-52JV5HU-JEPQ32G-6RGY7KJ-OVBO7AM";
      backwards = "XRSQ4NZ-LHCZS6H-R3A75S5-W4FH7F4-3DGA5X2-SOPYWOP-A2WRKGC-IPXH4AM";
-      tablet = "5BEPSWB-BN4MDZM-7W3ITMP-KJ53J6M-WJMLWEF-GTDJTWI-C4C5SPQ-SFS3DAY";
    };
  };
 }
Author	SHA1	Message	Date
Alexander Heldt	4550ca1a4e	Update flake inputs	2024-09-16 21:12:25 +02:00
Alexander Heldt	d35fc00d5a	pinwheel: Remove `retroarch`	2024-09-12 15:53:40 +02:00
Alexander Heldt	762ea06406	pinwheel: Remove `mullvad`	2024-09-12 15:39:35 +02:00
Alexander Heldt	51c4a1981c	pinwheel: Increase `waybar` module intervals	2024-09-12 15:39:07 +02:00
Alexander Heldt	063acc40e2	pinwheel: Add `tailscale` module to `waybar`	2024-09-12 15:39:05 +02:00
Alexander Heldt	b4d1086d57	pinwheel: Add secret for preferred `tailscale` exit node	2024-09-12 15:28:12 +02:00
Alexander Heldt	040c0e2413	pinwheel: Add `swapfile`	2024-09-11 14:44:25 +02:00
Alexander Heldt	cd5fd3dffa	pinwheel: Remove URL preference for `gitlab` in `git`	2024-09-11 14:44:07 +02:00
Alexander Heldt	d591feff45	Update url for `pppdotpm-site` input	2024-09-05 19:25:48 +02:00
Alexander Heldt	06c9b628b6	tadpole: Add match block for `git.ppp.pm` in `ssh`	2024-09-05 18:44:19 +02:00
Alexander Heldt	3870b95c4b	tadpole: Add secrets for `git.ppp.pm`	2024-09-05 18:44:19 +02:00
				`@@ -0,0 +1 @@`
				`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoVMhke2g8n48FanAdf8Q0K52iHn62D37Zq7MVDbAjE alex.tadpole-git.ppp.pm`