diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 10af905..682a872 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -1,11 +1,5 @@
 # Text Editor
 set -x EDITOR nvim
-# ZFS GRUB
-set -x ZPOOL_VDEV_NAME_PATH 1
-
-# Compiler
-set -x CC /usr/bin/clang
-set -x CXX /usr/bin/clang++
 
 # Man colors
 set -g man_standout -o blue
@@ -13,26 +7,13 @@ set -g man_bold -o magenta
 
 # Aliases
 alias f "fff"
-alias xa "xbps-install -S"
-alias xu "xbps-install -Su"
-alias xc "xbps-remove -o"
-alias xr "xbps-remove -Rf"
-alias xq "xbps-query -Rs"
-alias wlan "iw dev wlp2s0 scan | grep SSID"
+alias wlan "iw dev wlp4s0 scan | grep SSID"
 alias bc "bc -l"
 alias vim "nvim"
-alias docker "podman"
 alias docker-compose "podman-compose"
 
 # Additional paths
-set PATH /opt/texlive/2020/bin/x86_64-linux/ /bin /usr/bin /usr/local/bin /usr/local/sbin /usr/sbin /sbin
-set PATH $PATH /$HOME/.local/bin
-set PATH $PATH /$HOME/.local/share/go/bin
-set PATH $PATH /$HOME/.emacs.d/bin
-
-# Go workspace
-set -x GOPATH $HOME/.local/share/go/
-
+set PATH $PATH $HOME/.emacs.d/bin
 
 # fff colors [0-9]
 set -x FFF_COL1 4
@@ -42,3 +23,6 @@ set -x FFF_FAV1 $HOME/Documents/Uni
 set -x FFF_FAV2 $HOME/Documents/Papers
 set -x FFF_FAV3 $HOME/Documents/Books/Academic
 set -x FFF_FAV4 $HOME/Documents/Education
+
+# Set up direnv
+eval (direnv hook fish)
diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish
index e7cdbc2..e8676c8 100644
--- a/fish/.config/fish/functions/fish_prompt.fish
+++ b/fish/.config/fish/functions/fish_prompt.fish
@@ -12,6 +12,10 @@ function _git_dirty
 end
 
 function fish_prompt
+  if test $TERM = "dumb"
+    echo "\$ "
+    return 0
+  end
   set -l yellow (set_color yellow)
   set -l green (set_color green)
   set -l normal (set_color normal)
diff --git a/fonts/.config/fontconfig/fonts.conf b/fonts/.config/fontconfig/fonts.conf
deleted file mode 100644
index ddb55cd..0000000
--- a/fonts/.config/fontconfig/fonts.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
-<fontconfig>
-
-    <dir>~/.fonts</dir>
-
-    <!--    do not use the embedded bitmap instead of the outline
-        <https://www.freebsd.org/cgi/man.cgi?query=fonts-conf&sektion=5&manpath=FreeBSD+and+Ports>
-        <https://bbs.archlinux.org/viewtopic.php?id=161609> post 2 (2013)
-        <https://redd.it/7kqr5l> (2017) -->
-    <match target="font">
-        <edit name="embeddedbitmap" mode="assign">
-            <bool>false</bool>
-        </edit>
-    </match>
-
-    <!--    prefer outline e.g. TrueType instead of bitmap fonts
-        <https://bbs.archlinux.org/viewtopic.php?id=161609> post 2 (2013)
-        <https://redd.it/4tb2dt> (2016) -->
-    <match target="font">
-        <edit name="prefer_outline">
-            <bool>true</bool>
-        </edit>
-    </match>
-
-    <!--    reject bitmap fonts, except Ohsnapu - prefer PostScript, TrueType et cetera
-        <https://forums.freebsd.org/threads/howto-nice-fonts.2021/> (2009)
-        <https://redd.it/4tb2dt> (2016) -->
-    <selectfont>
-        <acceptfont>
-            <pattern>
-                <patelt name="family">
-                    <string>Siji</string>
-                </patelt>
-            </pattern>
-        </acceptfont>
-        <acceptfont>
-            <pattern>
-                <patelt name="family">
-                    <string>cherry</string>
-                </patelt>
-            </pattern>
-        </acceptfont>
-        <rejectfont>
-            <pattern>
-                <patelt name="scalable">
-                    <bool>false</bool>
-                </patelt>
-            </pattern>
-        </rejectfont>
-    </selectfont>
-
-</fontconfig>
diff --git a/git/.config/git/global_gitignore b/git/.config/git/global_gitignore
index be9b810..eb1b0e9 100644
--- a/git/.config/git/global_gitignore
+++ b/git/.config/git/global_gitignore
@@ -18,3 +18,6 @@ obj/
 .mypy_cache
 # Emacs
 .dir-locals.el
