remove powerlevel10k module

homeModules/zsh-powerlevel10k.nix

@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  options.programs.zsh-powerlevel10k = {
-    enable = lib.mkEnableOption "powerlevel10k zsh theme";
-    package = lib.mkPackageOption pkgs "zsh-powerlevel10k" { nullable = true; };
-  };
-
-  config =
-    let
-      cfg = config.programs.zsh-powerlevel10k;
-      p10k = if (cfg.package != null) then cfg.package else pkgs.zsh-powerlevel10k;
-    in
-    lib.mkIf cfg.enable {
-      programs.zsh.initContent = ''
-        source ${p10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
-      '';
-    };
-}

nixosConfigurations/hetzner-vpn2/blog.nix

@@ -0,0 +1,43 @@
+{ pkgs, ... }:
+let
+  blog-domain-socket = "/run/nginx/blog.sock";
+  anubis-domain-socket = "/run/anubis/anubis-main/anubis.sock";
+  anubis-metrics-socket = "/run/anubis/anubis-main/anubis-metrics.sock";
+in
+{
+  systemd.services = {
+    nginx.serviceConfig.SupplementaryGroups = [ "anubis" ];
+    anubis-main.serviceConfig.SupplementaryGroups = [ "nginx" ];
+  };
+
+  services = {
+    nginx.virtualHosts = {
+      "zerforschen.plus" = {
+        enableACME = true;
+        forceSSL = true;
+        locations = {
+          "/_metrics".proxyPass = "http://unix:" + anubis-metrics-socket + ":/metrics";
+          "/".proxyPass = "http://unix:" + anubis-domain-socket;
+        };
+      };
+
+      "blog-in-anubis" = {
+        root = pkgs.zerforschen-plus-content;
+        listen = [
+          {
+            addr = "unix:" + blog-domain-socket;
+          }
+        ];
+      };
+    };
+
+    anubis.instances.main = {
+      enable = true;
+      settings = {
+        BIND = anubis-domain-socket;
+        TARGET = "unix://" + blog-domain-socket;
+        METRICS_BIND = anubis-metrics-socket;
+      };
+    };
+  };
+}

nixosConfigurations/hetzner-vpn2/default.nix

@@ -2,6 +2,8 @@
   imports = [
     ./hardware.nix
     ./nginx.nix
+    ./headscale.nix
+    ./blog.nix
   ];
 
   config = {

nixosConfigurations/hetzner-vpn2/headscale.nix

@@ -0,0 +1,43 @@
+let
+  headscale-port = 8668;
+in
+{
+  # sudo tailscale up --reset --force-reauth --login-server https://uplink.darkest.space --operator=$USER
+
+  services = {
+    headscale = {
+      enable = true;
+      address = "localhost";
+      port = headscale-port;
+      settings = {
+        server_url = "https://uplink.darkest.space/";
+        dns = {
+          override_local_dns = false;
+          base_domain = "high-gravity.space";
+        };
+        derp = {
+          server = {
+            enabled = true;
+            verify_clients = true;
+            stun_listen_addr = "0.0.0.0:3478";
+            ipv4 = "78.46.242.90";
+            ipv6 = "2a01:4f8:c013:65dd::1";
+          };
+          urls = [ ];
+        };
+      };
+    };
+
+    nginx.virtualHosts."uplink.darkest.space" = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/" = {
+        proxyPass = "http://localhost:${builtins.toString headscale-port}";
+        proxyWebsockets = true;
+      };
+    };
+  };
+
+  # for DERP
+  networking.firewall.allowedUDPPorts = [ 3478 ];
+}

nixosConfigurations/hetzner-vpn2/nginx.nix

@@ -1,62 +1,19 @@
-{ pkgs, ... }:
-let
-  blog-domain-socket = "/run/nginx/blog.sock";
-  anubis-domain-socket = "/run/anubis/anubis-main/anubis.sock";
-  anubis-metrics-socket = "/run/anubis/anubis-main/anubis-metrics.sock";
-in
 {
   security.acme = {
     acceptTerms = true;
     defaults.email = "acme@zerforschen.plus";
   };
 
-  systemd.services = {
+  services.nginx = {
-    nginx.serviceConfig.SupplementaryGroups = [ "anubis" ];
-    anubis-main.serviceConfig.SupplementaryGroups = [ "nginx" ];
-  };
-
-  services = {
-    nginx = {
     enable = true;
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
-
-      virtualHosts = {
-        "zerforschen.plus" = {
-          addSSL = true;
-          enableACME = true;
-          locations = {
-            "/_metrics".proxyPass = "http://unix:" + anubis-metrics-socket + ":/metrics";
-            "/".proxyPass = "http://unix:" + anubis-domain-socket;
-          };
-        };
-
-        "blog-in-anubis" = {
-          root = pkgs.zerforschen-plus-content;
-          listen = [
-            {
-              addr = "unix:" + blog-domain-socket;
-            }
-          ];
-        };
-      };
-    };
-
-    anubis.instances.main = {
-      enable = true;
-      settings = {
-        BIND = anubis-domain-socket;
-        TARGET = "unix://" + blog-domain-socket;
-        METRICS_BIND = anubis-metrics-socket;
-      };
-    };
   };
 
   networking.firewall.allowedTCPPorts = [
     80
     443
-    5201
   ];
 }

nixosModules/global-settings-desktop.nix

@@ -11,30 +11,6 @@
 }:
 {
   imports = [
-    {
-      home-manager = {
-        extraSpecialArgs = specialArgs;
-        useGlobalPkgs = true;
-        useUserPackages = true;
-      };
-
-      time.timeZone = "Europe/Berlin";
-
-      home-manager.sharedModules = [
-        { home.stateVersion = "22.11"; }
-        # keep-sorted start
-        self.homeModules.git
-        self.homeModules.gnome-extensions
-        self.homeModules.nano
-        self.homeModules.templates
-        self.homeModules.zsh-basics
-        self.homeModules.zsh-powerlevel10k
-        # keep-sorted end
-      ];
-
-      home-manager.users = home-manager-users;
-    }
-
     # keep-sorted start
     home-manager.nixosModules.home-manager
     self.nixosModules.en-de
@@ -54,4 +30,27 @@
     stylix.nixosModules.stylix
     # keep-sorted end
   ];
+
+  config = {
+    home-manager = {
+      extraSpecialArgs = specialArgs;
+      useGlobalPkgs = true;
+      useUserPackages = true;
+    };
+
+    time.timeZone = "Europe/Berlin";
+
+    home-manager.sharedModules = [
+      { home.stateVersion = "22.11"; }
+      # keep-sorted start
+      self.homeModules.git
+      self.homeModules.gnome-extensions
+      self.homeModules.nano
+      self.homeModules.templates
+      self.homeModules.zsh-basics
+      # keep-sorted end
+    ];
+
+    home-manager.users = home-manager-users;
+  };
 }