diff --git a/host/caenus/default.nix b/host/caenus/default.nix
index 929ef0c..81b4e84 100644
--- a/host/caenus/default.nix
+++ b/host/caenus/default.nix
@@ -1,26 +1,42 @@
-{ modulesPath, config, pkgs, hostName, ... }:
+{
+  modulesPath,
+  config,
+  pkgs,
+  hostName,
+  ...
+}:
 {
   ## MODULES & IMPORTS ##
 
-  imports =
-    [ 
-      # FRP
-      ./modules/frp
-      # Nginx
-      ./modules/nginx
-      # Include the results of the hardware scan.
-      ./hardware.nix
-    ];
+  ## MODULES & IMPORTS ##
+  imports = [
+    # Common Modules
+    ../../common/acme
+    ../../common/ssh
+
+    # Import hardware configuration.
+    ./hardware.nix
+
+    # Local Modules
+    ./modules/frp
+    ./modules/nginx
+  ];
 
   ## BOOTLOADER ##
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  
+
   ## NETWORKING ##
   networking.firewall = {
-    allowedTCPPorts = [ 22 80 443 4040 ];
-    allowedUDPPorts = [ 25565 4040 ];
+    allowedTCPPorts = [
+      22
+      80
+      443
+      4040
+      25565
+    ];
+    allowedUDPPorts = [ 4040 ];
   };
 
   ## ENVIORMENT & PACKAGES ##
@@ -32,7 +48,7 @@
     sshfs
     wget
   ];
-  
+
   environment.variables = {
     HOSTNAME = hostName;
   };
diff --git a/host/caenus/hardware.nix b/host/caenus/hardware.nix
index b83e502..998a961 100644
--- a/host/caenus/hardware.nix
+++ b/host/caenus/hardware.nix
@@ -1,33 +1,49 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
   imports = [
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_scsi" ];
+  ## BOOTLOADER ##
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "virtio_scsi"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/467be3e2-75cb-439f-8255-e1ed3a00c2d8";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/467be3e2-75cb-439f-8255-e1ed3a00c2d8";
+    fsType = "ext4";
+  };
 
-  fileSystems."/storage" =
-    { device = "/dev/disk/by-uuid/a3666a64-591c-45ab-8393-3dd1a0a51d79";
-      fsType = "ext4";
-    };
+  fileSystems."/storage" = {
+    device = "/dev/disk/by-uuid/a3666a64-591c-45ab-8393-3dd1a0a51d79";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/E12E-D69C";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/E12E-D69C";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
   swapDevices = [ ];
 
diff --git a/host/caenus/home/default.nix b/host/caenus/home/default.nix
index 492f4d1..d695198 100644
--- a/host/caenus/home/default.nix
+++ b/host/caenus/home/default.nix
@@ -1,16 +1,25 @@
 { pkgs, ... }:
-{  
+{
   # Module imports
   imports = [
     # Common Modules
-      ../../../common/home
+    ../../../common/home
+    ../../../common/git
   ];
 
   home.packages = with pkgs; [
-      fastfetch
-      fish
-      fishPlugins.grc
-      fishPlugins.tide
-      grc
-    ];
-}
\ No newline at end of file
+    fastfetch
+    fish
+    fishPlugins.grc
+    fishPlugins.tide
+    grc
+  ];
+
+  home.file = {
+    git.dotfiles.source = builtins.fetchGit {
+      url = "https://github.com/TophC7/dotfiles/tree/hosts";
+      rev = "adecf063251176159fe9edbe0f6dbba432630de4";
+    };
+  };
+
+}