+# Dev environment with Nix
+.envrc
+.mysql
diff --git a/gpg/.gnupg/gpg-agent.conf b/gpg/.gnupg/gpg-agent.conf
new file mode 100644
index 0000000..3d395da
--- /dev/null
+++ b/gpg/.gnupg/gpg-agent.conf
@@ -0,0 +1,5 @@
+# Increase password cache to 24H
+max-cache-ttl 60480000
+default-cache-ttl 60480000
+# Allow piped input
+allow-loopback-pinentry
diff --git a/gtk/.config/gtk-3.0/bookmarks b/gtk/.config/gtk-3.0/bookmarks
new file mode 100644
index 0000000..21a71f1
--- /dev/null
+++ b/gtk/.config/gtk-3.0/bookmarks
@@ -0,0 +1,8 @@
+file:///home/coolneng/Documents
+file:///home/coolneng/Documents/Archive-uni/Third-year
+file:///home/coolneng/Photos/GIFs
+file:///home/coolneng/Photos/MuisLata
+file:///home/coolneng/Photos/Rehiwi
+file:///home/coolneng/Photos/NPC
+file:///home/coolneng/Photos/Memri
+file:///home/coolneng/Photos/Random%20dump
diff --git a/imapnotify/.config/imapnotify/gmail.js b/imapnotify/.config/imapnotify/gmail.js
index ffd5e53..d3407d6 100644
--- a/imapnotify/.config/imapnotify/gmail.js
+++ b/imapnotify/.config/imapnotify/gmail.js
@@ -10,6 +10,6 @@ exports.port = 993;
 exports.tls = true;
 exports.username = "akasroua@gmail.com";
 exports.password = getStdout("pass mail/gmail");
-exports.onNewMail = "/bin/mbsync gmail"
-exports.onNewMailPost = "/bin/notmuch new"
+exports.onNewMail = "mbsync gmail"
+exports.onNewMailPost = "notmuch new"
 exports.boxes = [ "INBOX"];
diff --git a/imapnotify/.config/imapnotify/uni.js b/imapnotify/.config/imapnotify/uni.js
index b2e9b54..c4ec9d8 100644
--- a/imapnotify/.config/imapnotify/uni.js
+++ b/imapnotify/.config/imapnotify/uni.js
@@ -10,6 +10,6 @@ exports.port = 993;
 exports.tls = true;
 exports.username = "akasroua@correo.ugr.es";
 exports.password = getStdout("pass mail/uni");
-exports.onNewMail = "/bin/mbsync uni"
-exports.onNewMailPost = "/bin/notmuch new"
+exports.onNewMail = "mbsync uni"
+exports.onNewMailPost = "notmuch new"
 exports.boxes = [ "INBOX"];
diff --git a/kanshi/.config/kanshi/config b/kanshi/.config/kanshi/config
index 4aac450..4899c75 100644
--- a/kanshi/.config/kanshi/config
+++ b/kanshi/.config/kanshi/config
@@ -4,5 +4,5 @@
 }
 
 {
-	output eDP-1 enable mode 1366x768
+	output eDP-1 enable mode 1920x1080
 }
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 4ac0c28..259c420 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -23,7 +23,7 @@ bold_italic_font Go Mono Bold Italic
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-font_size 11.0
+font_size 14.0
 
 #: Font size (in pts)
 
diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 0aa8f09..6d2467f 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -2,7 +2,7 @@
 IMAPAccount gmail
 Host imap.gmail.com
 User akasroua@gmail.com
-PassCmd "/bin/pass mail/gmail"
+PassCmd "pass mail/gmail"
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
@@ -45,7 +45,7 @@ SyncState *
 IMAPAccount uni
 Host correo.ugr.es
 User akasroua@correo.ugr.es
-PassCmd "/bin/pass mail/uni"
+PassCmd "pass mail/uni"
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
diff --git a/mime/.config/mimeapps.list b/mime/.config/mimeapps.list
index 0e16949..51abf7f 100644
--- a/mime/.config/mimeapps.list
+++ b/mime/.config/mimeapps.list
@@ -1,29 +1,8 @@
-[Default Applications]
-x-scheme-handler/http=userapp-Firefox-N1ZR6Z.desktop
-x-scheme-handler/https=userapp-Firefox-N1ZR6Z.desktop
-x-scheme-handler/ftp=userapp-Firefox-N1ZR6Z.desktop
-x-scheme-handler/chrome=userapp-Firefox-N1ZR6Z.desktop
-text/html=userapp-Firefox-N1ZR6Z.desktop
-application/x-extension-htm=userapp-Firefox-N1ZR6Z.desktop
-application/x-extension-html=userapp-Firefox-N1ZR6Z.desktop
-application/x-extension-shtml=userapp-Firefox-N1ZR6Z.desktop
-application/xhtml+xml=userapp-Firefox-N1ZR6Z.desktop
-application/x-extension-xhtml=userapp-Firefox-N1ZR6Z.desktop
-application/x-extension-xht=userapp-Firefox-N1ZR6Z.desktop
-application/pdf=org.pwmt.zathura-pdf-poppler.desktop
-application/lrf=calibre-lrfviewer.desktop
 
