fixes for pc2, misc changes

flake.nix

@@ -16,13 +16,13 @@
     home-manager,
     lix-module,
     ...
-  }: let
+  }: {
-    common-modules = [
+    nixosConfigurations = let
-      lix-module.nixosModules.default
+      common-modules = [
-      ./common
+        lix-module.nixosModules.default
-    ];
+        ./common
-  in {
+      ];
-    nixosConfigurations = {
+    in {
       vinzenz-lpt2 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules =

home/vinzenz/default.nix

@@ -4,9 +4,7 @@ inputs @ {
   pkgs,
   lib,
   ...
-}: let
+}: {
-  isGnomeEnabled = osConfig.my.desktop.enableGnome;
-in {
   programs = {
     home-manager.enable = true;
     fzf.enable = true;

hosts/hetzner-vpn1/environment.nix

@@ -2,27 +2,7 @@
   pkgs,
   lib,
   ...
-}: let
+}: {
-  servicesDomain = "services.zerforschen.plus";
-  mkServiceConfig = host: port: {
-    addSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://${host}:${toString port}/";
-      extraConfig = ''
-        # bind to tailscale ip
-        proxy_bind 100.88.118.60;
-        # pam auth
-        limit_except OPTIONS {
-          auth_pam  "Password Required";
-          auth_pam_service_name "nginx";
-        }
-      '';
-    };
-  };
-  lpt2 = "vinzenz-lpt2.donkey-pentatonic.ts.net";
-  pc2 = "vinzenz-pc2.donkey-pentatonic.ts.net";
-in {
   imports = [
     ../../users/vinzenz.nix
     ../../users/ronja.nix
@@ -66,7 +46,27 @@ in {
       recommendedGzipSettings = true;
       recommendedOptimisation = true;
 
-      virtualHosts = {
+      virtualHosts = let
+        servicesDomain = "services.zerforschen.plus";
+        mkServiceConfig = host: port: {
+          addSSL = true;
+          enableACME = true;
+          locations."/" = {
+            proxyPass = "http://${host}:${toString port}/";
+            extraConfig = ''
+              # bind to tailscale ip
+              proxy_bind 100.88.118.60;
+              # pam auth
+              limit_except OPTIONS {
+                auth_pam  "Password Required";
+                auth_pam_service_name "nginx";
+              }
+            '';
+          };
+        };
+        lpt2 = "vinzenz-lpt2.donkey-pentatonic.ts.net";
+        pc2 = "vinzenz-pc2.donkey-pentatonic.ts.net";
+      in {
         "vscode.${servicesDomain}" = lib.mkMerge [
           (mkServiceConfig pc2 8542)
           {locations."/" .proxyWebsockets = true;}

hosts/vinzenz-pc2/environment.nix

@@ -3,6 +3,7 @@
     ../../home
     ../../home/gnome.nix
     ../../users/vinzenz.nix
+    ../../users/ronja.nix
     ../../modules/desktop-environment.nix
     ../../modules/gnome.nix
     ../../modules/gaming.nix
@@ -12,7 +13,7 @@
   config = {
     home-manager.users = {
       vinzenz = import ../../home/vinzenz;
-      ronja = import ../../home/ronja;
+      ronja = import ../../home/ronja.nix;
     };
 
     users.users.vinzenz.openssh.authorizedKeys.keys = [

users/vinzenz.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   config = {
     users.users.vinzenz = {
       isNormalUser = true;