hosts/marty-pc/home.nix

@@ -16,28 +16,5 @@
   imports = [
     ./../../home
   ];
-
-  desktop.hyprland = {
-    numlock = true;
-    monitors = [
-      "desc:AOC Q27G2WG4 0x00005F45, 2560x1440@144, 3840x0, 1   # main monitor"
-      "desc:Samsung Electric Company S24D330 0x5A5A5131, 1920x1080@60, 3840x1440, 1 # side monitor"
-      "desc:Panasonic Industry Company Panasonic-TV, 3840x2160@30, 0x0, 1  # tv"
-      "desc:Valve Corporation Index HMD 0x3DEBE38D, preffered, auto, 1"
-    ];
-    workspaces.workspaces = [
-
-      "1, monitor:DP-1, persistent:true"
-      "2, monitor:DP-1, persistent:true"
-      "3, monitor:DP-1, persistent:true"
-      "4, monitor:DP-1, persistent:true"
-      "5, monitor:HDMI-A-1, persistent:true"
-      "6, monitor:HDMI-A-1, persistent:true"
-      "7, monitor:HDMI-A-1, persistent:true"
-      "8, monitor:HDMI-A-1, persistent:true"
-      "9, monitor:DP-3, persistent:true"
-      "special:magic"
-    ];
-  };
   programs.home-manager.enable = true;
 }

hosts/marty-pc/options.nix

@@ -125,7 +125,7 @@
           enable = true;
         };
         sway = {
-          enable = false;
+          enable = true;
         };
       };
       shell = {

hosts/marty-thinkpad/options.nix

@@ -125,7 +125,7 @@
           enable = true;
         };
         sway = {
-          enable = true;
+          enable = false;
         };
       };
       shell = {

modules/server/cloud/nextcloud.nix

@@ -21,41 +21,41 @@
     };
   };
   config = {
-    services =
+    services = {
-      if config.server.cloud.nextcloud.enable then
+      nextcloud = {
-        {
+        enable = config.server.cloud.nextcloud.enable;
-          nextcloud = {
+        configureRedis = true;
-            enable = true;
+        package = pkgs.nextcloud33;
-            configureRedis = true;
+        hostName = "nextcloud-net";
-            package = pkgs.nextcloud33;
+        config = {
-            hostName = "nextcloud-net";
+          dbtype = "pgsql";
-            config = {
+          dbuser = "nextcloud";
-              dbtype = "pgsql";
+          dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
-              dbuser = "nextcloud";
+          dbname = "nextcloud";
-              dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
+          adminpassFile = "/home/${config.user.userName}/secrets/nextcloud";
-              dbname = "nextcloud";
+          adminuser = "admin";
-              adminpassFile = "/home/marty/secrets/nextcloud";
+        };
-              adminuser = "admin";
+        settings = {
-            };
+          trusted_proxies = [
-            settings = {
+            "localhost"
-              trusted_proxies = [
+            "127.0.0.1"
-                "localhost"
+            "${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
-                "127.0.0.1"
+            config.networking.hostName
-                "${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
+          ];
-                config.networking.hostName
+          trusted_domains = [
-              ];
+            "${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
-              trusted_domains = [
+            config.networking.hostName
-                "${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}"
+          ];
-                config.networking.hostName
+          skeletondirectory = "";
-              ];
+          preview_ffmpeg_path = "${pkgs.ffmpeg}/bin/ffmpeg";
-              skeletondirectory = "";
+          log_type = "file";
-              preview_ffmpeg_path = "${pkgs.ffmpeg}/bin/ffmpeg";
+          logfile = "nextcloud.log";
-              log_type = "file";
+          loglevel = 0;
-              logfile = "nextcloud.log";
+        };
-              loglevel = 0;
+      };
-            };
+      postgresql =
-          };
+        if config.server.cloud.nextcloud.enable then
-          postgresql = {
+          {
             enable = true;
             ensureDatabases = [ "nextcloud" ];
             ensureUsers = [
@@ -64,40 +64,34 @@
                 ensureDBOwnership = true;
               }
             ];
-          };
+          }
-          nginx = {
+        else
-            virtualHosts = {
+          { };
-              "nextcloud-net".listen = [
+      nginx = {
-                {
+        virtualHosts = {
-                  addr = "0.0.0.0";
+          "nextcloud-net".listen = [
-                  port = config.server.cloud.nextcloud.port;
+            {
-                }
+              addr = "0.0.0.0";
-              ];
+              port = config.server.cloud.nextcloud.port;
-              "${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}" =
+            }
-                if config.server.cloud.nextcloud.public then
+          ];
-                  {
+          "${config.server.cloud.nextcloud.subdomain}.${config.networking.domain}" =
-                    enableACME = true;
+            if config.server.cloud.nextcloud.public then
-                    forceSSL = true;
+              {
-                    locations."/" = {
+                enableACME = true;
-                      proxyPass = "http://127.0.0.1:${toString config.server.cloud.nextcloud.port}";
+                forceSSL = true;
-                    };
+                locations."/" = {
-                  }
+                  proxyPass = "http://127.0.0.1:${toString config.server.cloud.nextcloud.port}";
-                else
+                };
-                  { };
+              }
-            };
+            else
-          };
+              { };
-        }
+        };
-      else
+      };
-        { };
+    };
-    systemd =
+    systemd.services."nextcloud-setup" = {
-      if config.server.cloud.nextcloud.enable then
+      requires = [ "postgresql.service" ];
-        {
+      after = [ "postgresql.service" ];
-          services."nextcloud-setup" = {
+    };
-            requires = [ "postgresql.service" ];
-            after = [ "postgresql.service" ];
-          };
-        }
-      else
-        { };
   };
 }

modules/server/misc/lauti.nix

@@ -4,9 +4,7 @@
   pkgs,
   ...
 }:
-let
+
-  domain = ${config.server.misc.lauti.subdomain}.${config.networking.domain};
-in
 {
   options = {
     server.misc.lauti = {
@@ -16,10 +14,6 @@ in
         description = "lauti port";
       };
       public = lib.mkEnableOption "make lauti public";
-      domain = lib.mkOption {
-        default = "";
-        description = "lauti domain";
-      };
       subdomain = lib.mkOption {
         default = "lauti";
         description = "lauti subdomain";
@@ -32,7 +26,7 @@ in
         enable = config.server.misc.lauti.enable;
         settings = {
           LAUTI_ADMIN_EMAIL = "lauti@${config.networking.domain}";
-          LAUTI_BASE_URL = "https://${domain}";
+          LAUTI_BASE_URL = "https://${config.server.misc.lauti.subdomain}.${config.networking.domain}";
           LAUTI_OSM_TILE_CACHE_DIR = "/var/lib/lauti/osm";
           LAUTI_OSM_TILE_SERVER = "https://tile.openstreetmap.org/{z}/{x}/{y}.png";
           LAUTI_TIMEZONE = "Europe/Berlin";
@@ -42,7 +36,7 @@ in
       };
       nginx = {
         virtualHosts = {
-          "${domain}" =
+          "${config.server.misc.lauti.subdomain}.${config.networking.domain}" =
             if config.server.misc.lauti.public then
               {
                 enableACME = true;

modules/system/networking.nix

@@ -7,7 +7,7 @@
 
 {
   options = {
-    system.hostname = lib.mkOption {
+    system.hostname = lib.mkOption { 
       default = "${config.user.userName}-device";
       description = "hostname";
     };