-[Added Associations]
-x-scheme-handler/http=userapp-Firefox-N1ZR6Z.desktop;
-x-scheme-handler/https=userapp-Firefox-N1ZR6Z.desktop;
-x-scheme-handler/ftp=userapp-Firefox-N1ZR6Z.desktop;
-x-scheme-handler/chrome=userapp-Firefox-N1ZR6Z.desktop;
-text/html=userapp-Firefox-N1ZR6Z.desktop;
-application/x-extension-htm=userapp-Firefox-N1ZR6Z.desktop;
-application/x-extension-html=userapp-Firefox-N1ZR6Z.desktop;
-application/x-extension-shtml=userapp-Firefox-N1ZR6Z.desktop;
-application/xhtml+xml=userapp-Firefox-N1ZR6Z.desktop;
-application/x-extension-xhtml=userapp-Firefox-N1ZR6Z.desktop;
-application/x-extension-xht=userapp-Firefox-N1ZR6Z.desktop;
-text/csv=libreoffice-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;
+[Default Applications]
+application/pdf=org.pwmt.zathura.desktop
+text/html=firefox.desktop
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+x-scheme-handler/about=firefox.desktop
+x-scheme-handler/unknown=firefox.desktop
diff --git a/mpd/.config/ncmpcpp/config b/mpd/.config/ncmpcpp/config
index db578ea..9a017d6 100644
--- a/mpd/.config/ncmpcpp/config
+++ b/mpd/.config/ncmpcpp/config
@@ -10,7 +10,7 @@ color1 = "magenta"
 color2 = "cyan" 
 main_window_color = "cyan" 
 state_line_color = "black"
-statusbar_color = "black"
+statusbar_color = "cyan"
 progressbar_color = "magenta"
 progressbar_elapsed_color = "cyan"
 current_item_prefix = "$(red)$r"
@@ -20,14 +20,12 @@ alternative_ui_separator_color = "black"
 # Settings
 autocenter_mode = "yes"
 header_visibility = "no" 
-statusbar_visibility = "no"
+statusbar_visibility = "yes"
 cyclic_scrolling = "yes"
 titles_visibility = "no"
 display_bitrate = "yes"
 playlist_separate_albums = "no"
 ask_before_clearing_playlists = "no"
-visualizer_type = "ellipse"
-visualizer_fifo_path = "/tmp/mpd.fifo"
 
 # Playlist
 user_interface = "alternative"
@@ -39,26 +37,4 @@ song_columns_list_format = "(5)[]{} (20)[red]{a} (26)[white]{t|f} (44)[blue]{b}
 alternative_header_second_line_format = "$6{%a} $b$8-$9 $4{%b}$9"
 now_playing_prefix = "$b$4>$5> "
 now_playing_suffix = "$2$/b$2"
-
-# Progressbars to use.
-# This section works as
-# a clipboard so no need
-# to hunt these down from
-# the web.
-
-#progressbar_look = "░█ "
-#progressbar_look = "=>"
-#progressbar_look = "─- "
-#progressbar_look = "▒▒░"
-#progressbar_look = "┅┅┄"
-#progressbar_look = "─⊙┄"
-#progressbar_look = "─➞─"
 progressbar_look = "─┅─"
-#progressbar_look = "▪▪▪"
-#progressbar_look = "▪▪▫"
-#progressbar_look = "───"
-#progressbar_look = "▁▁▁"
-#progressbar_look = "‒‒‒"
-#progressbar_look = "■◣ "
-#progressbar_look = "◈◆◇"
-#progressbar_look = "→→"
diff --git a/mpv/.config/mpv/mpv.conf b/mpv/.config/mpv/mpv.conf
index a6f8e92..ce4e14f 100644
--- a/mpv/.config/mpv/mpv.conf
+++ b/mpv/.config/mpv/mpv.conf
@@ -9,7 +9,7 @@ vo=gpu
 volume-max=200
 af=acompressor
 ## Youtube-dl settings
-ytdl-format=bestvideo[height<=?720][vcodec!=vp9]+bestaudio/best
+ytdl-format=bestvideo[height<=?1080][vcodec!=vp9]+bestaudio/best
 ## Wayland
 gpu-context=wayland
 ## Default window size
diff --git a/neomutt/.config/neomutt/accounts/uni.muttrc b/neomutt/.config/neomutt/accounts/uni.muttrc
index 4139c1c..52352cc 100644
--- a/neomutt/.config/neomutt/accounts/uni.muttrc
+++ b/neomutt/.config/neomutt/accounts/uni.muttrc
@@ -13,6 +13,7 @@ set mbox_type = Maildir
 set ssl_starttls = yes
 set ssl_force_tls = yes
 
