diff --git a/.githooks/README.md b/.githooks/README.md
deleted file mode 100644
index e53f212..0000000
--- a/.githooks/README.md
+++ /dev/null
@@ -1 +0,0 @@
-To make these hooks usable, run `git config --local core.hooksPath .githooks/`
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
deleted file mode 100755
index c0e7bb5..0000000
--- a/.githooks/pre-commit
+++ /dev/null
@@ -1,2 +0,0 @@
-nix fmt
-git add $(git diff --name-only --cached)
diff --git a/flake.lock b/flake.lock
index 345c671..69fb941 100644
--- a/flake.lock
+++ b/flake.lock
@@ -62,11 +62,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1677104801,
-        "narHash": "sha256-2V5nKOYVFMYlseYdDKiEaww2xqcE0GtS1ax3SoUX99I=",
+        "lastModified": 1677276957,
+        "narHash": "sha256-/vhdNhQj2CWgqdfD2KLEZWDleOfen0t2EiaGiyivnJU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4295fdfa6b0005c32f2e1f0b732faf5810c1bc7f",
+        "rev": "664945b3e09b4551c4e63e16efebd493cf5eac74",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1677107771,
-        "narHash": "sha256-eS/ylmm1y4ELz/Ow0goDA9u9LbuUPujdHpcdXcSYHJc=",
+        "lastModified": 1677259491,
+        "narHash": "sha256-nTIqi2mNJfV5tuQ+52nR3OGymv6tSC8HEQdR5EDHzT8=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "2bf7f9e4136ebef6db1159c636b163ecb96f23cc",
+        "rev": "1089e858b49975a4b9f6e49d377726ee4f164f96",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1676681260,
-        "narHash": "sha256-R2FvbPzgvDSVs0jCUA9CMDIgw4F6exF8cR+y3Yea5jQ=",
+        "lastModified": 1677282271,
+        "narHash": "sha256-wNooEHZpKMJN2jj2qPa1jRhi6f5q1yTYCxQcXEJ32eM=",
         "owner": "hyprwm",
         "repo": "hyprpaper",
-        "rev": "2bc88dc8c220db674f458432aec0ac0d9ea6a640",
+        "rev": "83867464c523c3ac2f7ce53d2c4b8d4f9b7551cd",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1676924492,
-        "narHash": "sha256-78278eyP55JRFe7UCpmFwdkrTY6H2arzTpVeteWo8kM=",
+        "lastModified": 1677232326,
+        "narHash": "sha256-rAk2/80kLvA3yIMmSV86T1B4kNvwCFMSQ1FxXndaUB0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "d24ea777c57b69c6b143cf11d83184ef71b0dbbf",
+        "rev": "2d44015779cced4eec9df5b8dab238b9f6312cb2",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1677143916,
-        "narHash": "sha256-XlwHrSGK9323LGpF2KNuokHXdn8zlL6uj0h0e64tGUs=",
+        "lastModified": 1677230078,
+        "narHash": "sha256-4WYJ+J76TiULFFdv1WCseklbwtunvZ9xzR4pi1MCezM=",
         "owner": "pta2002",
         "repo": "nixvim",
-        "rev": "67f5db9cfd56ec45dcc5234d99edec7428d12107",
+        "rev": "29764b28af2f27d1e4bd576754e3e1622ca24003",
         "type": "github"
       },
       "original": {
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index d8601ff..be2bb0b 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -51,6 +51,7 @@
   };
 
   fonts.fonts = with pkgs; [
+    nerdfonts
     noto-fonts
     noto-fonts-cjk
     noto-fonts-emoji
diff --git a/users/rouven/modules/accounts/powerline.neomuttrc b/users/rouven/modules/accounts/powerline.neomuttrc
index 8c3c284..a20fb20 100644
--- a/users/rouven/modules/accounts/powerline.neomuttrc
+++ b/users/rouven/modules/accounts/powerline.neomuttrc
@@ -11,7 +11,7 @@ set vfolder_format = " %N %?n?%3n&   ?  %8m  · %f"
 set attach_format = "%u%D  %T%-75.75d %?T?%&   ? %5s · %m/%M"
 
 # no addressed to me, to me, group, cc, sent by me, mailing list
-set to_chars="➜"
+set to_chars="󱡪➜"
 # unchanged mailbox, changed, read only, attach mode
 set status_chars = " "
 ifdef crypt_chars set crypt_chars = " "
diff --git a/users/rouven/modules/foot/default.nix b/users/rouven/modules/foot/default.nix
index 94b4604..2327dc4 100644
--- a/users/rouven/modules/foot/default.nix
+++ b/users/rouven/modules/foot/default.nix
@@ -10,7 +10,7 @@
       main = {
         shell = "${pkgs.zsh}/bin/zsh";
         dpi-aware = "yes";
-        font = "monospace:size=8";
+        font = "monospace:family=Iosevka Nerd Font, size=8";
       };
       cursor.color = "${colors.background} ${colors.foreground}";
       colors =
diff --git a/users/rouven/modules/hyprland/default.nix b/users/rouven/modules/hyprland/default.nix
index c89be23..ac9895b 100644
--- a/users/rouven/modules/hyprland/default.nix
+++ b/users/rouven/modules/hyprland/default.nix
@@ -17,7 +17,7 @@
     grim
     slurp
     swappy
-    font-awesome
+#    font-awesome
     swaylock-effects
   ];
 
