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,9 +21,11 @@
     };
   };
   config = {
-    services = {
+    services =
+      if config.server.cloud.nextcloud.enable then
+        {
           nextcloud = {
-        enable = config.server.cloud.nextcloud.enable;
+            enable = true;
             configureRedis = true;
             package = pkgs.nextcloud33;
             hostName = "nextcloud-net";
@@ -32,7 +34,7 @@
               dbuser = "nextcloud";
               dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
               dbname = "nextcloud";
-          adminpassFile = "/home/${config.user.userName}/secrets/nextcloud";
+              adminpassFile = "/home/marty/secrets/nextcloud";
               adminuser = "admin";
             };
             settings = {
@@ -53,9 +55,7 @@
               loglevel = 0;
             };
           };
-      postgresql =
-        if config.server.cloud.nextcloud.enable then
-          {
+          postgresql = {
             enable = true;
             ensureDatabases = [ "nextcloud" ];
             ensureUsers = [
@@ -64,9 +64,7 @@
                 ensureDBOwnership = true;
               }
             ];
-          }
-        else
-          { };
+          };
           nginx = {
             virtualHosts = {
               "nextcloud-net".listen = [
@@ -88,10 +86,18 @@
                   { };
             };
           };
-    };
-    systemd.services."nextcloud-setup" = {
+        }
+      else
+        { };
+    systemd =
+      if config.server.cloud.nextcloud.enable then
+        {
+          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;