diff --git a/darwin-common.nix b/darwin-common.nix
index 48dcf27d..f92eab30 100644
--- a/darwin-common.nix
+++ b/darwin-common.nix
@@ -8,7 +8,7 @@
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   security.pam.enableSudoTouchIdAuth = true;
   programs.zsh.shellInit = ''
-   eval $(/opt/homebrew/bin/brew shellenv)'
+    eval $(/opt/homebrew/bin/brew shellenv)'
   '';
   environment.systemPath = [ "/opt/homebrew/bin" "/opt/homebrew/sbin" ];
   #nix.settings.auto-optimise-store = true;
@@ -22,8 +22,7 @@
     hostName = "ds9";
     sshKey = "/Users/xyno/.ssh/id_ed25519";
     publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUorQkJYdWZYQUpoeVVIVmZocWxrOFk0ekVLSmJLWGdKUXZzZEU0ODJscFYgcm9vdEBpc28K";
-  }
-  ];
+  }];
   nix.extraOptions = ''
     builders-use-substitutes = true
   '';
diff --git a/flake.nix b/flake.nix
index 40d7603c..fd397fc2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -131,9 +131,7 @@
                 home-manager.useGlobalPkgs = true;
                 home-manager.useUserPackages = true;
                 home-manager.extraSpecialArgs = { inherit inputs; };
-              }
-
-                ])
+              }])
               ./nixos-common.nix
             ] ++ extraModules;
           };
diff --git a/hm-modules/files.nix b/hm-modules/files.nix
index f66f4e99..e98cdbe5 100644
--- a/hm-modules/files.nix
+++ b/hm-modules/files.nix
@@ -3,13 +3,13 @@
   imports = [
     "${inputs.impermanence}/home-manager.nix"
   ];
-        home.file = {
-          # Home nix config.
-          ".config/nixpkgs/config.nix".text = "{ allowUnfree = true; }";
-          ".local/share/pandoc/templates/default.latex".source = "${inputs.pandoc-latex-template}/eisvogel.tex";
+  home.file = {
+    # Home nix config.
+    ".config/nixpkgs/config.nix".text = "{ allowUnfree = true; }";
+    ".local/share/pandoc/templates/default.latex".source = "${inputs.pandoc-latex-template}/eisvogel.tex";
 
-          # empty zshrc to stop zsh-newuser-install from running
-          ".zshrc".text = "";
+    # empty zshrc to stop zsh-newuser-install from running
+    ".zshrc".text = "";
 
-        };
+  };
 }
diff --git a/hm-modules/vscode/default.nix b/hm-modules/vscode/default.nix
index cf5cb273..43bdbcdf 100644
--- a/hm-modules/vscode/default.nix
+++ b/hm-modules/vscode/default.nix
@@ -25,7 +25,7 @@ in
         jdinhlife.gruvbox # theme
         mkhl.direnv # direnv
 
-        
+
         marketplace.eamodio.gitlens
         marketplace.ms-vscode-remote.remote-containers
 
@@ -228,9 +228,9 @@ in
           "hediet.vscode-drawio.resizeImages" = "null";
 
         };
-        keybindings = [
-          { "key" = "ctrl+w"; "command" = "whichkey.show"; }
-        ];
+      keybindings = [
+        { "key" = "ctrl+w"; "command" = "whichkey.show"; }
+      ];
     };
   };
 }
diff --git a/hm-modules/xonsh/default.nix b/hm-modules/xonsh/default.nix
index 183aecf8..c4035fa8 100644
--- a/hm-modules/xonsh/default.nix
+++ b/hm-modules/xonsh/default.nix
@@ -29,7 +29,7 @@ let
       ];
     };
 
-    aliasesJson = pkgs.writeText "shell-aliases.json" (builtins.toJSON config.home.shellAliases);
+  aliasesJson = pkgs.writeText "shell-aliases.json" (builtins.toJSON config.home.shellAliases);
 in
 {
   options.ragon.xonsh.enable = lib.mkOption { default = false; };
diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix
index 4387b8ed..c26b4c24 100644
--- a/hosts/daedalus/default.nix
+++ b/hosts/daedalus/default.nix
@@ -27,7 +27,7 @@ with lib.my;
       "android-platform-tools"
       "raycast"
       "ukelele"
-#      "homebrew/cask-drivers/zsa-wally"
+      #      "homebrew/cask-drivers/zsa-wally"
       "thunderbird"
       "openlens"
       "ferdium"
diff --git a/hosts/ds9/backup.nix b/hosts/ds9/backup.nix
index f714ba27..9301294f 100644
--- a/hosts/ds9/backup.nix
+++ b/hosts/ds9/backup.nix
@@ -39,4 +39,4 @@
     };
   };
 
-}
\ No newline at end of file
+}
diff --git a/hosts/ds9/default.nix b/hosts/ds9/default.nix
index 3dacde41..ae717c3a 100644
--- a/hosts/ds9/default.nix
+++ b/hosts/ds9/default.nix
@@ -112,7 +112,8 @@ in
   };
 
   systemd.services.caddy.serviceConfig.EnvironmentFile = config.age.secrets.ionos.path;
