diff --git a/apps/de/waybar/style.css b/apps/de/waybar/style.css
index a6f4d73..6f47ab3 100644
--- a/apps/de/waybar/style.css
+++ b/apps/de/waybar/style.css
@@ -2,7 +2,7 @@
 	border: none;
 	border-radius: 0;
 	/* `otf-font-awesome` is required to be installed for icons */
-	font-family: "iosevka-lyte", Roboto, Helvetica, Arial, sans-serif;
+	font-family: "Iosevka", Roboto, Helvetica, Arial, sans-serif;
 	font-size: 16px;
 	min-height: 0;
 }
diff --git a/apps/shell/fish/config.fish b/apps/shell/fish/config.fish
index 7b326c6..7cc7b60 100755
--- a/apps/shell/fish/config.fish
+++ b/apps/shell/fish/config.fish
@@ -63,5 +63,6 @@ mkdir -p $NOTES_PATH $USER_LOGS_PATH $SCROTS_PATH
 # start a tmux session by default if possible and we're not already in
 # a terminal multiplexer
 if has_command tmux && string match -v -q '*tmux*' $TERM && string match -v -q '*screen*' $TERM
+	tmux start-server
 	tmux attach -t default || tmux new -s default
 end
diff --git a/env/laptop/hardware.nix b/env/laptop/hardware.nix
index f98b636..2b0f5b8 100644
--- a/env/laptop/hardware.nix
+++ b/env/laptop/hardware.nix
@@ -12,6 +12,8 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
+	boot.kernelParams = [ "resume=/swapfile" "resume_offset=874496" ];
+	boot.resumeDevice = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122";
 
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122";
@@ -23,7 +25,13 @@
       fsType = "vfat";
     };
 
-  swapDevices = [ ];
+	swapDevices = [
+		{
+			device = "/swapfile";
+			priority = 0;
+			size = 16000;
+		}
+	];
 
   nix.maxJobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/env/nix/personal-machine.nix b/env/nix/personal-machine.nix
index ed76038..2dead06 100644
--- a/env/nix/personal-machine.nix
+++ b/env/nix/personal-machine.nix
@@ -3,9 +3,11 @@
 {
   imports = [ /etc/nixos/hardware-configuration.nix ];
 
-  boot.loader = {
-		systemd-boot.enable = true;
-		efi.canTouchEfiVariables = true;
+	boot = {
+		loader = {
+			systemd-boot.enable = true;
+			efi.canTouchEfiVariables = true;
+		};
 	};
 
 	nixpkgs.config = {
@@ -27,7 +29,35 @@
 
 	environment = {
 		systemPackages = with pkgs; [
-			wget vim neovim git curl fish bash tmux pciutils usbutils w3m networkmanager sway zsh kitty firefox-devedition-bin ripgrep lightdm fortune sd fzf dmenu ranger nodejs python3 rsync pass brightnessctl wl-clipboard waybar mako vulkan-tools htop rustup clang
+			fish bash tmux
+			vim neovim
+			networkmanager
+			wget curl w3m
+			git
+			kitty
+			pciutils usbutils binutils
+			sway waybar mako wl-clipboard
+			firefox-devedition-bin
+			ripgrep sd
+			nodejs python3
+			fzf
+			fortune
+			dmenu
+			ranger
+			rsync
+			pass
+			brightnessctl
+			vulkan-tools # TODO: vulkan?
+			htop
+			rustup
+			clang
+			pavucontrol
+			pamixer
+			strongswan
+			gnumake
+			elixir
+			docker docker-compose
+			postgresql
 		];
 		variables = {
 			EDITOR = "nvim";
@@ -36,10 +66,19 @@
 
   fonts.fonts = with pkgs; [ iosevka ];
 
+  virtualisation.docker.enable = true;
+
   hardware = {
+		bluetooth = {
+			enable = true;
+		};
 		pulseaudio = {
 			enable = true;
 			support32Bit = true;
+			package = pkgs.pulseaudioFull;
+			# extraConfig = "
+			# 	load-module module-switch-on-connect
+			# ";
 		};
 		opengl = {
 			enable = true;
@@ -65,12 +104,6 @@
 
   services = {
 		openssh.enable = true;
-		xserver = {
-			enable = true;
-			displayManager.lightdm = {
-				enable = true;
-			};
-		};
 	};
 
   networking.firewall.enable = false;
@@ -79,9 +112,15 @@
 
   users.users.daniel = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
+    extraGroups = [ "wheel" "docker" ];
     shell = pkgs.fish;
 		home = "/home/daniel/.home";
+		packages = with pkgs; [
+			steam
+			pulsemixer
+			file
+			appimage-run
+		];
   };
 
   system.stateVersion = "20.03";
diff --git a/env/nix/pkgs/home.nix b/env/nix/pkgs/home.nix
new file mode 100644
index 0000000..a4bf7f8
--- /dev/null
+++ b/env/nix/pkgs/home.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  programs.home-manager.enable = true;
+
+  home.stateVersion = "20.03";
+}
diff --git a/setup.bash b/setup.bash
index 67f3925..920a416 100755
--- a/setup.bash
+++ b/setup.bash
@@ -116,6 +116,9 @@ links=(
 
 	# XDG user directories
 	"apps/shell/user-dirs"              "$XDG_CONFIG_HOME/user-dirs.dirs"
+
+	# XDG user directories
+	"env/nix/pkgs"                      "$XDG_CONFIG_HOME/nixpkgs"
 )
 
 chmod 700 -R "$HOME/.bin"