wooooooot, we're compiling again

modules/home/application/bitwarden/default.nix

@@ -1,15 +1,19 @@
-{ inputs, config, lib, pkgs, namespace, ... }:
-let
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.application.bitwarden;
-in
-{
+in {
   options.sneeuwvlok.application.bitwarden = {
     enable = mkEnableOption "enable bitwarden";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ bitwarden-desktop ];
+    home.packages = with pkgs; [bitwarden-desktop];
   };
 }

modules/home/application/chrome/default.nix

@@ -3,7 +3,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/application/discord/default.nix

@@ -3,7 +3,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/application/ladybird/default.nix

@@ -1,15 +1,19 @@
-{ inputs, config, lib, pkgs, namespace, ... }:
-let
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.application.ladybird;
-in
-{
+in {
   options.sneeuwvlok.application.ladybird = {
     enable = mkEnableOption "enable ladybird";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ ladybird ];
+    home.packages = with pkgs; [ladybird];
   };
 }

modules/home/application/matrix/default.nix

@@ -1,16 +1,20 @@
-{ config, lib, pkgs, namespace, osConfig ? {}, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  osConfig ? {},
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.application.matrix;
-in
-{
+in {
   options.sneeuwvlok.application.matrix = {
     enable = mkEnableOption "enable Matrix client (Fractal)";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ fractal element-desktop ];
+    home.packages = with pkgs; [fractal element-desktop];
 
     programs.element-desktop = {
       enable = true;

modules/home/application/obs/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   osConfig ? {},
   ...
 }: let

modules/home/application/onlyoffice/default.nix

@@ -3,7 +3,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/application/signal/default.nix

@@ -1,15 +1,19 @@
-{ inputs, config, lib, pkgs, namespace, ... }:
-let
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.application.signal;
-in
-{
+in {
   options.sneeuwvlok.application.signal = {
     enable = mkEnableOption "enable signal";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ signal-desktop ];
+    home.packages = with pkgs; [signal-desktop];
   };
 }

modules/home/application/steam/default.nix

@@ -3,7 +3,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/application/studio/default.nix

@@ -1,18 +1,18 @@
-{ config, lib, pkgs, namespace, repoRoot, erosanixLib, ... }:
-let
+{
+  config,
+  lib,
+  self,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.application.studio;
-  studioPackage = pkgs.callPackage (repoRoot + "/packages/studio/package.nix") {
-    inherit erosanixLib;
-  };
-in
-{
+in {
   options.sneeuwvlok.application.studio = {
     enable = mkEnableOption "enable Bricklink Studio";
   };
 
   config = mkIf cfg.enable {
-    home.packages = [ studioPackage ];
+    home.packages = [self.packages.studio];
   };
 }

modules/home/application/teamspeak/default.nix

@@ -1,10 +1,14 @@
-{ inputs, config, lib, pkgs, namespace, ... }:
-let
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.application.teamspeak;
-in
-{
+in {
   options.sneeuwvlok.application.teamspeak = {
     enable = mkEnableOption "enable teamspeak";
   };

modules/home/application/thunderbird/default.nix

@@ -1,10 +1,14 @@
-{ inputs, config, lib, pkgs, namespace, ... }:
-let
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.application.thunderbird;
-in
-{
+in {
   options.sneeuwvlok.application.thunderbird = {
     enable = mkEnableOption "enable thunderbird";
   };
@@ -14,7 +18,7 @@ in
       enable = true;
       package = pkgs.thunderbird-latest;
 
-        profiles.chris = {
+      profiles.chris = {
         isDefault = true;
       };
     };
@@ -30,7 +34,7 @@ in
         };
         thunderbird = {
           enable = true;
-          profiles = [ "chris" ];
+          profiles = ["chris"];
         };
       };
 

modules/home/application/zen/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/default.nix

@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib) mkOption;

modules/home/desktop/plasma/default.nix

@@ -1,13 +1,15 @@
-{ config, lib, namespace, osConfig ? {}, ... }:
-let
+{
+  config,
+  lib,
+  osConfig ? {},
+  ...
+}: let
   inherit (lib) mkIf;
 
   cfg = config.sneeuwvlok.desktop.plasma;
-  osCfg = osConfig.sneeuwvlok.desktop.plasma or { enable = false; };
-in
-{
+  osCfg = osConfig.sneeuwvlok.desktop.plasma or {enable = false;};
+in {
   options.sneeuwvlok.desktop.plasma = {
-
   };
 
   config = mkIf osCfg.enable {

modules/home/development/dotnet/default.nix

@@ -1,15 +1,18 @@
-{ config, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkEnableOption mkIf;
 
   cfg = config.sneeuwvlok.development.dotnet;
-in
-{
+in {
   options.sneeuwvlok.development.dotnet = {
     enable = mkEnableOption "Enable dotnet development tools";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ dotnet-sdk_8 ];
+    home.packages = with pkgs; [dotnet-sdk_8];
   };
 }

modules/home/development/javascript/default.nix

@@ -1,15 +1,18 @@
-{ config, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkEnableOption mkIf;
 
   cfg = config.sneeuwvlok.development.javascript;
-in
-{
+in {
   options.sneeuwvlok.development.javascript = {
     enable = mkEnableOption "Enable javascript development tools";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ bun nodejs nodePackages_latest.typescript-language-server ];
+    home.packages = with pkgs; [bun nodejs nodePackages_latest.typescript-language-server];
   };
 }

modules/home/development/rust/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;

modules/home/editor/nano/default.nix

@@ -3,7 +3,6 @@
   options,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;

modules/home/editor/nvim/default.nix

@@ -3,7 +3,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/editor/zed/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, namespace, ... }: let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.editor.zed;
@@ -9,13 +14,16 @@ in {
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
-      zed-editor nixd nil alejandra
+      zed-editor
+      nixd
+      nil
+      alejandra
     ];
 
     programs.zed-editor = {
       enable = true;
 
-      extensions = [ "nix" "toml" "html" "just-ls" ];
+      extensions = ["nix" "toml" "html" "just-ls"];
 
       userSettings = {
         assistant.enabled = false;

modules/home/game/minecraft/default.nix

@@ -3,7 +3,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/shell/default.nix

@@ -1,10 +1,13 @@
-{ config, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkMerge mkEnableOption mkDefault;
 
   cfg = config.sneeuwvlok.shell;
-in
-{
+in {
   imports = [
     ./toolset
     ./zsh
@@ -30,8 +33,8 @@ in
       };
     })
 
-    ({
-      home.packages = with pkgs; [ any-nix-shell pwgen yt-dlp ripdrag fd (ripgrep.override {withPCRE2 = true;}) ];
+    {
+      home.packages = with pkgs; [any-nix-shell pwgen yt-dlp ripdrag fd (ripgrep.override {withPCRE2 = true;})];
 
       programs = {
         direnv = {
@@ -45,6 +48,6 @@ in
           config.whitelist.prefix = ["/home"];
         };
       };
-    })
+    }
   ];
 }

modules/home/shell/toolset/bat/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/shell/toolset/btop/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/shell/toolset/eza/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/shell/toolset/fzf/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/shell/toolset/git/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;

modules/home/shell/toolset/gnugpg/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/shell/toolset/just/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;

modules/home/shell/toolset/starship/default.nix

@@ -1,16 +1,19 @@
-{ config, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.shell.toolset.starship;
-in
-{
+in {
   options.sneeuwvlok.shell.toolset.starship = {
     enable = mkEnableOption "fancy pansy shell prompt";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ starship ];
+    home.packages = with pkgs; [starship];
 
     programs.starship = {
       enable = true;

modules/home/shell/toolset/tmux/default.nix

@@ -1,16 +1,19 @@
-{ config, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.shell.toolset.tmux;
-in
-{
-  options.sneeuwvlok.shell.toolset.tmux = { 
-    enable = mkEnableOption "terminal multiplexer"; 
+in {
+  options.sneeuwvlok.shell.toolset.tmux = {
+    enable = mkEnableOption "terminal multiplexer";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ tmux ];
+    home.packages = with pkgs; [tmux];
 
     programs.tmux = {
       enable = true;

modules/home/shell/toolset/yazi/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/shell/toolset/zellij/default.nix

@@ -1,16 +1,19 @@
-{ config, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.shell.toolset.zellij;
-in
-{
+in {
   options.sneeuwvlok.shell.toolset.zellij = {
     enable = mkEnableOption "terminal multiplexer";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ zellij ];
+    home.packages = with pkgs; [zellij];
 
     programs.zellij = {
       enable = true;

modules/home/shell/toolset/zoxide/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/shell/zsh/default.nix

@@ -1,10 +1,13 @@
-{ config, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.shell.zsh;
-in
-{
+in {
   options.sneeuwvlok.shell.zsh = {
     enable = mkEnableOption "enable ZSH";
   };

modules/home/terminal/alacritty/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/terminal/ghostty/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/home/themes/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   osConfig ? {},
   ...
 }: let

modules/nixos/application/steam.nix

@@ -12,7 +12,7 @@ in {
     enable = mkEnableOption "enable steam";
   };
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [steam];
+    # environment.systemPackages = with pkgs; [steam];
 
     programs = {
       steam = {

modules/nixos/boot/default.nix

@@ -1,7 +1,6 @@
 {
   inputs,
   lib,
-  namespace,
   config,
   pkgs,
   ...

modules/nixos/desktop/cosmic/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   inputs,
   ...
 }: let

modules/nixos/desktop/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkOption mkEnableOption mkMerge;

modules/nixos/desktop/gamescope/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkForce;

modules/nixos/desktop/gnome/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/desktop/plasma/default.nix

@@ -2,7 +2,6 @@
   pkgs,
   lib,
   config,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/editor/nano/default.nix

@@ -1,10 +1,14 @@
-{ config, options, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  options,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkEnableOption mkIf;
 
   cfg = config.sneeuwvlok.editor.nano;
-in
-{
+in {
   options.sneeuwvlok.editor.nano = {
     enable = mkEnableOption "nano";
   };

modules/nixos/editor/nvim/default.nix

@@ -1,14 +1,18 @@
-{ config, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.editor.nvim;
-in
-{
+in {
   options.sneeuwvlok.editor.nvim = {
     enable = mkEnableOption "enable nvim via nvf on system level";
   };
 
-  config = mkIf cfg.enable {
-  };
+  config =
+    mkIf cfg.enable {
+    };
 }

modules/nixos/hardware/audio/default.nix

@@ -1,10 +1,13 @@
-{ pkgs, lib, namespace, config, ... }:
-let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.hardware.has.audio;
-in
-{
+in {
   options.sneeuwvlok.hardware.has.audio = mkEnableOption "Enable bluetooth";
 
   config = mkIf cfg {

modules/nixos/hardware/bluetooth/default.nix

@@ -1,10 +1,12 @@
-{ lib, namespace, config, ... }:
-let
+{
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.hardware.has.bluetooth;
-in
-{
+in {
   options.sneeuwvlok.hardware.has.bluetooth = mkEnableOption "Enable bluetooth";
 
   config = mkIf cfg {
@@ -21,7 +23,7 @@ in
         "bluez5.enable-sbc-xq" = true;
         "bluez5.enable-msbc" = true;
         "bluez5.enable-hw-volume" = true;
-        "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ];
+        "bluez5.roles" = ["hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag"];
       };
     };
   };

modules/nixos/hardware/gpu/amd/default.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   lib,
-  namespace,
   config,
   ...
 }: let

modules/nixos/hardware/gpu/nvidia.nix

@@ -1,14 +1,17 @@
-{ pkgs, lib, namespace, config, ... }:
-let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.hardware.has.gpu.nvidia;
-in
-{
+in {
   options.sneeuwvlok.hardware.has.gpu.nvidia = mkEnableOption "Enable NVidia gpu configuration";
 
   config = mkIf cfg {
-    services.xserver.videoDrivers = [ "nvidia" ];
+    services.xserver.videoDrivers = ["nvidia"];
 
     hardware = {
       graphics = {

modules/nixos/hardware/gpu/nvidia/default.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   lib,
-  namespace,
   config,
   ...
 }: let

modules/nixos/hardware/keyboard/voyager.nix

@@ -2,7 +2,6 @@
   lib,
   config,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/nix/default.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   lib,
-  namespace,
   config,
   ...
 }: let

modules/nixos/services/authentication/authelia/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/services/authentication/himmelblau/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  namespace,
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;

modules/nixos/services/authentication/zitadel/default.nix

@@ -1,7 +1,7 @@
-{ config, lib, pkgs, namespace, terranixLib, sneeuwvlokLib, ... }:
+{ config, lib, pkgs, self, ... }:
 let
   inherit (lib) mkIf mkEnableOption mkOption types toUpper toSentenceCase nameValuePair mapAttrs mapAttrs' concatMapAttrs concatMapStringsSep filterAttrsRecursive listToAttrs imap0 head drop length literalExpression attrNames;
-  inherit (sneeuwvlokLib.strings) toSnakeCase;
+  inherit ((import ../../../../../lib/strings { inherit lib;}).strings) toSnakeCase;
 
   cfg = config.sneeuwvlok.services.authentication.zitadel;
 
@@ -339,7 +339,7 @@ in
     config' = config;
 
     # this is a nix package, the generated json file to be exact
-    terraformConfiguration = terranixLib.terranixConfiguration {
+    terraformConfiguration = self.inputs.terranix.lib.terranixConfiguration {
       system = pkgs.stdenv.hostPlatform.system;
 
       modules = [

modules/nixos/services/backup/borg/default.nix

@@ -1,10 +1,13 @@
-{ config, lib, pkgs, namespace, ... }:
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.services.backup.borg;
-in
-{
+in {
   options.sneeuwvlok.services.backup.borg = {
     enable = mkEnableOption "Borg Backup";
   };

modules/nixos/services/communication/matrix/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (builtins) toString toJSON;

modules/nixos/services/development/forgejo/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (builtins) toString;

modules/nixos/services/games/minecraft/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption;

modules/nixos/services/games/openrct.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/services/games/palworld/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/services/media/default.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   lib,
-  namespace,
   config,
   ...
 }: let

modules/nixos/services/media/glance/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/services/media/jellyfin/default.nix

@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  namespace,
   inputs,
   ...
 }: let

modules/nixos/services/media/mydia/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/services/media/nextcloud/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption;

modules/nixos/services/media/nfs/default.nix

@@ -1,16 +1,18 @@
-{ config, lib, namespace, ... }:
-let
+{
+  config,
+  lib,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.services.media.nfs;
-in
-{
+in {
   options.sneeuwvlok.services.media.nfs = {
     enable = mkEnableOption "Enable NFS";
   };
 
   config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = [ 2049 ];
+    networking.firewall.allowedTCPPorts = [2049];
 
     services.nfs.server = {
       enable = true;

modules/nixos/services/media/servarr/default.nix

@@ -2,8 +2,7 @@
   pkgs,
   config,
   lib,
-  namespace,
-  terranixLib,
+  self,
   ...
 }: let
   inherit (builtins) toString;
@@ -154,7 +153,7 @@ in {
           config' = config;
           lib' = lib;
 
-          terraformConfiguration = terranixLib.terranixConfiguration {
+          terraformConfiguration = self.inputs.terranix.lib.terranixConfiguration {
             system = pkgs.stdenv.hostPlatform.system;
 
             modules = [

modules/nixos/services/networking/caddy/default.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  namespace,
   ...
 }: let
   inherit (builtins) length;
@@ -12,7 +11,7 @@
   hasHosts = (cfg.hosts |> attrNames |> length) > 0;
   caddyPackage = pkgs.caddy.withPlugins {
     plugins = ["github.com/corazawaf/coraza-caddy/v2@v2.1.0"];
-    hash = "sha256-rsDnTunR8C7hVOX5aKcba+iFYHbpWek65DZgbMxOdTs=";
+    hash = "sha256-pSXjLaZoRtKV3eFl2ySRSjl3yxi514G1Cb7pfrpxxtE=";
   };
 in {
   options.sneeuwvlok.services.networking.caddy = {

modules/nixos/services/networking/ssh/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib.modules) mkIf;

modules/nixos/services/networking/wireguard/default.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  namespace,
   ...
 }: let
   inherit (builtins) length;
@@ -29,6 +28,7 @@ in {
           };
         };
       });
+      default = {};
     };
   };
 

modules/nixos/services/observability/grafana/default.nix

@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib.modules) mkIf;

modules/nixos/services/observability/loki/default.nix

@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib.modules) mkIf;

modules/nixos/services/observability/prometheus/default.nix

@@ -1,11 +1,14 @@
-{ pkgs, config, lib, namespace, ... }:
-let
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
   inherit (builtins) toString;
   inherit (lib) mkIf mkEnableOption;
 
   cfg = config.sneeuwvlok.services.observability.prometheus;
-in
-{
+in {
   options.sneeuwvlok.services.observability.prometheus = {
     enable = mkEnableOption "enable Prometheus";
   };
@@ -21,14 +24,14 @@ in
         {
           job_name = "prometheus";
           static_configs = [
-            { targets = [ "localhost:9002" ]; }
+            {targets = ["localhost:9002"];}
           ];
         }
 
         {
           job_name = "node";
           static_configs = [
-            { targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; }
+            {targets = ["localhost:${toString config.services.prometheus.exporters.node.port}"];}
           ];
         }
       ];
@@ -37,12 +40,12 @@ in
         node = {
           enable = true;
           port = 9005;
-          enabledCollectors = [ "systemd" ];
+          enabledCollectors = ["systemd"];
           openFirewall = true;
         };
       };
     };
 
-    networking.firewall.allowedTCPPorts = [ 9002 ];
+    networking.firewall.allowedTCPPorts = [9002];
   };
 }

modules/nixos/services/observability/promtail/default.nix

@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (lib.modules) mkIf;

modules/nixos/services/observability/uptime-kuma/default.nix

@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  namespace,
   ...
 }: let
   inherit (builtins) toString;

modules/nixos/services/persistance/postgesql/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/services/security/vaultwarden/default.nix

@@ -2,13 +2,12 @@
   pkgs,
   config,
   lib,
-  namespace,
-  repoRoot,
-  sneeuwvlokLib,
+  self,
   ...
 }: let
   inherit (builtins) toString;
   inherit (lib) mkIf mkEnableOption mkOption types getAttrs toUpper concatMapAttrsStringSep;
+  inherit (import ../../../../../lib/strings {inherit lib;}) strings;
 
   cfg = config.sneeuwvlok.services.security.vaultwarden;
 
@@ -27,15 +26,22 @@
     };
   });
 
-  databaseProviderPostgresql = types.submodule ({...}: let
-    urlOptions = sneeuwvlokLib.options.mkUrlOptions {
-      host = {
+  databaseProviderPostgresql = types.submodule ({...}: {
+    options = {
+      type = mkOption {
+        type = types.enum ["postgresql"];
+      };
+
+      host = mkOption {
+        type = types.str;
+        example = "host.tld";
         description = ''
           Hostname of the postgresql server
         '';
       };
 
-      port = {
+      port = mkOption {
+        type = types.port;
         default = 5432;
         example = "5432";
         description = ''
@@ -44,38 +50,34 @@
       };
 
       protocol = mkOption {
+        type = types.str;
         default = "postgres";
         example = "postgres";
+        description = ''
+          Which protocol to use when creating a url string
+        '';
+      };
+
+      sslMode = mkOption {
+        type = types.enum ["verify-ca" "verify-full" "require" "prefer" "allow" "disabled"];
+        default = "verify-full";
+        example = "verify-ca";
+        description = ''
+          How to verify the server's ssl
+
+          | mode        | eavesdropping protection | MITM protection      | Statement                                                                                                                                   |
+          |-------------|--------------------------|----------------------|---------------------------------------------------------------------------------------------------------------------------------------------|
+          | disable     | No                       | No                   | I don't care about security, and I don't want to pay the overhead of encryption.                                                            |
+          | allow       | Maybe                    | No                   | I don't care about security, but I will pay the overhead of encryption if the server insists on it.                                         |
+          | prefer      | Maybe                    | No                   | I don't care about encryption, but I wish to pay the overhead of encryption if the server supports it.                                      |
+          | require     | Yes                      | No                   | I want my data to be encrypted, and I accept the overhead. I trust that the network will make sure I always connect to the server I want.   |
+          | verify-ca	  | Yes                      | Depends on CA policy | I want my data encrypted, and I accept the overhead. I want to be sure that I connect to a server that I trust.                             |
+          | verify-full | Yes                      | Yes                  | I want my data encrypted, and I accept the overhead. I want to be sure that I connect to a server I trust, and that it's the one I specify. |
+
+          [Source](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS)
+        '';
       };
     };
-  in {
-    options =
-      {
-        type = mkOption {
-          type = types.enum ["postgresql"];
-        };
-
-        sslMode = mkOption {
-          type = types.enum ["verify-ca" "verify-full" "require" "prefer" "allow" "disabled"];
-          default = "verify-full";
-          example = "verify-ca";
-          description = ''
-            How to verify the server's ssl
-
-            | mode        | eavesdropping protection | MITM protection      | Statement                                                                                                                                   |
-            |-------------|--------------------------|----------------------|---------------------------------------------------------------------------------------------------------------------------------------------|
-            | disable     | No                       | No                   | I don't care about security, and I don't want to pay the overhead of encryption.                                                            |
-            | allow       | Maybe                    | No                   | I don't care about security, but I will pay the overhead of encryption if the server insists on it.                                         |
-            | prefer      | Maybe                    | No                   | I don't care about encryption, but I wish to pay the overhead of encryption if the server supports it.                                      |
-            | require     | Yes                      | No                   | I want my data to be encrypted, and I accept the overhead. I trust that the network will make sure I always connect to the server I want.   |
-            | verify-ca	  | Yes                      | Depends on CA policy | I want my data encrypted, and I accept the overhead. I want to be sure that I connect to a server that I trust.                             |
-            | verify-full | Yes                      | Yes                  | I want my data encrypted, and I accept the overhead. I want to be sure that I connect to a server I trust, and that it's the one I specify. |
-
-            [Source](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS)
-          '';
-        };
-      }
-      // (urlOptions |> getAttrs ["protocol" "host" "port"]);
   });
 in {
   options.sneeuwvlok.services.security.vaultwarden = {
@@ -120,7 +122,7 @@ in {
         enable = true;
         dbBackend = "postgresql";
 
-        package = pkgs.callPackage (repoRoot + "/packages/vaultwarden/package.nix") {};
+        package = pkgs.vaultwarden-postgresql;
 
         config = {
           SIGNUPS_ALLOWED = false;
@@ -198,7 +200,7 @@ in {
                 else if type == "postgresql"
                 then {
                   inherit (db) type;
-                  url = sneeuwvlokLib.strings.toUrl {
+                  url = strings.toUrl {
                     inherit (db) protocol host port;
                     path = "vaultwarden";
                     query = {

modules/nixos/services/virtualisation/podman/default.nix

@@ -3,7 +3,6 @@
   options,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/shells/zsh/default.nix

@@ -3,7 +3,6 @@
   config,
   lib,
   pkgs,
-  namespace,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;

modules/nixos/system/networking/default.nix

@@ -1,10 +1,13 @@
-{ config, lib, pkgs, namespace, ... }: 
-let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkDefault;
 
   cfg = config.sneeuwvlok.system.networking;
-in 
-{
+in {
   options.sneeuwvlok.system.networking = {};
 
   config = {

modules/nixos/system/security/boot/default.nix

@@ -1,6 +1,5 @@
 {
   config,
-  namespace,
   inputs,
   ...
 }: let

modules/nixos/system/security/default.nix

@@ -1,7 +1,6 @@
 {...}: {
   flake.modules.nixos.sneeuwvlok.system.security = {
     config,
-    namespace,
     inputs,
     ...
   }: let

modules/nixos/system/security/sops/default.nix

@@ -1,8 +1,7 @@
 {
   pkgs,
   config,
-  namespace,
-  repoRoot,
+  self,
   ...
 }: let
   cfg = config.sneeuwvlok.system.security.sops;
@@ -14,7 +13,7 @@ in {
 
     sops = {
       defaultSopsFormat = "yaml";
-      defaultSopsFile = repoRoot + "/systems/${pkgs.stdenv.hostPlatform.system}/${config.networking.hostName}/secrets.yml";
+      defaultSopsFile = self + "/systems/${pkgs.stdenv.hostPlatform.system}/${config.networking.hostName}/secrets.yml";
 
       age = {
         # keyFile = "~/.config/sops/age/keys.txt";

modules/nixos/system/security/sudo/default.nix

@@ -1,8 +1,6 @@
-{ config, namespace, ... }:
-let
+{config, ...}: let
   cfg = config.sneeuwvlok.system.security.sudo;
-in
-{
+in {
   options.sneeuwvlok.system.security.sudo = {};
 
   config = {
@@ -11,7 +9,7 @@ in
         enable = false;
         execWheelOnly = true;
       };
-      
+
       sudo-rs = {
         enable = true;
         execWheelOnly = true;
@@ -19,4 +17,4 @@ in
       };
     };
   };
-}
+}