diff --git a/hosts/bastion/configuration.nix b/hosts/bastion/configuration.nix
index 27edd15..5eae66d 100644
--- a/hosts/bastion/configuration.nix
+++ b/hosts/bastion/configuration.nix
@@ -7,22 +7,23 @@
 {
   imports =
     [
-      ../../common
-      ../../common/generic-vm.nix
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      # Import common config
+      ../../common/generic-vm.nix
+      ../../common
     ];
 
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
+  boot.loader.grub.device = "/dev/sda";
 
-  networking.hostName = "bastion"; # Define your hostname.
+  networking.hostName = "bastion";
 
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
-  
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -30,4 +31,12 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "21.05"; # Did you read the comment?
+
+  # Additional packages
+  environment.systemPackages = with pkgs; [
+    ripgrep
+    rsync
+    tmux
+    vault
+  ];
 }
diff --git a/hosts/bastion/hardware-configuration.nix b/hosts/bastion/hardware-configuration.nix
index 1e9cf59..9c5d168 100644
--- a/hosts/bastion/hardware-configuration.nix
+++ b/hosts/bastion/hardware-configuration.nix
@@ -5,7 +5,8 @@
 
 {
   imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+    [
+      (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
@@ -14,12 +15,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e8427097-8545-4924-b033-2659fcf9adca";
+    {
+      device = "/dev/disk/by-uuid/e8427097-8545-4924-b033-2659fcf9adca";
       fsType = "ext4";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/63d90b92-cdde-4795-a3ab-9566ae88f43d"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/63d90b92-cdde-4795-a3ab-9566ae88f43d"; }];
 
 }