diff --git a/users/rouven/modules/hyprland/waybar.nix b/users/rouven/modules/hyprland/waybar.nix
index dd8dadd..66888f0 100644
--- a/users/rouven/modules/hyprland/waybar.nix
+++ b/users/rouven/modules/hyprland/waybar.nix
@@ -14,7 +14,7 @@
         modules-left = [ "wlr/workspaces" ];
         modules-right = [ "network" "cpu" "temperature" "pulseaudio" "battery" "tray" "clock" ];
         network = {
-          format-wifi = " {essid} ({signalStrength}%)";
+          format-wifi = "  {essid} ({signalStrength}%)";
           format-ethernet = " {ipaddr}/{cidr}";
           tooltip-format = " {ifname} via {gwaddr}";
           format-linked = " {ifname} (No IP)";
@@ -32,11 +32,11 @@
         };
         pulseaudio = {
           format = "{volume}% {icon} {format_source}";
-          format-bluetooth = "{volume}% {icon} {format_source}";
-          format-bluetooth-muted = " {icon} {format_source}";
-          format-muted = " {format_source}";
-          format-source = "{volume}% ";
-          format-source-muted = "";
+          format-bluetooth = "{volume}% {icon} {format_source} ";
+          format-bluetooth-muted = " {icon} {format_source}";
+          format-muted = " {format_source}";
+          format-source = " {volume}% ";
+          format-source-muted = " ";
           format-icons = {
             headphone = "";
             headset = "";
@@ -49,7 +49,7 @@
             warning = 30;
             critical = 15;
           };
-          format = "{capacity}% {icon}";
+          format = "{capacity}% {icon} ";
           format-charging = "{capacity}% ";
           format-plugged = "{capacity}% ";
           format-icons = [ "" "" "" "" "" ];
@@ -63,7 +63,7 @@
 
   xdg.configFile."waybar/style.css".text = ''
     * {
-        font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+        font-family: Roboto, Helvetica, Arial, sans-serif, Iosevka Nerd Font;
         font-size: 13px;
     }
     
diff --git a/users/rouven/modules/neovim/default.nix b/users/rouven/modules/neovim/default.nix
index 10dda2d..636dc1f 100644
--- a/users/rouven/modules/neovim/default.nix
+++ b/users/rouven/modules/neovim/default.nix
@@ -1,13 +1,7 @@
 { config, pkgs, ... }:
 {
   home.packages = with pkgs; [
-    # a few language servers
     ripgrep
-    #python310Packages.python-lsp-server
-    #python310Packages.python-lsp-black
-    #python310Packages.black
-    #python310Packages.pylint
-    #rnix-lsp
   ];
   programs.nixvim = {
     enable = true;
@@ -37,11 +31,12 @@
       normal = {
         # remove ex mode shortcut
         "Q" = "<Nop>";
-        #trigger the fuzzy finder (fzf)
-        "<leader>f" = ":Files<CR>";
-        "<leader>g" = ":GFiles<CR>";
-        "<leader>b" = ":Buffers<CR>";
-        "<leader>r" = ":Rg<CR>";
+        # Open the tree
+        "<leader>n" = ":NvimTreeFocus<CR>";
+        #trigger the fuzzy finder (telescope)
+        "<leader>f" = ":Telescope find_files<CR>";
+        "<leader>g" = ":Telescope git_files<CR>";
+        "<leader>r" = ":Telescope live_grep<CR>";
         # diacnostics
         "<leader>e" = "vim.diagnostic.open_float";
         "<leader>q" = "vim.diagnostic.setloclist";
@@ -72,8 +67,12 @@
       nvim-tree = {
         enable = true;
         autoClose = true;
+        openOnSetup = true;
+        openOnSetupFile = true;
+      };
+      telescope = {
+        enable = true;
       };
-      comment-nvim.enable = true;
       lsp = {
         enable = true;
         onAttach = ''
@@ -93,7 +92,6 @@
           vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts)
           vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, bufopts)
           vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-          vim.keymap.set('n', '<leader>f', function() vim.lsp.buf.format { async = true } end, bufopts)
         '';
         servers = {
           pyright = {
@@ -117,6 +115,7 @@
     };
     extraPlugins = with pkgs.vimPlugins;
       [
+        vim-nix
         dracula-vim
         nerdcommenter
         lsp-format-nvim
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index 97f0300..506a4d0 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -49,11 +49,15 @@
     trash-cli
     #spotify # make probles atm
     virt-manager
-    powerline-fonts
     ventoy-bin
     ripgrep
     baobab
 
+    # font and icon stuff
+    exa # ls but with icons
+    powerline-fonts
+
+
     # libs
     libyubikey
     libfido2
diff --git a/users/rouven/modules/vifm/dracula.vifm b/users/rouven/modules/vifm/dracula.vifm
index ebd2b75..d15efa2 100644
--- a/users/rouven/modules/vifm/dracula.vifm
+++ b/users/rouven/modules/vifm/dracula.vifm
@@ -43,3 +43,75 @@ highlight Socket          cterm=none ctermfg=magenta ctermbg=black
 highlight Device          cterm=none ctermfg=red ctermbg=default
 highlight Fifo            cterm=none ctermfg=yellow ctermbg=black
 highlight Executable      cterm=none ctermfg=green ctermbg=default
+
+" Ranger devicons for ViFM
+" https://github.com/cirala/vifm_devicons
+"
+" Filetypes/directories
+set classify=' :dir:/, :exe:, :reg:, :link:,? :?:, ::../::'
+
+" Specific files
+set classify+=' ::.Xdefaults,,.Xresources,,.bashprofile,,.bash_profile,,.bashrc,,.dmrc,,.d_store,,.fasd,,.gitconfig,,.gitignore,,.jack-settings,,.mime.types,,.nvidia-settings-rc,,.pam_environment,,.profile,,.recently-used,,.selected_editor,,.xinitpurc,,.zprofile,,.yarnc,,.snclirc,,.tmux.conf,,.urlview,,.config,,.ini,,.user-dirs.dirs,,.mimeapps.list,,.offlineimaprc,,.msmtprc,,.Xauthority,,config::'
+set classify+=' ::dropbox::'
+set classify+=' ::favicon.*,,README,,readme::'
+set classify+=' ::.vim,,.vimrc,,.gvimrc,,.vifm::'
+set classify+=' ::gruntfile.coffee,,gruntfile.js,,gruntfile.ls::'
+set classify+=' ::gulpfile.coffee,,gulpfile.js,,gulpfile.ls::'
+set classify+=' ::ledger::'
+set classify+=' ::license,,copyright,,copying,,LICENSE,,COPYRIGHT,,COPYING::'
+set classify+=' ::node_modules::'
+set classify+=' ::react.jsx::'
+
+" File extensions
+set classify+='λ ::*.ml,,*.mli::'
+set classify+=' ::*.styl::'
+set classify+=' ::*.scss::'
+set classify+=' ::*.py,,*.pyc,,*.pyd,,*.pyo::'
+set classify+=' ::*.php::'
+set classify+=' ::*.markdown,,*.md::'
+set classify+=' ::*.json::'
+set classify+=' ::*.js::'
+set classify+=' ::*.bmp,,*.gif,,*.ico,,*.jpeg,,*.jpg,,*.png,,*.svg,,*.svgz,,*.tga,,*.tiff,,*.xmb,,*.xcf,,*.xpm,,*.xspf,,*.xwd,,*.cr2,,*.dng,,*.3fr,,*.ari,,*.arw,,*.bay,,*.crw,,*.cr3,,*.cap,,*.data,,*.dcs,,*.dcr,,*.drf,,*.eip,,*.erf,,*.fff,,*.gpr,,*.iiq,,*.k25,,*.kdc,,*.mdc,,*.mef,,*.mos,,*.mrw,,*.obm,,*.orf,,*.pef,,*.ptx,,*.pxn,,*.r3d,,*.raf,,*.raw,,*.rwl,,*.rw2,,*.rwz,,*.sr2,,*.srf,,*.srw,,*.tif,,*.x3f,,*.webp,,*.avif,,*.jxl::'
+set classify+=' ::*.ejs,,*.htm,,*.html,,*.slim,,*.xml::'
+set classify+=' ::*.mustasche::'
+set classify+=' ::*.css,,*.less,,*.bat,,*.conf,,*.ini,,*.rc,,*.yml,,*.cfg::'
+set classify+=' ::*.rss::'
+set classify+=' ::*.coffee::'
+set classify+=' ::*.twig::'
+set classify+=' ::*.c++,,*.cpp,,*.cxx,,*.h::'
+set classify+=' ::*.cc,,*.c::'
+set classify+=' ::*.hs,,*.lhs::'
+set classify+=' ::*.lua::'
+set classify+=' ::*.jl::'
+set classify+=' ::*.go::'
+set classify+=' ::*.ts::'
+set classify+=' ::*.db,,*.dump,,*.sql::'
+set classify+=' ::*.sln,,*.suo::'
+set classify+=' ::*.exe::'
+set classify+=' ::*.diff,,*.sum,,*.md5,,*.sha512::'
+set classify+=' ::*.scala::'
+set classify+=' ::*.java,,*.jar::'
+set classify+=' ::*.xul::'
+set classify+=' ::*.clj,,*.cljc::'
+set classify+=' ::*.pl,,*.pm,,*.t::'
+set classify+=' ::*.cljs,,*.edn::'
+set classify+=' ::*.rb::'
+set classify+=' ::*.fish,,*.sh,,*.bash::'
+set classify+=' ::*.dart::'
+set classify+=' ::*.f#,,*.fs,,*.fsi,,*.fsscript,,*.fsx::'
+set classify+=' ::*.rlib,,*.rs::'
+set classify+=' ::*.d::'
+set classify+=' ::*.erl,,*.hrl::'
+set classify+=' ::*.ai::'
+set classify+=' ::*.psb,,*.psd::'
+set classify+=' ::*.jsx::'
+set classify+=' ::*.aac,,*.anx,,*.asf,,*.au,,*.axa,,*.flac,,*.m2a,,*.m4a,,*.mid,,*.midi,,*.mp3,,*.mpc,,*.oga,,*.ogg,,*.ogx,,*.ra,,*.ram,,*.rm,,*.spx,,*.wav,,*.wma,,*.ac3::'
+set classify+=' ::*.avi,,*.flv,,*.mkv,,*.mov,,*.mp4,,*.mpeg,,*.mpg,,*.webm,,*.av1::'
+set classify+=' ::*.epub,,*.pdf,,*.fb2,,*.djvu::'
+set classify+=' ::*.7z,,*.apk,,*.bz2,,*.cab,,*.cpio,,*.deb,,*.gem,,*.gz,,*.gzip,,*.lh,,*.lzh,,*.lzma,,*.rar,,*.rpm,,*.tar,,*.tgz,,*.xz,,*.zip,,*.zst::'
+set classify+=' ::*.cbr,,*.cbz::'
+set classify+=' ::*.log::'
+set classify+=' ::*.nix::'
+set classify+=' ::*.doc,,*.docx,,*.adoc::'
+set classify+=' ::*.xls,,*.xlsmx::'
+set classify+=' ::*.pptx,,*.ppt::'
diff --git a/users/rouven/modules/vifm/vifmrc b/users/rouven/modules/vifm/vifmrc
index d9c94cf..ef7f9ad 100644
--- a/users/rouven/modules/vifm/vifmrc
+++ b/users/rouven/modules/vifm/vifmrc
@@ -203,8 +203,8 @@ fileviewer *.docx docx2txt.pl %f -
 
 filetype * xdg-open
 
-" Better quit command"
-command Q :q
+nnoremap : ;
+nnoremap ; :
 
 " Start shell in current directory
 nnoremap S :shell<cr>
diff --git a/users/rouven/modules/zsh/default.nix b/users/rouven/modules/zsh/default.nix
index fc7ce16..22c41a7 100644
--- a/users/rouven/modules/zsh/default.nix
+++ b/users/rouven/modules/zsh/default.nix
@@ -4,6 +4,7 @@
     enable = true;
     shellAliases = {
       rm = "trash";
+      ls = "exa --icons";
     };
     history = {
       size = 10000;