diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index 2aa6407..6ba1a68 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -28,3 +28,4 @@ bspc rule -a Emacs state=tiled
 # AUTOSTART #
 [[ ! $(pidof -x sxhkd) ]] && sxhkd &
 feh --bg-fill ~/.dotfiles/config/wallpaper/base.png
+systemctl --user start polybar
diff --git a/config/doom/reload.sh b/config/doom/reload.sh
index a6cdd31..3273156 100755
--- a/config/doom/reload.sh
+++ b/config/doom/reload.sh
@@ -2,8 +2,7 @@
 DOOM="$HOME/.emacs.d"
 if [ ! -d "$DOOM" ]; then
 	git clone https://github.com/hlissner/doom-emacs.git "$DOOM"
-	sleep 0.5
-	"$DOOM/bin/doom -y install"
+	"$DOOM/bin/doom" -y install
 fi
 
-"$DOOM/bin/doom sync"
+"$DOOM/bin/doom" sync
diff --git a/flake.nix b/flake.nix
index e05bdc0..5bf9293 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,8 +12,8 @@
     };
   };
 
-  outputs = inputs@{ self, utils, home-manager, ...}: {
-    utils.lib.mkFlake = {
+  outputs = inputs@{ self, utils, home-manager, ...}:
+    utils.lib.mkFlake {
       inherit self inputs;
 
       # Channel definitions.
@@ -22,7 +22,7 @@
       channelsConfig.allowUnfree = true;
 
       hostDefaults.modules = [
-        home-manager.nixos.Modules.home-manager
+        home-manager.nixosModules.home-manager
         ./modules
       ];
 
@@ -30,5 +30,4 @@
         ./hosts/nixos-laptop
       ];
     };
-  };
 }
diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix
index 40ea691..ef87e23 100644
--- a/hosts/nixos-laptop/default.nix
+++ b/hosts/nixos-laptop/default.nix
@@ -72,8 +72,9 @@
     printing.enable = true;
   };
   
-  # Enable sound.
-  services.pipewire.enable = true;
+  # Enable sound
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
 
   # Powersaving
   services.tlp.enable = true;
diff --git a/system/configuration.nix b/system/configuration.nix
index 724084f..ef87e23 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -10,21 +10,29 @@
       ./hardware-configuration.nix
     ];
  
+  nix.package = pkgs.nixFlakes;
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+
   # BOOT
-  boot.supportedFilesystems = [ "btrfs" ];
-  boot.loader = {
-      grub = {
-        enable = true;
-        version = 2;
-        device = "nodev";
-        efiSupport = true;
-      };
-      efi.canTouchEfiVariables = true;
+  boot = {
+    supportedFilesystems = [ "btrfs" ];
+    loader = {
+        grub = {
+          enable = true;
+          version = 2;
+          device = "nodev";
+          efiSupport = true;
+        };
+        efi.canTouchEfiVariables = true;
+    };
+    kernelPackages = pkgs.linuxPackages_zen;
   };
 
   # NETWORKING
   networking = {
-    hostName = "nixos";
+    hostName = "nixos-laptop";
     networkmanager.enable = true;    
  
     useDHCP = false;
@@ -64,10 +72,13 @@
     printing.enable = true;
   };
   
-  # Enable sound.
+  # Enable sound
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
+  # Powersaving
+  services.tlp.enable = true;
+
   # USERS
   users.users.moritz = {
     shell = pkgs.zsh;
@@ -77,7 +88,7 @@
   };
  
   fonts.fonts = with pkgs; [
-    (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ];})
+    (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono"];})
   ];
  
   # PACKAGES
diff --git a/users/moritz/home.nix b/users/moritz/home.nix
index 8715b50..6133ca2 100644
--- a/users/moritz/home.nix
+++ b/users/moritz/home.nix
@@ -70,7 +70,7 @@
         enable_audio_bell = false;
         cursor_shape = "underline";
       };
-      extraConfig = builtins.readFile ~/.config/kitty/dracula.conf;
+      extraConfig = builtins.readFile ~/.dotfiles/config/kitty/dracula.conf;
       font = {
         name = "FiraCode Nerd Font";
         size = 10;
@@ -87,7 +87,7 @@
 
     rofi = {
       enable = true;
-      theme = ~/.config/rofi/dracula_old.rasi;
+      theme = ~/.dotfiles/config/rofi/dracula_old.rasi;
     };
 
     emacs.enable = true;
@@ -109,13 +109,8 @@
         recursive = true;
         onChange = builtins.readFile ~/.dotfiles/config/doom/reload.sh;
       };
-      "kitty" = {
-        source = ~/.dotfiles/config/kitty;
-        recursive = true;
-      };
-      "rofi" = {
-        source = ~/.dotfiles/config/rofi;
-        recursive = true;
+      "dunst/dunstrc" = {
+        source = ~/.dotfiles/config/dunst/dunstrc;
       };
     };
   };
@@ -143,15 +138,29 @@
       inactiveDim = "0.1";
     };
 
-    emacs.enable = true;
+    emacs = {
+      enable = true;
+      package = pkgs.emacsUnstable;
+    };
+
+    dunst.enable = true;
+
+    kdeconnect.enable = true;
   };
 
 
   home.packages = with pkgs; [
     neofetch
     feh
+    keepassxc
   ];
- 
+
+  nixpkgs.overlays = [
+      (import (builtins.fetchTarball {
+        url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+      }))
+    ];
+
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage
   # when a new Home Manager release introduces backwards