diff --git a/home-manager/features/desktop/dwm/.xinitrc b/home-manager/features/desktop/dwm/.xinitrc
index 8a49e53..300c35f 100755
--- a/home-manager/features/desktop/dwm/.xinitrc
+++ b/home-manager/features/desktop/dwm/.xinitrc
@@ -76,7 +76,7 @@ xset s 900 &
 
 # auths
 # /usr/lib/mate-polkit/polkit-mate-authentication-agent-1 &
-gnome-keyring-daemon &
+# gnome-keyring-daemon &
 # source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh
 
 ## Map super key to trigger rofi when used alone
diff --git a/home-manager/features/desktop/dwm/betterlockscreen.nix b/home-manager/features/desktop/dwm/betterlockscreen.nix
new file mode 100644
index 0000000..3512c92
--- /dev/null
+++ b/home-manager/features/desktop/dwm/betterlockscreen.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  services.betterlockscreen = {
+    enable = true;
+    package = pkgs.unstable.betterlockscreen;
+
+  };
+}
diff --git a/home-manager/features/desktop/dwm/default.nix b/home-manager/features/desktop/dwm/default.nix
index 92bed5b..79e15de 100644
--- a/home-manager/features/desktop/dwm/default.nix
+++ b/home-manager/features/desktop/dwm/default.nix
@@ -7,6 +7,8 @@
   imports = [
     ./picom.nix
     ./rofi.nix
+    ./flameshot.nix
+    ./betterlockscreen.nix
   ];
 
   home.packages = with pkgs; [
@@ -14,13 +16,14 @@
     st
     dunst
     xss-lock
-    flameshot
     xdg-desktop-portal-gtk
     xorg.xrdb
     xorg.xrandr
     xorg.xset
     xorg.xsetroot
     xorg.setxkbmap
+    xorg.xbacklight
+    brightnessctl
     xclip
     gnome.gnome-keyring
     feh
@@ -28,6 +31,15 @@
     kde-gruvbox
     gruvbox-dark-icons-gtk
     alsaUtils
+    nemo
+    pulseaudioFull
+    arandr
+    neomutt
+    ncmpcpp
+    ncspot
+    ncpamixer
+    lf
+    qt5ct
   ];
 
   home.file = {
diff --git a/home-manager/features/desktop/dwm/flameshot.nix b/home-manager/features/desktop/dwm/flameshot.nix
new file mode 100644
index 0000000..7f6749f
--- /dev/null
+++ b/home-manager/features/desktop/dwm/flameshot.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  services.flameshot = {
+    enable = true;
+    settings = {
+      showStartupLaunchMessage = false;
+    };
+  };
+}
diff --git a/home-manager/features/kitty.nix b/home-manager/features/kitty.nix
index 7e05fa3..882da61 100644
--- a/home-manager/features/kitty.nix
+++ b/home-manager/features/kitty.nix
@@ -7,5 +7,13 @@
     };
 
     theme = "Gruvbox Dark";
+    
+    settings = {
+      confirm_os_window_close = 0;
+      detect_urls = true;
+      enable_audio_bell = false;
+      resize_in_steps = true;
+      # window_padding_width = 16;
+    };
   };
 }
diff --git a/home-manager/features/neovide.nix b/home-manager/features/neovide.nix
new file mode 100644
index 0000000..9b404d5
--- /dev/null
+++ b/home-manager/features/neovide.nix
@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    neovide
+  ];
+
+  home.file = {
+    ".config/neovide/config.toml" = {
+      text = ''
+        vsync = true
+
+        [font]
+        normal = ["FiraCode Nerd Font"]
+        size = 14
+      '';
+    };
+  };
+}
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 33145c2..e648f91 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -23,6 +23,7 @@
     ./features/kitty.nix
     ./features/neovim.nix
     ./features/tmux.nix
+    ./features/neovide.nix
   ];
 
   nixpkgs = {
@@ -115,7 +116,6 @@
     libreoffice-fresh
     # vscodium
     vscode
-    neovide
     lunarvim
     evolution
     rstudio
@@ -137,7 +137,14 @@
     boost
   ]);
 
-  services.gnome-keyring.enable = true;
+  services.gnome-keyring = {
+    enable = true;
+    components = [
+      "ssh"
+      "secrets"
+      "pkcs11"
+    ];
+  };
     
   home.sessionVariables = {
      EDITOR = "nvim";
diff --git a/hosts/thor/gui.nix b/hosts/thor/gui.nix
index 0da2b82..808cb3a 100644
--- a/hosts/thor/gui.nix
+++ b/hosts/thor/gui.nix
@@ -25,7 +25,12 @@
       dwm = {
         enable = true;
         package = pkgs.dwm.overrideAttrs {
-          src = /home/mike/Projects/dwm;
+          src = pkgs.fetchFromGitHub {
+            owner = "eRgo35";
+            repo = "dwm";
+            rev = "a1725eb3c64d27864972a976c8ee18d63a8d9dad";
+            sha256 = "sha256-sY6qFqfkfGtLmi+7mownx3bolM2mVNdhS9VUO6KimKk="; 
+          };
         };
       };
     };
diff --git a/hosts/zion/gui.nix b/hosts/zion/gui.nix
index 203bf69..1852a2f 100644
--- a/hosts/zion/gui.nix
+++ b/hosts/zion/gui.nix
@@ -34,7 +34,12 @@
       dwm = {
         enable = true;
         package = pkgs.dwm.overrideAttrs {
-          src = /home/mike/Projects/dwm;
+          src = pkgs.fetchFromGitHub {
+            owner = "eRgo35";
+            repo = "dwm";
+            rev = "a1725eb3c64d27864972a976c8ee18d63a8d9dad";
+            sha256 = "sha256-sY6qFqfkfGtLmi+7mownx3bolM2mVNdhS9VUO6KimKk="; 
+          };
         };
       };
     };