Nextcloud: added caddy to nextcloud group so that it can read socket.

flake.nix

@@ -7,7 +7,6 @@
       imports = [
         inputs.git-hooks-nix.flakeModule
         ./hosts
-        ./pkgs
       ];
 
       perSystem = {

home/programs/other.nix

@@ -2,17 +2,14 @@
   pkgs,
   lib,
   osConfig,
-  self,
   ...
 }: {
-  home.packages =
+  home.packages = lib.mkIf osConfig.niksos.desktop.apps [
-    lib.optionals osConfig.niksos.desktop.apps [
+    pkgs.spotify
-      pkgs.spotify
+    pkgs.signal-desktop
-      pkgs.signal-desktop
+    pkgs.bambu-studio
-      pkgs.bambu-studio
+    pkgs.gimp
-      pkgs.gimp
+    pkgs.inkscape
-      pkgs.inkscape
+    pkgs.thunderbird
-      pkgs.thunderbird
+  ];
-    ]
-    ++ lib.optional osConfig.niksos.hardware.portable.enable self.packages.${pkgs.system}.visicut;
 }

home/wayland/mako.nix

@@ -3,6 +3,6 @@
 in {
   services.mako = {
     inherit (osConfig.programs.hyprland) enable;
-    settings.default-timeout = 5000;
+    settings.defaultTimeout = 5000;
   };
 }

hosts/laptop/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./hardware-configuration.nix
     ./virt.nix
+    ./wluma.nix
   ];
 
   programs.appimage.enable = true;

hosts/laptop/wluma.nix

@@ -0,0 +1,31 @@
+{
+  hardware.sensor.iio.enable = true; # brightness sensor
+  home-manager.users.jsw.services.wluma = {
+    enable = true;
+    settings = {
+      als.iio = {
+        path = "/sys/bus/iio/devices";
+        thresholds = {
+          "0" = "night";
+          "10" = "dark";
+          "100" = "normal";
+          "20" = "dim";
+          "200" = "bright";
+          "500" = "outdoors";
+        };
+      };
+      output.backlight = [
+        {
+          capturer = "none";
+          name = "eDP-1";
+          path = "/sys/class/backlight/amdgpu_bl1";
+        }
+        {
+          capturer = "none";
+          name = "keyboard";
+          path = "/sys/bus/platform/devices/cros-keyboard-leds.5.auto/leds/chromeos::kbd_backlight";
+        }
+      ];
+    };
+  };
+}

pkgs/default.nix

@@ -1,8 +0,0 @@
-{
-  systems = ["x86_64-linux"];
-  perSystem = {pkgs, ...}: {
-    packages = {
-      visicut = pkgs.callPackage ./visicut {};
-    };
-  };
-}

pkgs/visicut/default.nix

@@ -1,43 +0,0 @@
-{
-  appimageTools,
-  fetchurl,
-  lib,
-}: let
-  pname = "VisiCut";
-  version = "2.1";
-
-  src = fetchurl {
-    url = "https://github.com/t-oster/VisiCut/releases/download/${version}/VisiCut-${version}+devel-x86_64.AppImage";
-    hash = "sha256-Mq6Rjozshwk8asY+5egScQ5TkoxzRnWlZ9p0WeEOoiE=";
-  };
-
-  appimageContents = appimageTools.extract {
-    inherit pname version src;
-    postExtract = ''
-      substituteInPlace $out/${desktopFile} --replace-fail 'Exec=visicut' 'Exec=${pname}'
-    '';
-  };
-
-  desktopFile = "VisiCut.desktop";
-  iconFile = "visicut.png";
-in
-  appimageTools.wrapType2 {
-    inherit pname version src;
-
-    extraInstallCommands = ''
-      install -m 444 -D ${appimageContents}/${desktopFile} $out/share/applications/${desktopFile}
-      install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/128x128/apps/${iconFile} \
-        $out/share/icons/hicolor/128x128/apps/${iconFile}
-    '';
-
-    meta = {
-      description = "A userfriendly tool to prepare, save and send Jobs to Lasercutters.";
-      homepage = "https://visicut.org/";
-      downloadPage = "https://github.com/t-oster/VisiCut/releases/";
-      license = lib.licenses.lgpl3;
-      sourceProvenance = with lib.sourceTypes; [binaryNativeCode];
-      # maintainers = with lib.maintainers; [onny];
-      mainProgram = "VisiCut";
-      platforms = ["x86_64-linux"];
-    };
-  }

system/server/nextcloud.nix

@@ -27,17 +27,9 @@ in {
 
         autoUpdateApps.enable = true;
         extraAppsEnable = true;
-        extraApps = {
+        extraApps = with config.services.nextcloud.package.packages.apps; {
           # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json
-          inherit
+          inherit calendar contacts mail notes tasks;
-            (config.services.nextcloud.package.packages.apps)
-            calendar
-            contacts
-            mail
-            notes
-            tasks
-            user_oidc
-            ;
         };
 
         settings = {
@@ -64,12 +56,6 @@ in {
       };
 
       nginx.enable = lib.mkForce false;
-      phpfpm.pools.nextcloud.settings = let
-        inherit (config.services.caddy) user group;
-      in {
-        "listen.owner" = user;
-        "listen.group" = group;
-      };
       caddy.virtualHosts."${host}".extraConfig = ''
         encode zstd gzip