Cleanup

hosts/shared.nix

@@ -2,8 +2,8 @@
   config,
   inputs,
   self,
-  lib,
   pkgs,
+  lib,
   ...
 }:
 {

modules/home/programs/hyprlock.nix

@@ -1,8 +1,4 @@
-{
+{ config, lib, ... }@moduleArgs:
-  config,
-  lib,
-  ...
-}@moduleArgs:
 let
   cfg = config.custom.programs.hyprlock;
 in
@@ -17,9 +13,11 @@ in
   config = lib.mkIf cfg.enable {
     programs.hyprlock = {
       enable = true;
+
       settings = {
         general.immediate_render = true;
         auth."fingerprint:enabled" = cfg.fprintAuth;
+
         animations.enabled = false;
         input-field.monitor = "";
         background = {

modules/home/services/hypridle.nix

@@ -1,8 +1,4 @@
-{
+{ config, lib, ... }:
-  config,
-  lib,
-  ...
-}:
 {
   options.custom.services.hypridle.enable = lib.mkEnableOption "";
 

modules/system/de/hyprland.nix

@@ -1,8 +1,4 @@
-{
+{ config, lib, ... }:
-  config,
-  lib,
-  ...
-}:
 {
   options.custom.de.hyprland.enable = lib.mkEnableOption "";
 

modules/system/services/actualbudget/default.nix

@@ -1,8 +1,4 @@
-{
+{ config, lib, ... }:
-  config,
-  lib,
-  ...
-}:
 let
   cfg = config.custom.services.actualbudget;
 in
@@ -20,10 +16,12 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    users.groups.actual = { };
+    users = {
-    users.users.actual = {
+      groups.actual = { };
-      isSystemUser = true;
+      users.actual = {
-      group = "actual";
+        isSystemUser = true;
+        group = config.users.groups.actual.name;
+      };
     };
 
     services.actual = {

modules/system/services/hedgedoc/default.nix

@@ -42,8 +42,7 @@ in
 
       # environmentFile = config.sops.templates."hedgedoc/environment".path;
       settings = {
-        domain = cfg.domain;
+        inherit (cfg) domain port;
-        inherit (cfg) port;
         protocolUseSSL = true;
         allowAnonymous = false;
         allowEmailRegister = false;

modules/system/services/nextcloud/default.nix

@@ -46,7 +46,6 @@ in
         log_type = "file";
         default_phone_region = "DE";
         maintenance_window_start = "2"; # UTC
-        defaultapp = "side_menu";
       };
 
       configureRedis = true;

modules/system/services/ntfy.nix

@@ -1,8 +1,4 @@
-{
+{ config, lib, ... }:
-  config,
-  lib,
-  ...
-}:
 let
   cfg = config.custom.services.ntfy;
 in

modules/system/services/syncthing/default.nix

@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.custom.services.syncthing;
-  tsCfg = config.custom.services.tailscale;
+  tailscaleCfg = config.custom.services.tailscale;
 in
 {
   options.custom.services.syncthing = {
@@ -21,7 +21,7 @@ in
   config = lib.mkIf cfg.enable {
     assertions = [
       {
-        assertion = tsCfg.enable;
+        assertion = tailscaleCfg.enable;
         message = "syncthing requires tailscale";
       }
     ];
@@ -44,7 +44,7 @@ in
           |> lib.mapAttrs (
             name: value: {
               id = value.config.custom.services.syncthing.deviceId;
-              addresses = [ "tcp://${name}.${tsCfg.domain}:22000" ];
+              addresses = [ "tcp://${name}.${tailscaleCfg.domain}:22000" ];
             }
           );
 

modules/system/services/uptime-kuma/default.nix

@@ -1,8 +1,4 @@
-{
+{ config, lib, ... }:
-  config,
-  lib,
-  ...
-}:
 let
   cfg = config.custom.services.uptimeKuma;
 in

modules/system/users/seb.nix

@@ -1,7 +1,7 @@
 {
   config,
-  self,
   inputs,
+  self,
   pkgs,
   pkgs-unstable,
   lib,
@@ -18,7 +18,7 @@ in
     zsh.enable = lib.mkEnableOption "";
     homeManager = {
       enable = lib.mkEnableOption "";
-      configPath = lib.mkOption {
+      configPaths = lib.mkOption {
         type = lib.types.listOf lib.types.path;
         default = [
           "${self}/users/shared-home.nix"
@@ -53,7 +53,7 @@ in
             inherit inputs self pkgs-unstable;
           };
 
-          users.seb.imports = cfg.homeManager.configPath;
+          users.seb.imports = cfg.homeManager.configPaths;
         };
       })
     ]