diff --git a/hosts/envy/disko/default.nix b/hosts/envy/disko/default.nix
index 22e38bc..cd0a3a8 100644
--- a/hosts/envy/disko/default.nix
+++ b/hosts/envy/disko/default.nix
@@ -1,4 +1,4 @@
-{ disko, config, ... }:
+{ config, disko, ... }:
 {
   imports = [ disko.nixosModules.disko ];
 
diff --git a/hosts/kitty/firewall/default.nix b/hosts/kitty/firewall/default.nix
index d63aea0..8265bff 100644
--- a/hosts/kitty/firewall/default.nix
+++ b/hosts/kitty/firewall/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   networking = {
     firewall.extraInputRules = ''
diff --git a/hosts/lacros/disko/default.nix b/hosts/lacros/disko/default.nix
index 22e38bc..cd0a3a8 100644
--- a/hosts/lacros/disko/default.nix
+++ b/hosts/lacros/disko/default.nix
@@ -1,4 +1,4 @@
-{ disko, config, ... }:
+{ config, disko, ... }:
 {
   imports = [ disko.nixosModules.disko ];
 
diff --git a/hosts/midas/disko/default.nix b/hosts/midas/disko/default.nix
index 9fae370..e3aa303 100644
--- a/hosts/midas/disko/default.nix
+++ b/hosts/midas/disko/default.nix
@@ -1,4 +1,4 @@
-{ disko, config, ... }:
+{ config, disko, ... }:
 {
   imports = [ disko.nixosModules.disko ];
 
diff --git a/hosts/redmond/disko/default.nix b/hosts/redmond/disko/default.nix
index 3c18c2f..b96ab51 100644
--- a/hosts/redmond/disko/default.nix
+++ b/hosts/redmond/disko/default.nix
@@ -1,4 +1,4 @@
-{ disko, config, ... }:
+{ config, disko, ... }:
 {
   imports = [ disko.nixosModules.disko ];
 
@@ -11,20 +11,21 @@
           type = "gpt";
           partitions = {
             ESP = {
+              priority = 1;
               size = "2G";
               type = "EF00";
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/boot";
-                mountOptions = [ "fmask=0022" "dmask=0022" ];
+                mountOptions = [ "umask=0077" ];
               };
             };
             luks = {
               size = "100%";
               content = {
                 type = "luks";
-                name = "crypt-nvme";
+                name = "${config.networking.hostName}-disk";
                 settings.allowDiscards = true;
                 passwordFile = "/tmp/secret.key";
                 content = {
diff --git a/hosts/tower/boot/default.nix b/hosts/tower/boot/default.nix
index 4d2ec98..46bf7b6 100644
--- a/hosts/tower/boot/default.nix
+++ b/hosts/tower/boot/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 let
   commonKernelParams = [
     # VM/GPU passthrough
diff --git a/hosts/tower/disko/default.nix b/hosts/tower/disko/default.nix
index 9fae370..e3aa303 100644
--- a/hosts/tower/disko/default.nix
+++ b/hosts/tower/disko/default.nix
@@ -1,4 +1,4 @@
-{ disko, config, ... }:
+{ config, disko, ... }:
 {
   imports = [ disko.nixosModules.disko ];
 
diff --git a/modules/extras/variables/displays/default.nix b/modules/extras/variables/displays/default.nix
index fc6ede3..f964365 100644
--- a/modules/extras/variables/displays/default.nix
+++ b/modules/extras/variables/displays/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   options.displays = lib.mkOption {
     type = lib.types.attrs;
diff --git a/modules/extras/variables/domains/default.nix b/modules/extras/variables/domains/default.nix
index 86e7987..e1c2ffa 100644
--- a/modules/extras/variables/domains/default.nix
+++ b/modules/extras/variables/domains/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   options.domains = lib.mkOption {
     type = lib.types.attrs;
diff --git a/modules/extras/variables/ips/default.nix b/modules/extras/variables/ips/default.nix
index 4b6f5b9..93736f3 100644
--- a/modules/extras/variables/ips/default.nix
+++ b/modules/extras/variables/ips/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   options.ips = lib.mkOption {
     type = lib.types.attrs;
diff --git a/modules/extras/variables/look/border/default.nix b/modules/extras/variables/look/border/default.nix
index 6f707c0..6c88b06 100644
--- a/modules/extras/variables/look/border/default.nix
+++ b/modules/extras/variables/look/border/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   options.look.border = lib.mkOption {
     type = lib.types.attrs;
diff --git a/modules/extras/variables/look/colors/default.nix b/modules/extras/variables/look/colors/default.nix
index d8247e0..db0b1e7 100644
--- a/modules/extras/variables/look/colors/default.nix
+++ b/modules/extras/variables/look/colors/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   options.look.colors = lib.mkOption {
     type = lib.types.attrs;
diff --git a/modules/extras/variables/look/fonts/default.nix b/modules/extras/variables/look/fonts/default.nix
index c116762..ed73dd0 100644
--- a/modules/extras/variables/look/fonts/default.nix
+++ b/modules/extras/variables/look/fonts/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   options.look.fonts = lib.mkOption {
     type = lib.types.attrs;
diff --git a/modules/extras/variables/users/default.nix b/modules/extras/variables/users/default.nix
index 7956836..41e8ee2 100644
--- a/modules/extras/variables/users/default.nix
+++ b/modules/extras/variables/users/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   options.sysusers = lib.mkOption {
     type = lib.types.attrs;
diff --git a/modules/extras/variables/workspaces/default.nix b/modules/extras/variables/workspaces/default.nix
index 8e8fd12..b38cc16 100644
--- a/modules/extras/variables/workspaces/default.nix
+++ b/modules/extras/variables/workspaces/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   options.ws = lib.mkOption {
     type = lib.types.attrs;
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 43a58da..49ce879 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,4 +1,4 @@
-{ nur, lib, ... }:
+{ lib, nur, ... }:
 {
   imports = [
     ./files
diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix
index 89d07dd..556123a 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, nur, ... }:
+{ config, lib, pkgs, nur, ... }:
 {
   config = lib.mkIf config.home.desktop.enable {
     programs.firefox = {
diff --git a/modules/home/programs/gui/mangohud/default.nix b/modules/home/programs/gui/mangohud/default.nix
index 9f6560c..d61ccd6 100644
--- a/modules/home/programs/gui/mangohud/default.nix
+++ b/modules/home/programs/gui/mangohud/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 {
   config = lib.mkIf config.home.gaming.enable {
     programs.mangohud.enable = true;
diff --git a/modules/home/programs/gui/mpv/default.nix b/modules/home/programs/gui/mpv/default.nix
index 183709e..a049eb1 100644
--- a/modules/home/programs/gui/mpv/default.nix
+++ b/modules/home/programs/gui/mpv/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 {
   programs.mpv = {
     enable = config.home.desktop.enable;
diff --git a/modules/home/programs/gui/pcmanfm/default.nix b/modules/home/programs/gui/pcmanfm/default.nix
index 6463a7c..d2f621b 100644
--- a/modules/home/programs/gui/pcmanfm/default.nix
+++ b/modules/home/programs/gui/pcmanfm/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
   config = lib.mkIf config.home.desktop.enable {
     home.packages = with pkgs; [
diff --git a/modules/home/programs/gui/rofi/default.nix b/modules/home/programs/gui/rofi/default.nix
index e326692..a32f707 100644
--- a/modules/home/programs/gui/rofi/default.nix
+++ b/modules/home/programs/gui/rofi/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
   imports = [ ./scripts ];
 
diff --git a/modules/home/programs/gui/rofi/scripts/default.nix b/modules/home/programs/gui/rofi/scripts/default.nix
index 60f3a03..7934cd0 100644
--- a/modules/home/programs/gui/rofi/scripts/default.nix
+++ b/modules/home/programs/gui/rofi/scripts/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ config, lib, pkgs, ... }:
 {
   home.packages = with pkgs; lib.mkIf config.programs.rofi.enable [
     (pkgs.writeScriptBin "rofiscratch" ''
diff --git a/modules/home/settings/gtk/bookmarks/default.nix b/modules/home/settings/gtk/bookmarks/default.nix
index 368f329..31b6a27 100644
--- a/modules/home/settings/gtk/bookmarks/default.nix
+++ b/modules/home/settings/gtk/bookmarks/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, ... }:
 {
   gtk.gtk3.bookmarks = [
     "file:///home/${config.home.username}/Keepers"
diff --git a/modules/home/wms/niri/hotkeys/default.nix b/modules/home/wms/niri/hotkeys/default.nix
index 0285c44..0929945 100644
--- a/modules/home/wms/niri/hotkeys/default.nix
+++ b/modules/home/wms/niri/hotkeys/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 {
   config.home.niri.settings.hotkeys = let
     primeMod = "Mod";
diff --git a/modules/home/wms/niri/rules/default.nix b/modules/home/wms/niri/rules/default.nix
index be30e59..0ba0237 100644
--- a/modules/home/wms/niri/rules/default.nix
+++ b/modules/home/wms/niri/rules/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 {
   config.home.niri.settings.rules = pkgs.writeText "rules" ''
     // Browsers
diff --git a/modules/home/wms/niri/theme/default.nix b/modules/home/wms/niri/theme/default.nix
index 2ee2707..3f9350b 100644
--- a/modules/home/wms/niri/theme/default.nix
+++ b/modules/home/wms/niri/theme/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 {
   config.home.niri.settings.theme = pkgs.writeText "theme" ''
     prefer-no-csd
diff --git a/modules/home/wms/programs/swaylock/default.nix b/modules/home/wms/programs/swaylock/default.nix
index 59e1083..52c358c 100644
--- a/modules/home/wms/programs/swaylock/default.nix
+++ b/modules/home/wms/programs/swaylock/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: 
+{ config, pkgs, ... }: 
 let
   default = "#${config.look.colors.prime}FF";
   wrong = "#${config.look.colors.split}FF";
diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix
index 4697927..81e8c77 100644
--- a/modules/home/wms/programs/waybar/default.nix
+++ b/modules/home/wms/programs/waybar/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 {
   programs.waybar = let
     swayWorkspaceModule = {
diff --git a/modules/home/wms/sway/hotkeys/default.nix b/modules/home/wms/sway/hotkeys/default.nix
index 230206b..bcdb680 100644
--- a/modules/home/wms/sway/hotkeys/default.nix
+++ b/modules/home/wms/sway/hotkeys/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 {
   wayland.windowManager.sway.config = let
     # Set default modifier and variables
diff --git a/modules/system/accounts/users/custom/main/default.nix b/modules/system/accounts/users/custom/main/default.nix
index b49e6d8..c2ab7ee 100644
--- a/modules/system/accounts/users/custom/main/default.nix
+++ b/modules/system/accounts/users/custom/main/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 {
   users.users."${config.sysusers.main}" = {
     hashedPassword = config.secrets.mainAccPass;
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 381c04f..e27a548 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -10,7 +10,7 @@
     ../extras
   ];
 
-  options.system = {
+  options.system = with lib; {
     desktop.enable = lib.mkEnableOption "Enable desktop apps and services";
     server.enable = lib.mkEnableOption "Enable server apps and services";
   };
diff --git a/modules/system/devices/bluetooth/default.nix b/modules/system/devices/bluetooth/default.nix
index 766aec7..ad3284d 100644
--- a/modules/system/devices/bluetooth/default.nix
+++ b/modules/system/devices/bluetooth/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   config = lib.mkIf config.system.desktop.enable {
     hardware.bluetooth = {
diff --git a/modules/system/devices/boot/lanzaboote/default.nix b/modules/system/devices/boot/lanzaboote/default.nix
index c294482..81d5ea7 100644
--- a/modules/system/devices/boot/lanzaboote/default.nix
+++ b/modules/system/devices/boot/lanzaboote/default.nix
@@ -1,13 +1,8 @@
-{ lanzaboote, lib, config, pkgs, ... }:
+{ config, lib, pkgs, lanzaboote, ... }:
 {
   imports = [ lanzaboote.nixosModules.lanzaboote ];
 
-  options.system.lanzaboote = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-    };
-  };
+  options.system.lanzaboote.enable = lib.mkEnableOption "Enable lanzaboote";
 
   config = lib.mkIf config.system.lanzaboote.enable {
     boot = {
diff --git a/modules/system/services/server/fileserver/jellyfin/nginx/default.nix b/modules/system/services/server/fileserver/jellyfin/nginx/default.nix
index 53485ed..f79eeb1 100644
--- a/modules/system/services/server/fileserver/jellyfin/nginx/default.nix
+++ b/modules/system/services/server/fileserver/jellyfin/nginx/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   services.nginx.virtualHosts."jelly.${config.domains.p2}" = lib.mkIf config.services.forgejo.enable {
     enableACME = true;
diff --git a/modules/system/services/server/fileserver/nextcloud/nginx/default.nix b/modules/system/services/server/fileserver/nextcloud/nginx/default.nix
index 61df13e..f638cdd 100644
--- a/modules/system/services/server/fileserver/nextcloud/nginx/default.nix
+++ b/modules/system/services/server/fileserver/nextcloud/nginx/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   services.nginx.virtualHosts."cloud.${config.domains.p2}" = lib.mkIf config.services.nextcloud.enable {
     enableACME = true;
diff --git a/modules/system/services/server/forgejo/nginx/default.nix b/modules/system/services/server/forgejo/nginx/default.nix
index 6deefbf..e183246 100644
--- a/modules/system/services/server/forgejo/nginx/default.nix
+++ b/modules/system/services/server/forgejo/nginx/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   services.nginx.virtualHosts."git.${config.domains.p2}" = lib.mkIf config.services.forgejo.enable {
     enableACME = true;
diff --git a/modules/system/services/server/icecast/default.nix b/modules/system/services/server/icecast/default.nix
index 018a169..171b5b6 100644
--- a/modules/system/services/server/icecast/default.nix
+++ b/modules/system/services/server/icecast/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, ... }:
 {
   imports = [
     ./nginx
diff --git a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix
index e9a64dd..6cf2655 100644
--- a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix
+++ b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ config, lib, pkgs, ... }:
 {
   config = lib.mkIf config.services.icecast.enable {
     services.liquidsoap.streams = {
diff --git a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix
index 1d901cb..652c81b 100644
--- a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix
+++ b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ config, lib, pkgs, ... }:
 {
   config = lib.mkIf config.services.icecast.enable {
     services.liquidsoap.streams = {
diff --git a/modules/system/services/server/icecast/nginx/default.nix b/modules/system/services/server/icecast/nginx/default.nix
index 3219688..e78186b 100644
--- a/modules/system/services/server/icecast/nginx/default.nix
+++ b/modules/system/services/server/icecast/nginx/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
   services.nginx.virtualHosts."radio.${config.domains.p2}" = lib.mkIf config.services.icecast.enable {
     enableACME = true;
diff --git a/modules/system/services/server/mailserver/roundcube/default.nix b/modules/system/services/server/mailserver/roundcube/default.nix
index 3dfd83f..2a44390 100644
--- a/modules/system/services/server/mailserver/roundcube/default.nix
+++ b/modules/system/services/server/mailserver/roundcube/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: 
+{ config, ... }: 
 {
   services.roundcube = {
    enable = config.system.mailserver.enable;
diff --git a/modules/system/services/server/mailserver/simplenix/nginx/default.nix b/modules/system/services/server/mailserver/simplenix/nginx/default.nix
index 4009f1e..631b65b 100644
--- a/modules/system/services/server/mailserver/simplenix/nginx/default.nix
+++ b/modules/system/services/server/mailserver/simplenix/nginx/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }: 
+{ config, lib, ... }: 
 {
   services.nginx.virtualHosts."mx.${config.domains.p2}" = lib.mkIf config.mailserver.enable {
     enableACME = true;
diff --git a/modules/system/services/server/socialserver/matrix/element/nginx/default.nix b/modules/system/services/server/socialserver/matrix/element/nginx/default.nix
index 82488c2..24ffa33 100644
--- a/modules/system/services/server/socialserver/matrix/element/nginx/default.nix
+++ b/modules/system/services/server/socialserver/matrix/element/nginx/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
   services.nginx.virtualHosts."chat.${config.domains.p2}" = lib.mkIf config.services.matrix-synapse.enable {
     enableACME = true;
diff --git a/modules/system/services/server/webserver/nginx/default.nix b/modules/system/services/server/webserver/nginx/default.nix
index 767b576..516a8fe 100644
--- a/modules/system/services/server/webserver/nginx/default.nix
+++ b/modules/system/services/server/webserver/nginx/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, ... }:
 {
   imports = [
     ./rtmp
@@ -14,9 +14,7 @@
       recommendedProxySettings = true;
     };
 
-    environment.persistence."/persist".directories = [
-      "/var/www"
-    ];
+    environment.persistence."/persist".directories = [ "/var/www" ];
 
     networking.firewall.allowedTCPPorts = [
       80
diff --git a/modules/system/services/server/webserver/nginx/rtmp/default.nix b/modules/system/services/server/webserver/nginx/rtmp/default.nix
index 5f30a19..3826d9d 100644
--- a/modules/system/services/server/webserver/nginx/rtmp/default.nix
+++ b/modules/system/services/server/webserver/nginx/rtmp/default.nix
@@ -1,11 +1,6 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
-  options.services.nginx.rtmp = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-    };
-  };
+  options.services.nginx.rtmp.enable = lib.mkEnableOption "Enable an RTMP server using Nginx";
 
   config = lib.mkIf config.services.nginx.rtmp.enable {
     services.nginx = {
@@ -32,9 +27,6 @@
         }
       '';
     };
-
-    systemd.services.nginx.serviceConfig = {
-      ReadWritePaths = [ "/var/www/landing-page/streams/hls/" ];
-    };
+    systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www/landing-page/streams/hls/" ];
   };
 }