Merge branch 'main' of https://git.marty.tf/marty/config.nix

hosts/marty-pc/home.nix

@@ -16,5 +16,28 @@
   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 = true;
+          enable = false;
         };
       };
       shell = {

hosts/marty-thinkpad/options.nix

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

modules/server/cloud/nextcloud.nix

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

modules/server/misc/lauti.nix

@@ -4,7 +4,9 @@
   pkgs,
   ...
 }:
-
+let
+  domain = ${config.server.misc.lauti.subdomain}.${config.networking.domain};
+in
 {
   options = {
     server.misc.lauti = {
@@ -14,6 +16,10 @@
         description = "lauti port";
       };
       public = lib.mkEnableOption "make lauti public";
+      domain = lib.mkOption {
+        default = "";
+        description = "lauti domain";
+      };
       subdomain = lib.mkOption {
         default = "lauti";
         description = "lauti subdomain";
@@ -26,7 +32,7 @@
         enable = config.server.misc.lauti.enable;
         settings = {
           LAUTI_ADMIN_EMAIL = "lauti@${config.networking.domain}";
-          LAUTI_BASE_URL = "https://${config.server.misc.lauti.subdomain}.${config.networking.domain}";
+          LAUTI_BASE_URL = "https://${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";
@@ -36,7 +42,7 @@
       };
       nginx = {
         virtualHosts = {
-          "${config.server.misc.lauti.subdomain}.${config.networking.domain}" =
+          "${domain}" =
             if config.server.misc.lauti.public then
               {
                 enableACME = true;