diff --git a/home/gnome/run-or-raise.conf b/home/gnome/run-or-raise.conf
index 783e5a5..b4bc39d 100644
--- a/home/gnome/run-or-raise.conf
+++ b/home/gnome/run-or-raise.conf
@@ -1,21 +1,6 @@
-# Here you list all the shortcuts.
-#
-# The shortcuts may be defined in two ways:
-#
-# 1. Run-or-raise form: shortcut,launch-command,[wm_class],[title]
-#        * wm_class and title are optional and case sensitive
-#        * if none is set, lowercased launch-command is compared with lowercased windows wm_classes and titles
-#
-# 2. Run only form: shortcut,calculate 
-#
-# =================
-# Run or raise form
-# =================
-#
-# This line cycles any open gnome-terminal (matched by wm_class = Gnome-terminal on Ubuntu 17.10) OR if not found, launches new one.
-# If you're using Arch, you may want to match by wm_class = gnome-terminal-server , just check yourself by Alt+F2/lg/Windows
 <Super>b,firefox,,
 <Super>f,nautilus,,
+<Super>g:always-run,tmux new-window -n vifm vifm ~/desktop,foot,
 <Super>return,foot,,
 <Super>p,keepassxc,,,
 
diff --git a/home/mail/default.nix b/home/mail/default.nix
index fb014b2..cb69326 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -11,6 +11,7 @@
   };
 
   programs.mbsync.enable = true;
+
   programs.neomutt = {
     enable = true;
     vimKeys = true;
@@ -45,8 +46,11 @@
           '';
           showSignature = "append";
         };
-        mbsync.enable = true;
-        mbsync.create = "maildir";
+        mbsync = {
+          enable = true;
+          create = "maildir";
+          expunge = "both";
+        };
         msmtp.enable = true;
         neomutt = {
           enable = true;
@@ -125,8 +129,11 @@
             color status green default
           '';
         };
-        mbsync.enable = true;
-        mbsync.create = "maildir";
+        mbsync = {
+          enable = true;
+          create = "maildir";
+          expunge = "both";
+        };
         msmtp = {
           enable = true;
           extraConfig.from = "*@(ktiu.net|t9e.me)";
@@ -174,8 +181,11 @@
             color status green default
           '';
         };
-        mbsync.enable = true;
-        mbsync.create = "maildir";
+        mbsync = {
+          enable = true;
+          create = "maildir";
+          expunge = "both";
+        };
         msmtp = {
           enable = false;
           # extraConfig.from = "*@ktiu.net";
@@ -220,8 +230,11 @@
             color status cyan default
           '';
         };
-        mbsync.enable = true;
-        mbsync.create = "maildir";
+        mbsync = {
+          enable = true;
+          create = "maildir";
+          expunge = "both";
+        };
         msmtp = {
           enable = true;
           extraConfig.from = "kein_schlussstrich_hessen@systemli.org";
@@ -232,7 +245,7 @@
   };
 
   programs.neovim.plugins = with pkgs.vimPlugins; [
-    { 
+    {
       plugin = vim-pathogen; 
       config = "execute pathogen#infect()";
     }
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index 41e068d..7fcad69 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -40,7 +40,7 @@
           vim.api.nvim_set_keymap('n', '<leader><tab>', ':Buffers<return>', { noremap = true, silent = true })
           vim.api.nvim_set_keymap('i', '<c-x><c-f>', '<Plug>(fzf-complete-path)', { silent = true })
           vim.api.nvim_set_keymap('n', '<leader>o', ':Files<return>', { noremap = true, silent = true })
-          vim.api.nvim_set_keymap('n', '<leader>O', ':Files ~/', { noremap = true, silent = true })
+          vim.api.nvim_set_keymap('n', '<leader>O', ':Files ~/', { noremap = true })
           vim.api.nvim_set_keymap('n', '<leader>r', ':Read<return>', { noremap = true, silent = true })
           vim.api.nvim_set_keymap('n', '<leader>R', ':Read ~/', { noremap = true, silent = true })
           vim.api.nvim_set_keymap('n', '<leader>a', ':Ag<return>', { noremap = true, silent = true })
diff --git a/home/ssh.nix b/home/ssh.nix
index 735cd81..7836029 100644
--- a/home/ssh.nix
+++ b/home/ssh.nix
@@ -59,6 +59,12 @@ in
         identityFile = certs.personal;
       };
 
+      "github github.com" = {
+        hostname = "github.com";
+        user = "git";
+        identityFile = certs.personal;
+      };
+
       # "mila" = {
       #   hostname = "mila";
       #   user = "till";