diff --git a/machines/luna/configuration.nix b/machines/luna/configuration.nix
index 03dc122..3e3f844 100644
--- a/machines/luna/configuration.nix
+++ b/machines/luna/configuration.nix
@@ -14,7 +14,6 @@
 
   horseman.username = "horseman";
 
-
   networking.hostName = "luna";
 
   system.stateVersion = "24.11";
diff --git a/machines/luna/modules.nix b/machines/luna/modules.nix
index d080577..00e6a6c 100644
--- a/machines/luna/modules.nix
+++ b/machines/luna/modules.nix
@@ -48,7 +48,7 @@
     };
 
     terminal = {
-        zsh.enable = true;
+      zsh.enable = true;
     };
   };
 }
diff --git a/machines/solis/configuration.nix b/machines/solis/configuration.nix
index 91087d9..de07dda 100644
--- a/machines/solis/configuration.nix
+++ b/machines/solis/configuration.nix
@@ -17,11 +17,11 @@
   networking.hostName = "solis";
 
   systemd.timers."backupSyncthing" = {
-    wantedBy = [ "timers.target" ];
-      timerConfig = {
-        OnCalendar = "weekly";
-        Persistent = true;
-      };
+    wantedBy = ["timers.target"];
+    timerConfig = {
+      OnCalendar = "weekly";
+      Persistent = true;
+    };
   };
 
   systemd.services."backupSyncthing" = {
diff --git a/machines/terra/modules.nix b/machines/terra/modules.nix
index 586c646..89b8077 100644
--- a/machines/terra/modules.nix
+++ b/machines/terra/modules.nix
@@ -9,7 +9,7 @@
   imports = [
     ../../modules
     ../../modules/boot/loader/systemd.nix
-    ];
+  ];
 
   config.horseman = {
     users.default.enable = true;
diff --git a/modules/apps/dev.nix b/modules/apps/dev.nix
index 8a51509..3676070 100644
--- a/modules/apps/dev.nix
+++ b/modules/apps/dev.nix
@@ -28,16 +28,10 @@ in {
       };
 
       home.packages = with pkgs; [
-        direnv
-        docker-compose
-        ethtool
-        file
-        fzf
         gcc
         ghex
         haskell.compiler.native-bignum.ghcHEAD
         haskell-language-server
-        btop
         jdk
         jetbrains.clion
         jetbrains.idea-ultimate
diff --git a/modules/apps/terminal.nix b/modules/apps/terminal.nix
index 60ec294..fbeed97 100644
--- a/modules/apps/terminal.nix
+++ b/modules/apps/terminal.nix
@@ -24,6 +24,12 @@ in {
     services.lorri.enable = true;
 
     environment.systemPackages = with pkgs; [
+      direnv
+      docker-compose
+      ethtool
+      file
+      fzf
+      btop
       gnupg
       neofetch
       sops
diff --git a/modules/base/nix.nix b/modules/base/nix.nix
index bade9ac..906480a 100644
--- a/modules/base/nix.nix
+++ b/modules/base/nix.nix
@@ -17,14 +17,7 @@ in {
 
   config = {
     nixpkgs = {
-      overlays = [
-        #        outputs.overlays.additions
-        #        outputs.overlays.modifications
-        #        outputs.overlays.unstable-packages
-      ];
-      config = {
-        allowUnfree = true;
-      };
+      config.allowUnfree = true;
     };
 
     nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
diff --git a/modules/boot/default.nix b/modules/boot/default.nix
index 4864ce0..786cec0 100644
--- a/modules/boot/default.nix
+++ b/modules/boot/default.nix
@@ -1,8 +1,16 @@
-{inputs, headless, ...}: {
+{
+  inputs,
+  headless,
+  ...
+}: {
   imports = [
     ./greeter/sddm.nix
     ./refind.nix
 
-    ( if headless then ./loader/grub.nix else ./loader/systemd.nix )
+    (
+      if headless
+      then ./loader/grub.nix
+      else ./loader/systemd.nix
+    )
   ];
 }
diff --git a/modules/default.nix b/modules/default.nix
index 3c57b26..7e471d4 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,4 +1,8 @@
-{inputs, headless, ...}: {
+{
+  inputs,
+  headless,
+  ...
+}: {
   imports = [
     ./apps
     ./hardware
diff --git a/modules/wm/plasma/default.nix b/modules/wm/plasma/default.nix
index 0c91488..4f603ca 100644
--- a/modules/wm/plasma/default.nix
+++ b/modules/wm/plasma/default.nix
@@ -36,6 +36,6 @@ in {
 
     home-manager.users.${homeCfg.username} = lib.mkIf (!headless) {
       imports = [./config.nix];
-    }; 
+    };
   };
 }