+set record = "+sent"
 bind index,pager gg noop
 bind index,pager g noop
 bind index gg first-entry
diff --git a/neomutt/.config/neomutt/etc/mailcap b/neomutt/.config/neomutt/etc/mailcap
index 30d19d3..f8af373 100644
--- a/neomutt/.config/neomutt/etc/mailcap
+++ b/neomutt/.config/neomutt/etc/mailcap
@@ -1,6 +1,6 @@
 text/html; w3m -I %{charset} -T text/html %s; copiousoutput;
-text/* ; vim %s ; edit=vim %s ; compose=vim %s ; needsterminal
-image/*; sxiv %s ; copiousoutput
+text/* ; nvim %s ; edit=nvim %s ; compose=nvim %s ; needsterminal
+image/*; imv %s ; copiousoutput
 application/pdf; zathura %s ;
 application/vnd.openxmlformats-officedocument.wordprocessingml.document; libreoffice %s ;
 application/pgp-encrypted; gpg -d '%s'; copiousoutput;
diff --git a/neomutt/.config/neomutt/etc/sendmail b/neomutt/.config/neomutt/etc/sendmail
index db59d9e..9ea6108 100755
--- a/neomutt/.config/neomutt/etc/sendmail
+++ b/neomutt/.config/neomutt/etc/sendmail
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-./.local/bin/MIMEmbellish | msmtp -a $1 -t
+nix-shell -p python37
+python ~/.local/bin/MIMEmbellish | msmtp -a $1 -t
diff --git a/neomutt/.local/bin/MIMEmbellish b/neomutt/.local/bin/MIMEmbellish
index b3b4596..1c8199e 100755
--- a/neomutt/.local/bin/MIMEmbellish
+++ b/neomutt/.local/bin/MIMEmbellish
@@ -1,4 +1,4 @@
-#!/bin/python3
+#!/usr/bin/env python
 
 import re
 import sys
diff --git a/neovim/.config/nvim/UltiSnips/markdown.snippets b/neovim/.config/nvim/UltiSnips/markdown.snippets
index fabf771..c81191c 100644
--- a/neovim/.config/nvim/UltiSnips/markdown.snippets
+++ b/neovim/.config/nvim/UltiSnips/markdown.snippets
@@ -86,15 +86,3 @@ snippet	dp "Slide notes"
 
 # Diapo $1
 endsnippet
-
-snippet jsign "JITKey signature"
-Para cualquier consulta estamos a tu disposición!
-
-Un saludo
-endsnippet
-
-snippet jhi "JITKey greeting"
-Hola $1,
-
-Muchas gracias por reservar nuestro apartamento!
-endsnippet
diff --git a/rofi/.local/share/rofi/finder.sh b/rofi/.local/share/rofi/finder.sh
index c5b5860..8f9875b 100755
--- a/rofi/.local/share/rofi/finder.sh
+++ b/rofi/.local/share/rofi/finder.sh
@@ -27,9 +27,9 @@ then
   then
     while read -r line; do
       echo "$line" \?\?
-    done <<< $(fd -e pdf -i "${QUERY#\?}" $HOME/Documents/Uni 2>&1 | grep -v 'Permission denied\|Input/output error')
+    done <<< $(fd "${QUERY#\?}" $HOME/Documents 2>&1 | grep -v 'Permission denied\|Input/output error')
   else
-    fd -e pdf -i "${QUERY#!}" $HOME/Documents/Uni 2>&1 | grep -v 'Permission denied\|Input/output error'
+    fd "${QUERY#!}" $HOME/Documents 2>&1 | grep -v 'Permission denied\|Input/output error'
   fi
 else
   echo "!!-- Type your search query to find files"
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 8562e2b..ede2932 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -4,6 +4,12 @@ host zion
     port 22
     identityfile ~/.ssh/zion
 
+host localhost
+    user root
+    hostname localhost
+    port 22
+    identityfile ~/.ssh/localhost
+
 host prodyfo
     user ec2-user
     hostname ec2-52-47-172-241.eu-west-3.compute.amazonaws.com    
@@ -15,9 +21,3 @@ host devyfo
     hostname ec2-35-181-115-141.eu-west-3.compute.amazonaws.com    
     port 22
     identityfile ~/.ssh/odyfo
-
-host nixyfo
-    user coolneng
-    hostname ec2-35-181-61-130.eu-west-3.compute.amazonaws.com    
-    port 22
-    identityfile ~/.ssh/odyfo
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index b7030a7..05fbde6 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -18,12 +18,12 @@ set $term kitty
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
-set $menu /bin/rofi -show drun | xargs swaymsg exec --
+set $menu rofi -show drun | xargs swaymsg exec --
 
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg ~/Photos/Wallpapers/d2a0wsarpmx21.jpg fill
+output * bg ~/Photos/Wallpapers/wallhaven-47zo73.jpg fill
 #
 # Example configuration:
 #
@@ -58,141 +58,141 @@ output * bg ~/Photos/Wallpapers/d2a0wsarpmx21.jpg fill
 #
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
-    # Keyboard layout
-    input * xkb_layout "es"
+# Keyboard layout
+input * xkb_layout "es"
 
-    # Touchpad settings
-    input "1739:29859:Synaptics_TM2985-009" {
-       dwt enabled
-       tap enabled
-       natural_scroll enabled
-       middle_emulation enabled
-    }
+# Touchpad settings
+input "2:7:SynPS/2_Synaptics_TouchPad" {
+    dwt enabled
+    tap enabled
+    natural_scroll enabled
+    middle_emulation enabled
+}
 
 ### Key bindings
 #
 # Basics:
 #
-    # Start a terminal
-    bindsym $mod+Return exec $term
+# Start a terminal
+bindsym $mod+Return exec $term
 
-    # Kill focused window
-    bindsym $mod+w kill
+# Kill focused window
+bindsym $mod+w kill
 
-    # Start your launcher
-    bindsym $mod+d exec $menu
+# Start your launcher
+bindsym $mod+d exec $menu
 
-    # Drag floating windows by holding down $mod and left mouse button.
-    # Resize them with right mouse button + $mod.
-    # Despite the name, also works for non-floating windows.
-    # Change normal to inverse to use left mouse button for resizing and right
-    # mouse button for dragging.
-    floating_modifier $mod normal
+# Drag floating windows by holding down $mod and left mouse button.
+# Resize them with right mouse button + $mod.
+# Despite the name, also works for non-floating windows.
+# Change normal to inverse to use left mouse button for resizing and right
+# mouse button for dragging.
+floating_modifier $mod normal
 
-    # Reload the configuration file
-    bindsym $mod+Shift+c reload
+# Reload the configuration file
+bindsym $mod+Shift+c reload
 
-    # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+# Exit sway (logs you out of your Wayland session)
+bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
 #
 # Moving around:
 #
-    # Move your focus around
-    #bindsym $mod+$left focus left
-    #bindsym $mod+$down focus down
-    #bindsym $mod+$up focus up
-    #bindsym $mod+$right focus right
-    # Or use $mod+[up|down|left|right]
-    bindsym $mod+Left focus left
-    bindsym $mod+Down focus down
-    bindsym $mod+Up focus up
-    bindsym $mod+Right focus right
+# Move your focus around
+#bindsym $mod+$left focus left
+#bindsym $mod+$down focus down
+#bindsym $mod+$up focus up
+#bindsym $mod+$right focus right
+# Or use $mod+[up|down|left|right]
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
 
-    # Move the focused window with the same, but add Shift
-    #bindsym $mod+Shift+$left move left
-    #bindsym $mod+Shift+$down move down
-    #bindsym $mod+Shift+$up move up
-    #bindsym $mod+Shift+$right move right
-    # Ditto, with arrow keys
-    #bindsym $mod+Shift+Left move left
-    #bindsym $mod+Shift+Down move down
-    #bindsym $mod+Shift+Up move up
-    #bindsym $mod+Shift+Right move right
+# Move the focused window with the same, but add Shift
+#bindsym $mod+Shift+$left move left
+#bindsym $mod+Shift+$down move down
+#bindsym $mod+Shift+$up move up
+#bindsym $mod+Shift+$right move right
+# Ditto, with arrow keys
+#bindsym $mod+Shift+Left move left
+#bindsym $mod+Shift+Down move down
+#bindsym $mod+Shift+Up move up
+#bindsym $mod+Shift+Right move right
 #
 # Workspaces:
 #
-    # Workspace names
-    set $workspace1 "1: "
-    set $workspace2 "2: "
-    set $workspace3 "3: "
-    set $workspace4 "4: "
-    set $workspace5 "5: "
-    set $workspace6 "6: "
-    #set $workspace7 "7: "
-    #set $workspace8 "8: "
-    #set $workspace9 "9: "
-    #set $workspace10 "10: "
-    # Switch to workspace
-    bindsym $mod+1 workspace $workspace1
-    bindsym $mod+2 workspace $workspace2
-    bindsym $mod+3 workspace $workspace3
-    bindsym $mod+4 workspace $workspace4
-    bindsym $mod+5 workspace $workspace5
-    bindsym $mod+6 workspace $workspace6
-    #bindsym $mod+7 workspace $workspace7
-    #bindsym $mod+8 workspace $workspace8
-    #bindsym $mod+9 workspace $workspace9
-    #bindsym $mod+0 workspace $workspace10
-    # Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace $workspace1
-    bindsym $mod+Shift+2 move container to workspace $workspace2
-    bindsym $mod+Shift+3 move container to workspace $workspace3
-    bindsym $mod+Shift+4 move container to workspace $workspace4
-    bindsym $mod+Shift+5 move container to workspace $workspace5
-    bindsym $mod+Shift+6 move container to workspace $workspace6
-    #bindsym $mod+Shift+7 move container to workspace $workspace7
-    #bindsym $mod+Shift+8 move container to workspace $workspace8
-    #bindsym $mod+Shift+9 move container to workspace $workspace9
-    #bindsym $mod+Shift+0 move container to workspace $workspace10
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
+# Workspace names
+set $workspace1 "1: "
+set $workspace2 "2: "
+set $workspace3 "3: "
+set $workspace4 "4: "
+set $workspace5 "5: "
+set $workspace6 "6: "
+#set $workspace7 "7: "
+#set $workspace8 "8: "
+#set $workspace9 "9: "
+#set $workspace10 "10: "
+# Switch to workspace
+bindsym $mod+1 workspace $workspace1
+bindsym $mod+2 workspace $workspace2
+bindsym $mod+3 workspace $workspace3
+bindsym $mod+4 workspace $workspace4
+bindsym $mod+5 workspace $workspace5
+bindsym $mod+6 workspace $workspace6
+#bindsym $mod+7 workspace $workspace7
+#bindsym $mod+8 workspace $workspace8
+#bindsym $mod+9 workspace $workspace9
+#bindsym $mod+0 workspace $workspace10
+# Move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace $workspace1
+bindsym $mod+Shift+2 move container to workspace $workspace2
+bindsym $mod+Shift+3 move container to workspace $workspace3
+bindsym $mod+Shift+4 move container to workspace $workspace4
+bindsym $mod+Shift+5 move container to workspace $workspace5
+bindsym $mod+Shift+6 move container to workspace $workspace6
+#bindsym $mod+Shift+7 move container to workspace $workspace7
+#bindsym $mod+Shift+8 move container to workspace $workspace8
+#bindsym $mod+Shift+9 move container to workspace $workspace9
+#bindsym $mod+Shift+0 move container to workspace $workspace10
+# Note: workspaces can have any name you want, not just numbers.
+# We just use 1-10 as the default.
 #
 # Layout stuff:
 #
-    # You can "split" the current object of your focus with
-    # $mod+b or $mod+v, for horizontal and vertical splits
-    # respectively.
-    bindsym $mod+b splith
-    bindsym $mod+v splitv
+# You can "split" the current object of your focus with
+# $mod+b or $mod+v, for horizontal and vertical splits
+# respectively.
+bindsym $mod+b splith
+bindsym $mod+v splitv
 
-    # Switch the current container between different layout styles
-    bindsym $mod+s layout stacking
-    bindsym $mod+t layout tabbed
-    bindsym $mod+e layout Make toggle
+# Switch the current container between different layout styles
+bindsym $mod+s layout stacking
+bindsym $mod+t layout tabbed
+bindsym $mod+e layout Make toggle
 
-    # split the current focus fullscreen
-    #bindsym $mod+f fullscreen
+# split the current focus fullscreen
+#bindsym $mod+f fullscreen
 
-    # Toggle the current focus between tiling and floating mode
-    bindsym $mod+Shift+space floating toggle
+# Toggle the current focus between tiling and floating mode
+bindsym $mod+Shift+space floating toggle
 
-    # Swap focus between the tiling area and the floating area
-    bindsym $mod+space focus mode_toggle
+# Swap focus between the tiling area and the floating area
+bindsym $mod+space focus mode_toggle
 
-    # Move focus to the parent container
-    bindsym $mod+a focus parent
+# Move focus to the parent container
+bindsym $mod+a focus parent
 #
 # Scratchpad:
 #
-    # Sway has a "scratchpad", which is a bag of holding for windows.
-    # You can send windows there and get them back later.
+# Sway has a "scratchpad", which is a bag of holding for windows.
+# You can send windows there and get them back later.
 
-    # Move the currently focused window to the scratchpad
-    bindsym $mod+Shift+minus move scratchpad
+# Move the currently focused window to the scratchpad
+bindsym $mod+Shift+minus move scratchpad
 
-    # Show the next scratchpad window or hide the focused scratchpad window.
-    # If there are multiple scratchpad windows, this command cycles through them.
-    bindsym $mod+minus scratchpad show
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+bindsym $mod+minus scratchpad show
 #
 # Resizing containers:
 #
@@ -248,38 +248,39 @@ exec swaymsg split vertical
 #
 # Special keys
 #
-    # Volume
-    bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5%
-    bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5%
-    bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle
-    # Brightness
-    bindsym XF86MonBrightnessUp exec brillo -A 10
-    bindsym XF86MonBrightnessDown exec brillo -U 10
-    # Media control
-    bindsym XF86AudioPlay exec mpc toggle
-    bindsym XF86AudioStop exec mpc stop
-    bindsym XF86AudioNext exec mpc next
-    bindsym XF86AudioPrev exec mpc prev
+# Volume
+bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5%
+bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5%
+bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle
+bindsym XF86AudioMicMute exec pactl set-source-mute 1 toggle
+# Brightness
+bindsym XF86MonBrightnessUp exec light -A 10
+bindsym XF86MonBrightnessDown exec light -U 10
+# Media control
+bindsym XF86Tools exec mpc toggle
+bindsym XF86Search exec mpc stop
+bindsym XF86LaunchA exec mpc prev
+bindsym XF86Explorer exec mpc next
 
 #
 # Program keybindings
 #
-    # clipman
-    bindsym $mod+c exec clipman pick -t rofi
-    # grim
-    bindsym Print exec grim
-    # slurp + grim to clipboard
-    bindsym Shift+Print exec slurp | grim -g - - | wl-copy
-    # find PDFs with rofi
-    bindsym $mod+f exec rofi -show find -modi find:~/.local/share/rofi/finder.sh
+# clipman
+bindsym $mod+c exec clipman pick -t rofi
+# grim
+bindsym Print exec grim
+# slurp + grim to clipboard
+bindsym Shift+Print exec slurp | grim -g - - | wl-copy
+# find PDFs with rofi
+bindsym $mod+f exec rofi -show find -modi find:~/.local/share/rofi/finder.sh
 # power menu
-bindsym $mod+Pause mode "$Pause-break"
+bindsym $mod+Shift+p mode "$Pause-break"
 
 set $Pause-break (p) poweroff, (r) reboot
 
 mode "$Pause-break" {
-    bindsym s exec --no-startup-id  sudo shutdown -h now, mode "default"
-    bindsym r exec --no-startup-id  sudo shutdown -r now, mode "default"
+    bindsym s exec --no-startup-id  systemctl poweroff , mode "default"
+    bindsym r exec --no-startup-id  systemctl reboot, mode "default"
 
     bindsym Return  mode "default"
     bindsym Escape  mode "default"
@@ -293,25 +294,22 @@ exec swayidle -w \
 #
 # Autostart programs
 #
-    # clipman
-    exec wl-paste -t text --watch clipman store
-    # syncthing
-    exec syncthing -no-browser -home="$HOME/.config/syncthing"
-    # wireguard
-    exec doas wg-quick up /etc/wireguard/wg0.conf
-    # kanshi
-    exec kanshi
-    # redshift
-    exec redshift
-    # tmux
-    assign [app_id="tmux"] $workspace1
-    exec kitty --class tmux -- tmuxp load ~/.tmuxp/local.yaml
-    # firefox
-    assign [app_id="firefox"] $workspace2
-    exec firefox-wayland
-    # emacs
-    assign [class="Emacs"] $workspace3
-    exec emacs
+# clipman
+#exec wl-paste -t text --watch clipman store
+# kanshi
+exec kanshi
+# imapnotify
+exec imapnotify -c ~/.config/imapnotify/gmail.js
+exec imapnotify -c ~/.config/imapnotify/uni.js
+# tmux
+assign [app_id="tmux"] $workspace1
+exec kitty --class tmux -- tmuxp load ~/.tmuxp/local.yaml
+# firefox
+assign [app_id="firefox"] $workspace2
+exec firefox
+# emacs
+assign [class="Emacs"] $workspace3
+exec emacs
 
 #
 # Program behaviour
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 553189c..d1ea649 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -43,6 +43,9 @@ unbind &
 unbind x
 bind x kill-session
 
+# switch to last session
+bind S switch-client -l
+
 # force a reload of the config file
 unbind r
 bind r source-file ~/.tmux.conf
diff --git a/tmux/.tmuxp/local.yaml b/tmux/.tmuxp/local.yaml
index 0e2073b..2bcd186 100644
--- a/tmux/.tmuxp/local.yaml
+++ b/tmux/.tmuxp/local.yaml
@@ -9,13 +9,6 @@ windows:
     - su
     - su
 
-- window_name: org
-  panes:
-    - null
-    - shell_command:
-      - clear
-      - khal calendar
-
 - window_name: canvas
   layout: even-vertical
   panes:
@@ -25,8 +18,8 @@ windows:
 - window_name: docs
   layout: even-horizontal
   panes:
-    - man zpool
-    - man ps
+    - man zfs
+    - man nix-shell
 
 - window_name: music
   panes:
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index dcc35b1..8b1b65a 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -1,6 +1,6 @@
 {
     "layer": "top", // Waybar at top layer
-    "height": 20, // Waybar height (to be removed for auto height)
+    "height": 25, // Waybar height (to be removed for auto height)
     "modules-left": ["sway/workspaces"],
     "modules-center": ["clock"],
     "modules-right": ["mpd", "network", "pulseaudio", "battery"],
@@ -24,7 +24,7 @@
         "format": "<span style=\"italic\">{}</span>"
     },
     "mpd": {
-        "format": "<span foreground='#88C0D0'>{stateIcon}</span>{title}",
+        "format": "<span foreground='#88C0D0'>{stateIcon}</span>  {title}",
         "format-disconnected": "",
         "format-stopped": "{stateIcon} ",
         "unknown-tag": "N/A",
@@ -33,8 +33,8 @@
             "on": " "
         },
         "state-icons": {
-            "paused": "",
-            "playing": ""
+            "paused": "",
+            "playing": ""
         },
         "tooltip-format": "MPD (connected)",
         "tooltip-format-disconnected": "MPD (disconnected)"
@@ -57,37 +57,37 @@
     "battery": {
         "states": {
             // "good": 95,
-            "warning": 30,
-            "critical": 15
+            "warning": 60,
+            "critical": 20
         },
-        "format": "<span foreground='#88C0D0'>{icon}</span>{capacity}%",
-        "format-charging": "<span foreground='#88C0D0'></span>{capacity}%",
-        "format-plugged": "<span foreground='#88C0D0'></span>{capacity}%",
+        "format": "<span foreground='#88C0D0'>{icon}</span> {capacity}%",
+        "format-charging": "<span foreground='#88C0D0'></span> {capacity}%",
+        "format-plugged": "<span foreground='#88C0D0'></span> {capacity}%",
         "format-alt": "{time} {icon}",
         // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", ""]
+        "format-full": "<span foreground='#88C0D0'></span>  Charged",
+        "format-icons": ["", "", ""]
     },
     "battery#bat2": {
-        "bat": "BAT2"
+        "bat": "BAT1"
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "<span foreground='#88C0D0'>{icon}</span>{essid}",
+        "format-wifi": "<span foreground='#88C0D0'>{icon}</span>  {essid}",
         "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
         "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
+        "format-disconnected": "<span foreground='#88C0D0'>睊</span>  Disconnected",
         "format-alt": "{ifname}: {ipaddr}/{cidr}",
-        "format-icons": ["", "", ""]
+        "format-icons": ["直", "直", "直"]
     },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
-        "format": "<span foreground='#88C0D0'>{icon}</span>{volume}%",
-        "format-muted": "<span foreground='#88C0D0'></span>",
+        "format": "<span foreground='#88C0D0'>{icon}</span> {volume}%",
+        "format-muted": "<span foreground='#88C0D0'>婢</span>",
         "format-icons": {
-            "default": ["", "", ""]
+            "default": ["", "墳", ""]
         },
-        "on-click": "pavucontrol"
+        "on-click": ""
     },
     "custom/media": {
         "format": "{icon} {}",
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 33fb3e0..5c18286 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -2,8 +2,8 @@
     border: none;
     border-radius: 0;
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: cherry, Siji;
-    font-size: 10px;
+    font-family: TerminessTTF Nerd Font;
+    font-size: 16px;
     min-height: 0px;
 }
 
diff --git a/zathura/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc
index 7414320..06fc2e7 100644
--- a/zathura/.config/zathura/zathurarc
+++ b/zathura/.config/zathura/zathurarc
@@ -11,4 +11,4 @@ set statusbar-bg "#161821"
 set statusbar-fg "#c6c8d1"
 set highlight-color "#a093c7"
 set highlight-active-color "#a093c7"
-set font "Go Mono 9"
+set font "Go Mono 12"
diff --git a/zathura/.config/zathura/zathurarc-dark b/zathura/.config/zathura/zathurarc-dark
deleted file mode 100644
index 19c0530..0000000
--- a/zathura/.config/zathura/zathurarc-dark
+++ /dev/null
@@ -1,13 +0,0 @@
-set adjust-open "width"
-set selection-clipboard clipboard
-set recolor-lightcolor "#312e39"
-set recolor-darkcolor  "#c0a79a"
-set recolor true
-set smooth-scroll true
-set window-title-basename true
-set completion-bg "#312e39"
-set statusbar-bg "#312e39"
-set statusbar-fg "#c0a79a"
-set highlight-color "#783e57"
-set highlight-active-color "#783e57"
-set font "iosevka slab 11"
diff --git a/zathura/.config/zathura/zathurarc-light b/zathura/.config/zathura/zathurarc-light
deleted file mode 100644
index 5a11c4e..0000000
--- a/zathura/.config/zathura/zathurarc-light
+++ /dev/null
@@ -1,13 +0,0 @@
-set adjust-open "width"
-set selection-clipboard clipboard
-set recolor-lightcolor "#fbf1c7"
-set recolor-darkcolor  "#3c3836"
-set recolor true
-set smooth-scroll true
-set window-title-basename true
-set completion-bg "#fbf1c7"
-set statusbar-bg "#fbf1c7"
-set statusbar-fg "#3c3836"
-set highlight-color "#b16286"
-set highlight-active-color "#b16286"
-set font "iosevka slab 11"