diff --git a/.bin/archlinux-update b/.bin/archlinux-update
index 32bd449..4a6d37e 100755
--- a/.bin/archlinux-update
+++ b/.bin/archlinux-update
@@ -10,18 +10,28 @@ else
 fi
 
 
-echo "==================================================================="
+printf "\n=== REMOVE UNUSED PACKAGES ==========================================\n"
 
 # shellcheck disable=SC2046
 sudo pacman -Rns --noconfirm $(pacman -Qtdq)
 
-if sudo checkservices; then
-    echo "CHECKSERVICES SUCCEDEED"
-else
-    echo "CHECKSERVICES FAILED"
-    exit 1
-fi
-
-echo ""
+printf "\n=== FLATPAK UPDATE ==================================================\n"
 
 flatpak update -y
+
+printf "\n=== RUN PACDIFF =====================================================\n"
+
+if sudo pacdiff; then
+    echo "PACDIFF SUCCEDEED"
+else
+    echo "PACDIFF FAILED"
+    exit 1
+fi
+#if sudo checkservices; then
+#    echo "CHECKSERVICES SUCCEDEED"
+#else
+#    echo "CHECKSERVICES FAILED"
+#    exit 1
+#fi
+
+printf "\n\n\n\n=== DONE ============================================================\n"
diff --git a/.bin/menu-shutdown b/.bin/menu-shutdown
index 713e091..40cf2c2 100755
--- a/.bin/menu-shutdown
+++ b/.bin/menu-shutdown
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-action=$(printf "shutdown\nreboot\nlogout\nautostart" | $MENU)
+action=$(printf "shutdown\nreboot\nlogout\nautostart" | $DMENU)
 
 case "$action" in
 	shutdown)	systemctl poweroff -i ;;
diff --git a/.bin/screenshot b/.bin/screenshot
index c2fd539..b1087fe 100755
--- a/.bin/screenshot
+++ b/.bin/screenshot
@@ -2,8 +2,8 @@
 
 rclone_remote="s3-serguzim-me:public/screenshots"
 screenshot_host="https://s3.serguzim.me/public/screenshots"
