hyprland stuff

hosts/nas/apps.nix

@@ -46,7 +46,7 @@
       enable = true;
       httpPort = "9981";
       httpsPort = "9943";
-      redisSock = "/var/run/redis-nextcloud/redis.sock";
+      redisSock = "/run/redis-nextcloud/redis.sock";
     };
 
     ollama.enable = true;

hosts/nas/configuration.nix

@@ -194,6 +194,7 @@ in
         "jallen-nas"
         "docker"
         "podman"
+        config.services.redis.servers.nextcloud.user
       ]; # Enable ‘sudo’ for the user.
       hashedPasswordFile = passwordFile;
     };
@@ -207,6 +208,15 @@ in
       home = "/var/lib/nut";
       hashedPasswordFile = passwordFile;
     };
+
+    users.nextcloud = {
+      isNormalUser = true;
+      extraGroups = [
+        "jallen-nas"
+        "nix-apps"
+      ];
+      hashedPasswordFile = passwordFile;
+    };
   };
 
   # Virtualisation

hosts/nas/networking.nix

@@ -31,14 +31,33 @@ in
     networkmanager.enable = false;
 
     interfaces = {
-      wlp6s0.ipv4.addresses = [
-        {
-          address = ipAddress;
-          prefixLength = 24;
-        }
-      ];
+      wlp6s0 = {
+        useDHCP = false;
+        ipv4.addresses = [
+          {
+            address = ipAddress;
+            prefixLength = 24;
+          }
+        ];
+      };
+
+      # br0 = {
+      #   useDHCP = false;
+      #   ipv4.addresses = [
+      #     {
+      #       address = ipAddress;
+      #       prefixLength = 24;
+      #     }
+      #   ];
+      # };
     };
 
+    # bridges = {
+    #   br0 = {
+    #     interfaces = [ "wlp6s0" ];
+    #   };
+    # };
+
     defaultGateway.address = gateway;
     nameservers = [ gateway ];
 
@@ -62,5 +81,13 @@ in
       # always allow traffic from your Tailscale network
       trustedInterfaces = [ "tailscale0" ];
     };
+
+    # nat = {
+    #   enable = true;
+    #   internalInterfaces = ["ve-+"];
+    #   externalInterface = "wlp9s0";
+    #   # Lazy IPv6 connectivity for the container
+    #   enableIPv6 = true;
+    # };
   };
 }

hosts/nas/services.nix

@@ -184,6 +184,7 @@ in
         nextcloud = {
           enable = true;
           port = 6380;
+          # user = "911";#"${config.users.users.nix-apps.name}:${config.users.groups.jallen-nas.name}";
         };
       };
     };

hosts/nas/sops.nix

@@ -1,5 +1,5 @@
 {
-  ...
+  config, ...
 }:
 {
   sops.defaultSopsFile = ../../secrets/secrets.yaml;
@@ -22,12 +22,42 @@
   };
 
   sops.secrets."jallen-nas/nextcloud/dbpassword" = {
-    # restartUnits = [ "podman-nextcloud.service" ];
+    restartUnits = [ "container@nextcloud.service" ];
   };
   sops.secrets."jallen-nas/nextcloud/adminpassword" = {
-    # restartUnits = [ "podman-nextcloud.service" ];
+    restartUnits = [ "container@nextcloud.service" ];
   };
   sops.secrets."jallen-nas/nextcloud/smtppassword" = {
-    # restartUnits = [ "nextcloud.service" ];
+    restartUnits = [ "container@nextcloud.service" ];
   };
+
+  sops.templates."nextcloud-smtp".content = ''
+    "${config.sops.placeholder."jallen-nas/nextcloud/smtppassword"}"
+  '';
+
+  # Permission modes are in octal representation (same as chmod),
+  # the digits represent: user|group|others
+  # 7 - full (rwx)
+  # 6 - read and write (rw-)
+  # 5 - read and execute (r-x)
+  # 4 - read only (r--)
+  # 3 - write and execute (-wx)
+  # 2 - write only (-w-)
+  # 1 - execute only (--x)
+  # 0 - none (---)
+  sops.secrets."jallen-nas/nextcloud/dbpassword".mode = "0777";
+  # Either a user id or group name representation of the secret owner
+  # It is recommended to get the user name from `config.users.users.<?name>.name` to avoid misconfiguration
+  # sops.secrets."jallen-nas/nextcloud/dbpassword".owner = config.users.users.nix-apps.name;
+  # # Either the group id or group name representation of the secret group
+  # # It is recommended to get the group name from `config.users.users.<?name>.group` to avoid misconfiguration
+  # sops.secrets."jallen-nas/nextcloud/dbpassword".group = config.users.users.jallen-nas.group;
+
+  sops.secrets."jallen-nas/nextcloud/adminpassword".mode = "0777";
+  # sops.secrets."jallen-nas/nextcloud/adminpassword".owner = config.users.users.nix-apps.name;
+  # sops.secrets."jallen-nas/nextcloud/adminpassword".group = config.users.users.jallen-nas.group;
+
+  sops.secrets."jallen-nas/nextcloud/smtppassword".mode = "0777";
+  # sops.secrets."jallen-nas/nextcloud/smtppassword".owner = config.users.users.nix-apps.name;
+  # sops.secrets."jallen-nas/nextcloud/smtppassword".group = config.users.users.jallen-nas.group;
 }