diff --git a/configuration.nix b/configuration.nix
index ad9c6cf..11cb9a9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -25,9 +25,15 @@
   networking.wireless.enable = true;
 
   i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "se";
-    defaultLocale = "sv_SE.UTF-8";
+    LC_ADDRESS = "sv_SE.UTF-8";
+    LC_IDENTIFIACTION = "sv_SE.UTF-8";
+    LC_MEASUREMENT = "sv_SE.UTF-8";
+    LC_MONETARY = "sv_SE.UTF-8";
+    LC_NAME = "sv_SE.UTF-8";
+    LC_NUMERIC = "sv_SE.UTF-8";
+    LC_PAPER = "sv_SE.UTF-8";
+    LC_TELEPHONE = "sv_SE.UTF-8";
+    LC_TIME = "sv_SE.UTF-8";
   };
 
   time.timeZone = "Europe/Stockholm";
@@ -35,7 +41,7 @@
   # started in user sessions.
   # programs.mtr.enable = true;
   # programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
-
+  users.defaultUserShell = pkgs.zsh;
   programs.vscode.defaultEditor = true;
   #programs.nylas-mail.enable = true;
   programs.npm.enable = true;
@@ -66,7 +72,17 @@
   services.printing.enable = true;
 
   sound.enable = true;
-  hardware.pulseaudio.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    audio.enable = true;
+    pulse.enable = true;
+    alsa = {
+      enable = true;
+      support32Bit = true;
+    };
+    jack.enable = true;
+};
 
   services.xserver.enable = true;
   services.xserver.layout = "gb";
@@ -78,10 +94,13 @@
 
   # Enable the Hyprland Desktop Environment.
   programs.hyprland.enable = true;
+  programs.hyprland.enableNvidiaPatches = true;
+  programs.hyprland.xwayland.enable = true;
 
   # Don't forget to set a password with ‘passwd’.
   users.users.elias = {
     isNormalUser = true;
+    descriiption = "Elias Renman";
     home = "/home/elias";
     uid = 1000;
     extraGroups = [ "wheel" "networkmanager" ];
diff --git a/packages.nix b/packages.nix
index f9e8140..ef76b3c 100644
--- a/packages.nix
+++ b/packages.nix
@@ -17,7 +17,7 @@
     unar
     unzip
     dd
-
+    zsh
 
     # Build toolchains
     autoconf
@@ -37,8 +37,8 @@
 
 
     # GUI tools
-
-
+    kicad
+    xfce.thunar
 
     # Media
     ffmpeg-full
@@ -51,13 +51,17 @@
     # IDEs
     neovim
     vscode
-
+    # Hyprland deps
+    waybar
+    wofi
+    # Ricing apps
+    spotify-qt
+    cava
+    # Ricing Themes
+    tokyo-night-gtk
     # Desktop
-    
-    xmonad-with-packages
-    dmenu
-    rofi
     material-icons
+    neofetch
 
     xorg.xmodmap
     xorg.xset
@@ -71,7 +75,7 @@
     iosevka
 
     firefox
-    chromium
+    google-chrome
     alacritty
     hyprland
     ncmpcpp