-  services.caddy = { # ragon.services.caddy is enabled
+  services.caddy = {
+    # ragon.services.caddy is enabled
     globalConfig = ''
       acme_dns ionos {
         api_token "{$IONOS_API_KEY}"
@@ -145,19 +146,19 @@ in
     '';
   };
 
-  home-manager.users.ragon = { pkgs, lib, inputs, config, ...}: {
-      imports = [
-        ../../hm-modules/nvim
-        ../../hm-modules/zsh
-        ../../hm-modules/tmux
-        ../../hm-modules/xonsh
-        ../../hm-modules/cli.nix
-        ../../hm-modules/files.nix
-      ];
-      ragon.xonsh.enable = true;
+  home-manager.users.ragon = { pkgs, lib, inputs, config, ... }: {
+    imports = [
+      ../../hm-modules/nvim
+      ../../hm-modules/zsh
+      ../../hm-modules/tmux
+      ../../hm-modules/xonsh
+      ../../hm-modules/cli.nix
+      ../../hm-modules/files.nix
+    ];
+    ragon.xonsh.enable = true;
 
-      programs.home-manager.enable = true;
-      home.stateVersion = "23.11";
+    programs.home-manager.enable = true;
+    home.stateVersion = "23.11";
   };
 
   ragon = {
diff --git a/hosts/ds9/plex.nix b/hosts/ds9/plex.nix
index d92d4e0f..c028a6d6 100644
--- a/hosts/ds9/plex.nix
+++ b/hosts/ds9/plex.nix
@@ -6,4 +6,4 @@
     user = "ragon";
     group = "users";
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/ds9/samba.nix b/hosts/ds9/samba.nix
index a1e627d6..74318ef6 100644
--- a/hosts/ds9/samba.nix
+++ b/hosts/ds9/samba.nix
@@ -41,26 +41,26 @@
   '';
 
   ragon.services = {
-      samba.enable = true;
-      samba.shares = {
-        TimeMachine = {
-          path = "/backups/DaedalusTimeMachine";
-          comment = "DaedalusTimeMachine";
-          "write list" = "@wheel";
-          "read only" = "no";
-          "writable" = "yes";
-          "browseable" = "yes";
-          "fruit:time machine" = "yes";
-          "fruit:time machine max size" = "2050G";
-          "vfs objects" = "acl_xattr fruit streams_xattr";
-          "inherit acls" = "yes";
-        };
-        data = {
-          path = "/data";
-          comment = "some data for the people";
-          "write list" = "@wheel";
-        };
+    samba.enable = true;
+    samba.shares = {
+      TimeMachine = {
+        path = "/backups/DaedalusTimeMachine";
+        comment = "DaedalusTimeMachine";
+        "write list" = "@wheel";
+        "read only" = "no";
+        "writable" = "yes";
+        "browseable" = "yes";
+        "fruit:time machine" = "yes";
+        "fruit:time machine max size" = "2050G";
+        "vfs objects" = "acl_xattr fruit streams_xattr";
+        "inherit acls" = "yes";
       };
+      data = {
+        path = "/data";
+        comment = "some data for the people";
+        "write list" = "@wheel";
+      };
+    };
   };
 
-}
\ No newline at end of file
+}
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index 0e017d0c..38e54467 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -244,19 +244,19 @@
   services.lolpizza2.enable = true;
   programs.mosh.enable = true;
 
-  home-manager.users.ragon = { pkgs, lib, inputs, config, ...}: {
-      imports = [
-        ../../hm-modules/nvim
-        ../../hm-modules/zsh
-        ../../hm-modules/tmux
-        ../../hm-modules/xonsh
-        ../../hm-modules/cli.nix
-        ../../hm-modules/files.nix
-      ];
-      ragon.xonsh.enable = true;
+  home-manager.users.ragon = { pkgs, lib, inputs, config, ... }: {
+    imports = [
+      ../../hm-modules/nvim
+      ../../hm-modules/zsh
+      ../../hm-modules/tmux
+      ../../hm-modules/xonsh
+      ../../hm-modules/cli.nix
+      ../../hm-modules/files.nix
+    ];
+    ragon.xonsh.enable = true;
 
-      programs.home-manager.enable = true;
-      home.stateVersion = "23.11";
+    programs.home-manager.enable = true;
+    home.stateVersion = "23.11";
   };
 
   ragon = {
diff --git a/lib/default.nix b/lib/default.nix
index f9c6ddb3..b14f49cd 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -15,4 +15,4 @@ let
 in
 mylib.extend
   (self: super:
-    foldr (a: b: a // b) { } (attrValues super))
+  foldr (a: b: a // b) { } (attrValues super))
diff --git a/nixos-modules/services/caddy/custom-caddy.nix b/nixos-modules/services/caddy/custom-caddy.nix
index 567b96ff..09849427 100644
--- a/nixos-modules/services/caddy/custom-caddy.nix
+++ b/nixos-modules/services/caddy/custom-caddy.nix
@@ -45,4 +45,4 @@ caddy.override {
     ldflags = [ "-s" "-w" ]; ## don't include version info twice
     vendorHash = null;
   });
-}
\ No newline at end of file
+}
diff --git a/nixos-modules/services/caddy/default.nix b/nixos-modules/services/caddy/default.nix
index 767a9584..274b6456 100644
--- a/nixos-modules/services/caddy/default.nix
+++ b/nixos-modules/services/caddy/default.nix
@@ -1,8 +1,8 @@
-{ config, pkgs, lib, ...}:
+{ config, pkgs, lib, ... }:
 let
   cfg = config.ragon.services.caddy;
-  in
- {
+in
+{
   options.ragon.services.caddy.enable = lib.mkEnableOption "enables the caddy webserver";
   config = lib.mkIf cfg.enable {
     services.caddy = {
@@ -11,4 +11,4 @@ let
     };
     ragon.persist.extraDirectories = [ config.services.caddy.dataDir ];
   };
-}
\ No newline at end of file
+}
diff --git a/packages/scripts.nix b/packages/scripts.nix
index dd84d830..ad6806ab 100644
--- a/packages/scripts.nix
+++ b/packages/scripts.nix
@@ -1,4 +1,4 @@
-{ stdenv, ...}:
+{ stdenv, ... }:
 stdenv.mkDerivation {
   name = "scripts";
   src = ./scripts;