diff --git a/home-manager/apps.nix b/home-manager/apps.nix
index a41c0a5..9d9dfff 100644
--- a/home-manager/apps.nix
+++ b/home-manager/apps.nix
@@ -29,58 +29,8 @@
   };
 
   home.packages = with pkgs; [
-    alacritty
-    bitwarden
-    direnv
-    discord-ptb
-    docker-compose
-    ethtool
-    file
-    fzf
-    gcc
-    ghex
-    gnome-calculator
     gnupg
-    haskell.compiler.native-bignum.ghcHEAD
-    haskell-language-server
-    htop
-    icu
-    jdk
-    jetbrains.clion
-    jetbrains.idea-ultimate
-    jetbrains.pycharm-professional
-    jetbrains.rider
-    jetbrains.webstorm
-    inkscape
-    inotify-tools
-    keepassxc
-    krita
-    libreoffice
-    lsix
-    mullvad-vpn
-    neofetch
-    nodejs_22
-    obsidian
-    parsec-bin
     platformio-core
-    python313
-    qbittorrent
-    reaper
-    retext
-    solaar
-    sops
-    spotify
-    sqlite
-    sqlitebrowser
-    sxiv
-    termdown
-    thunderbird
-    tmux
-    unzip
-    vlc
-    wakeonlan
-    xclip
-    zsh
   ];
 
   programs.home-manager.enable = true;
diff --git a/overhaul/machines/luna/configuration.nix b/overhaul/machines/luna/configuration.nix
index cd2419d..1bb7542 100644
--- a/overhaul/machines/luna/configuration.nix
+++ b/overhaul/machines/luna/configuration.nix
@@ -31,8 +31,6 @@
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.autoNumlock = true;
   services.displayManager.defaultSession = "plasma";
-  boot.loader.systemd-boot.enable = true;  
-  boot.kernelModules = [ "snd-seq" "snd-rawmidi" ];
 
   hardware.bluetooth.enable = true;
   hardware.pulseaudio.enable = false;
diff --git a/overhaul/machines/solis/configuration.nix b/overhaul/machines/solis/configuration.nix
index ed28772..3607241 100644
--- a/overhaul/machines/solis/configuration.nix
+++ b/overhaul/machines/solis/configuration.nix
@@ -22,9 +22,6 @@
 
   networking.hostName = "solis";
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-
   virtualisation.docker.enable = true;
 
   services.resolved.enable = true;
diff --git a/overhaul/machines/terra/refind.nix b/overhaul/machines/terra/refind.nix
deleted file mode 100644
index cdefb1d..0000000
--- a/overhaul/machines/terra/refind.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  environment.systemPackages = [
-    pkgs.refind
-    pkgs.efibootmgr
-  ];
-}
diff --git a/overhaul/modules/boot/grub.nix b/overhaul/modules/boot/grub.nix
new file mode 100644
index 0000000..0921d5c
--- /dev/null
+++ b/overhaul/modules/boot/grub.nix
@@ -0,0 +1,25 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkOption types;
+  cfg = config.horseman.boot.grub;
+in {
+  options = {
+    horseman.boot.grub = {
+      enable = mkEnableOption "Enables grub, the bootloader";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    boot.loader.grub = {
+      enable = true;
+      device = "/dev/sda";
+      configurationLimit = 10;
+    };
+  };
+}
diff --git a/overhaul/modules/boot/refind.nix b/overhaul/modules/boot/refind.nix
new file mode 100644
index 0000000..d9ae47d
--- /dev/null
+++ b/overhaul/modules/boot/refind.nix
@@ -0,0 +1,23 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkOption types;
+  cfg = config.horseman.boot.refind;
+in {
+  options = {
+    horseman.boot.refind = {
+      enable = mkEnableOption "Enables rEFInd, the bootloader";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      refind
+    ];
+  };
+}
diff --git a/overhaul/modules/boot/systemd.nix b/overhaul/modules/boot/systemd.nix
new file mode 100644
index 0000000..576852b
--- /dev/null
+++ b/overhaul/modules/boot/systemd.nix
@@ -0,0 +1,25 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkOption types;
+  cfg = config.horseman.boot.systemd;
+in {
+  options = {
+    horseman.boot.systemd = {
+      enable = mkEnableOption "Enables systemd, the bootloader";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    boot.kernelModules = [ "snd-seq" "snd-rawmidi" ];
+    boot.loader.systemd-boot = {
+      enable = true;
+      configurationLimit = 10;
+    };
+  };
+}
diff --git a/overhaul/modules/template.nix b/overhaul/modules/template.nix
new file mode 100644
index 0000000..4f7f022
--- /dev/null
+++ b/overhaul/modules/template.nix
@@ -0,0 +1,21 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkOption types;
+  cfg = config.horseman.xxxxxx.xxxxxx;
+in {
+  options = {
+    horseman.xxxxxx.xxxxxx = {
+      enable = mkEnableOption "";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    
+  };
+}
diff --git a/overhaul/modules/terminal/neovim.nix b/overhaul/modules/terminal/neovim.nix
new file mode 100644
index 0000000..fe79364
--- /dev/null
+++ b/overhaul/modules/terminal/neovim.nix
@@ -0,0 +1,21 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkOption types;
+  cfg = config.horseman.terminal.neovim;
+in {
+  options = {
+    horseman.terminal.neovim = {
+      enable = mkEnableOption "Neovim options";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    
+  };
+}