diff --git a/.gitignore b/.gitignore
index 0c92e47..2905827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,5 @@
 !overlays/
 !profiles/
 !modules/
-!applications/
 
 !/flake/
diff --git a/hosts/default.nix b/hosts/default.nix
index d705b23..1c93ddf 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -21,7 +21,6 @@ let
     nixosSystem {
       inherit system;
       modules = [
-        ./${host}/hardware-configuration.nix
         ../profiles/${profile}.nix
         ./${host}/default.nix
       ]
diff --git a/modules/drivers/intel-drivers.nix b/modules/drivers/intel-drivers.nix
new file mode 100644
index 0000000..fb24fd6
--- /dev/null
+++ b/modules/drivers/intel-drivers.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.drivers.intel;
+in
+{
+  options.drivers.intel = {
+    enable = mkEnableOption "Enable Intel Graphics Drivers";
+  };
+
+  config = mkIf cfg.enable {
+    # OpenGL
+    hardware.graphics = {
+      extraPackages = with pkgs; [
+        intel-media-driver
+        vaapiIntel
+        vaapiVdpau
+        libvdpau-va-gl
+      ];
+    };
+  };
+}
diff --git a/modules/nix/boot.nix b/modules/nix/boot.nix
new file mode 100644
index 0000000..d3a20bd
--- /dev/null
+++ b/modules/nix/boot.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  boot.loader = {
+    systemd-boot.enable = true;
+    systemd-boot.configurationLimit = 8;
+    efi.canTouchEfiVariables = true;
+  };
+
+  boot.supportedFilesystems = [ "nfs" ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+}
diff --git a/modules/nix/caches.nix b/modules/nix/caches.nix
new file mode 100644
index 0000000..dda5ae9
--- /dev/null
+++ b/modules/nix/caches.nix
@@ -0,0 +1,13 @@
+_: {
+  nix.settings = {
+    extra-substituters = [
+      "https://noctalia.cachix.org"
+      "https://vicinae.cachix.org"
+    ];
+
+    extra-trusted-public-keys = [
+      "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="
+      "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
+    ];
+  };
+}
diff --git a/profiles/base.nix b/profiles/base.nix
index 9ef46a6..796393e 100644
--- a/profiles/base.nix
+++ b/profiles/base.nix
@@ -1,8 +1,8 @@
+{ userName, ... }:
 {
-  userName,
-  ...
-}:
-{
-  imports = [ ];
+  imports = [
+    ../modules/nix/boot.nix
+    ../modules/nix/caches.nix
+  ];
   home-manager.users.${userName}.imports = [ ];
 }