diff --git a/flake.nix b/flake.nix
index c2fe7ea..26794ac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,6 +23,8 @@
   outputs =
     inputs:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      imports = [ ./hosts ];
+
       systems = [
         "x86_64-linux"
         "aarch64-linux"
@@ -60,28 +62,6 @@
             };
           }
         );
-
-        # TODO: move that somewhere else
-        nixosConfigurations = {
-          marr = lib.my.mkSystem {
-            hostname = "marr";
-            system = "x86_64-linux";
-            extraModules = [
-              #inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia
-            ];
-          };
-
-          brontes = lib.my.mkSystem {
-            hostname = "brontes";
-            system = "x86_64-linux";
-          };
-
-          styrak = lib.my.mkSystem {
-            hostname = "styrak";
-            system = "x86_64-linux";
-            extraModules = [ inputs.disko.nixosModules.disko ];
-          };
-        };
       };
     };
 }
diff --git a/home/default.nix b/home/default.nix
index 7c88faa..3da294d 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,2 +1,8 @@
 # This file contains default settings used across different systems
-{ imports = [ ./ssh ]; }
+{
+  imports = [
+    ./ssh
+    ./hypridle
+    ./hyprland
+  ];
+}
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index 8ac0bae..4c2eacd 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -15,9 +15,7 @@
       ../../home/rofi
       ../../home/swaync
       ../../home/waybar
-      ../../home/hyprland
       ../../home/hyprlock
-      ../../home/hypridle
       ../../home/hyprpaper
       ../../home/themes/catppuccin.nix
       ../../home
diff --git a/hosts/default.nix b/hosts/default.nix
new file mode 100644
index 0000000..26225f8
--- /dev/null
+++ b/hosts/default.nix
@@ -0,0 +1,27 @@
+{ inputs, ... }:
+let
+  inherit (inputs.self) lib;
+in
+{
+  flake.nixosConfigurations = {
+    marr = lib.my.mkSystem {
+      hostname = "marr";
+      system = "x86_64-linux";
+      extraModules = [
+        #inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia
+      ];
+    };
+
+    brontes = lib.my.mkSystem {
+      hostname = "brontes";
+      system = "x86_64-linux";
+      extraModules = [ inputs.agenix.nixosModules.default ];
+    };
+
+    styrak = lib.my.mkSystem {
+      hostname = "styrak";
+      system = "x86_64-linux";
+      extraModules = [ inputs.disko.nixosModules.disko ];
+    };
+  };
+}
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 45995a8..0d4aadd 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -46,12 +46,15 @@
   };
 
   #: Virtualisation {{{
-  virtualisation.docker.enable = true;
-  virtualisation.docker.enableOnBoot = false;
-  virtualisation.docker.rootless = {
+  virtualisation.docker = {
     enable = true;
-    setSocketVariable = true;
+    enableOnBoot = false;
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
   };
+
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
   #: }}}
diff --git a/hosts/styrak/configuration.nix b/hosts/styrak/configuration.nix
index 8e0e4a2..921a651 100644
--- a/hosts/styrak/configuration.nix
+++ b/hosts/styrak/configuration.nix
@@ -28,5 +28,13 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMvPqWPXEUOSMGMIRmirQfbrzq//NkPlEI2TmFpIkSfw" # brontes
   ];
 
+  virtualisation.docker = {
+    enableOnBoot = false;
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+  };
+
   system.stateVersion = "23.11";
 }
diff --git a/modules/nix/overlays/default.nix b/modules/nix/overlays/default.nix
index 40787d6..1c03b4e 100644
--- a/modules/nix/overlays/default.nix
+++ b/modules/nix/overlays/default.nix
@@ -1,5 +1,4 @@
 {
-
   nixpkgs.overlays = [
     # Add env vars to calibre so they may get propagated to a plugin that needs them
     (final: prev: {