-path="/tmp/screenshot.png"
-file="$(date '+%F_%H-%M-%S').png"
+path="/tmp/screenshot.webp"
+file="$(date '+%F_%H-%M-%S').webp"
 
 clip_image()
 {
diff --git a/.config/astronvim/lua/user/init.lua b/.config/astronvim/lua/user/init.lua
index 723fd70..65944ac 100644
--- a/.config/astronvim/lua/user/init.lua
+++ b/.config/astronvim/lua/user/init.lua
@@ -28,7 +28,11 @@ local config = {
 		default_theme = function(highlights) -- or a function that returns one
 			local C = require "default_theme.colors"
 
-			highlights.Normal = { fg = C.fg, bg = C.bg }
+			highlights.Normal = {
+				fg = C.fg,
+				bg = C.bg,
+				ctermbg = None
+			}
 			return highlights
 		end,
 	},
@@ -53,6 +57,10 @@ local config = {
 	-- Configure plugins
 	plugins = {
 		-- All other entries override the setup() call for default plugins
+		indent_blankline = {
+			show_current_context = true,
+			show_current_context_start = false,
+		},
 		notify = {
 			background_colour = "#000000"
 		},
diff --git a/.config/astronvim/lua/user/plugins/init.lua b/.config/astronvim/lua/user/plugins/init.lua
index 08d48d7..1986997 100644
--- a/.config/astronvim/lua/user/plugins/init.lua
+++ b/.config/astronvim/lua/user/plugins/init.lua
@@ -7,13 +7,4 @@ return {
 
 	-- Eye-Candy
 	{ "dracula/vim" },
-	{
-		"lukas-reineke/indent-blankline.nvim",
-		config = function()
-			require("indent_blankline").setup({
-					show_current_context = true,
-					show_current_context_start = true,
-				})
-		end,
-	},
 }
diff --git a/.config/environment b/.config/environment
index 5939242..896785b 100644
--- a/.config/environment
+++ b/.config/environment
@@ -23,6 +23,7 @@ export BEMENU_OPTS="--tb '#6272a4'\
  --scf '#ff79c6'\
  --list 25 --ignorecase -p ''"
 
+export DMENU="bemenu"
 export DOCKER_BUILDKIT=1
 export DRONE_SERVER='https://ci.serguzim.me'
 
@@ -42,7 +43,6 @@ export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc"
 _makeflags=$(grep -c ^processor /proc/cpuinfo)
 export MAKEFLAGS="-j$_makeflags"
 export MARKPATH="$XDG_CONFIG_HOME/zsh/jump_marks"
-export MENU="bemenu"
 
 _whoami=$(whoami)
 export NIX_PATH="$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/$_whoami/channels${NIX_PATH:+:$NIX_PATH}"
@@ -58,7 +58,8 @@ export PATH="$HOME/.local/bin:$HOME/.bin:$PATH"
 export PATH="$GOPATH/bin:$HOME/.cargo/bin:$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
 export PS1='\$ '
 
-export QT_QPA_PLATFORM="wayland;xcb"
+#export QT_QPA_PLATFORM="wayland;xcb"
+export QT_QPA_PLATFORM="xcb"
 export QT_QPA_PLATFORMTHEME="qt5ct"
 
 #export SDL_VIDEODRIVER="wayland"
@@ -81,6 +82,8 @@ export ZSH="$ZDOTDIR/oh-my-zsh"
 [ -x "$(command -v moar)" ] && export MANPAGER="moar"
 [ -x "$(command -v moar)" ] && export PAGER="moar"
 
+[ -x "$(command -v gpgconf)" ] && export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+
 [ -x "$(command -v home-manager)" ] \
 	&& [ -x "$(command -v nix)" ] \
 	&& [ -f "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ] \
diff --git a/.config/git/ignore b/.config/git/ignore
index 2c12b34..394caac 100644
--- a/.config/git/ignore
+++ b/.config/git/ignore
@@ -19,6 +19,7 @@
 
 # Javascript
 /node_modules/
+.npmrc
 
 # PHP
 /vendor/
diff --git a/.config/nixpkgs/common.nix b/.config/nixpkgs/common.nix
index 421e92f..eee51f0 100644
--- a/.config/nixpkgs/common.nix
+++ b/.config/nixpkgs/common.nix
@@ -11,12 +11,17 @@
     git # git
     gitflow # tool for git workflow
     git-lfs # git support for large files
+    #git-secret # tool for secrets in git (gpg based)
     jq # tool for JSON
     moar # moar is less
     nix-direnv # allow better nix and direnv integration
+    neovim # alternative to vim
+    libnotify # allows sending notifications
+    lsof # who uses that drive/directory
     openssh # ssh client and server
     pass # password-store
     playerctl # control media players
+    p7zip # tool to extract 7z archives
     rclone # tool for remote storages
     restic # backup tool
     ripgrep # grep-alternative
@@ -27,6 +32,7 @@
     tokei # project-language statistics
     unzip # unzip
     vimHugeX # vim with clipboard support
+    xdg-user-dirs # tool manage user directories
     yq # tool for YAML
     yt-dlp # tool to download videos from the internet
     zip # zip
@@ -46,4 +52,6 @@
   programs.home-manager.enable = true;
 
   targets.genericLinux.enable = true;
+
+  nixpkgs.config.allowUnfree = true;
 }
diff --git a/.config/nixpkgs/graphical.nix b/.config/nixpkgs/graphical.nix
index cf25185..7f4d99e 100644
--- a/.config/nixpkgs/graphical.nix
+++ b/.config/nixpkgs/graphical.nix
@@ -12,17 +12,25 @@
     dunst # notification-daemon
     feh # image viewer and wallpaper-tool
     flameshot # screenshot tool
+    gspell # spell highlighting for gtk applications
     helvum # Pipewire GUI
     j4-dmenu-desktop # collects .desktop files for a menu
+    keepassxc # password manager
+    libsForQt5.kdeconnect-kde # tool to connect a phone to the computer
     parcellite # clipboard-manager
     pavucontrol # Pulseaudio GUI
     polybar # desktop bar
+    #python310Packages.adblock # pylib for adblocking in qutebrowser
+    #python310Packages.pynacl # pylib for qutebrowser-keepassxc support
+    #(qutebrowser.override { enableWideVine = true; }) # vim-like browser
     solaar # Logitech tool
     sxhkd # hotkey daemon
     #vagrant # tool for automated virtual machines
     #virtualbox # tool for virtual machines
     xclip # clipboard CLI for X
+    xcompmgr # compositor for X
     xfce.thunar # file manager
     xfce.tumbler # thumbnail tool
+    xorg.xsetroot # tool to set x background stuff
   ];
 }
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index e1c644d..df17702 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -8,7 +8,7 @@ super + Return
 
 # program launcher
 super + d
-	j4-dmenu-desktop --dmenu="$MENU"
+	j4-dmenu-desktop --dmenu="$DMENU"
     #LANG=C rofi -show
 
 # make sxhkd reload its configuration files: