diff --git a/lib/default.nix b/lib/default.nix
index 9d899f5..4665e40 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,3 @@
 inputs: [
-  (import ./impermanence.nix inputs)
   (import ./disko.nix inputs)
 ]
diff --git a/lib/disko.nix b/lib/disko.nix
index e1348e2..6d2fce5 100644
--- a/lib/disko.nix
+++ b/lib/disko.nix
@@ -1,4 +1,4 @@
-inputs: self: super: {
+_inputs: _self: super: {
   lib =
     super.lib
     // {
diff --git a/lib/impermanence.nix b/lib/impermanence.nix
deleted file mode 100644
index 91f4b5c..0000000
--- a/lib/impermanence.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  self,
-  nixpkgs,
-  ...
-}: self: super: {
-  lib =
-    super.lib
-    // {
-      # some programs( such as steam do not work with bindmounts
-      # additionally symlinks are a lot faster than bindmounts
-      # ~ 2x faster in my tests
-      impermanence.makeSymlinks = builtins.map (x: {
-        directory = x;
-        method = "symlink";
-      });
-    };
-}
diff --git a/modules/hardware/laptop.nix b/modules/hardware/laptop.nix
index 7faf61f..553a63c 100644
--- a/modules/hardware/laptop.nix
+++ b/modules/hardware/laptop.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
   services = {
     logind.extraConfig = ''
       IdleAction=suspend
diff --git a/users/common/graphical/Xorg/herbstluft.nix b/users/common/graphical/Xorg/herbstluft.nix
index 9719ac5..52f93e5 100644
--- a/users/common/graphical/Xorg/herbstluft.nix
+++ b/users/common/graphical/Xorg/herbstluft.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   ...
@@ -7,13 +6,12 @@
   # set the modifier key to WIN
   MOD = "Super";
   #set the default resize step for herbstluft
-  RESIZE_STEP = 0.05;
   TAGS = map toString (lib.lists.range 1 9);
 in {
   home.file.".xinitrc".source = ./xinitrc;
   xsession.windowManager.herbstluftwm = {
     enable = true;
-    package = pkgs.herbstluftwm.overrideAttrs (finalAttrs: previousAttrs: {
+    package = pkgs.herbstluftwm.overrideAttrs (_finalAttrs: _previousAttrs: {
       doCheck = false;
     });
     extraConfig = ''
diff --git a/users/common/graphical/default.nix b/users/common/graphical/default.nix
index affeecc..82603df 100644
--- a/users/common/graphical/default.nix
+++ b/users/common/graphical/default.nix
@@ -1,8 +1,6 @@
 {pkgs, ...}: {
   imports = [
-    ./kitty.nix
     ./Xorg
-    ./firefox.nix
     ./themes.nix
   ];
   home = {
diff --git a/users/common/interactive.nix b/users/common/interactive.nix
deleted file mode 100644
index 350c506..0000000
--- a/users/common/interactive.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./programs/direnv.nix
-    ./programs/htop.nix
-    ./programs/nvim
-    ./programs/git.nix
-  ];
-}
diff --git a/users/common/programs/email.nix b/users/common/programs/email.nix
new file mode 100644
index 0000000..3b235e5
--- /dev/null
+++ b/users/common/programs/email.nix
@@ -0,0 +1,7 @@
+{
+  accounts.email.accounts = {
+    "1" = {
+      address = "";
+    };
+  };
+}
diff --git a/users/common/graphical/firefox.nix b/users/common/programs/firefox.nix
similarity index 100%
rename from users/common/graphical/firefox.nix
rename to users/common/programs/firefox.nix
diff --git a/users/common/programs/gdb.nix b/users/common/programs/gdb.nix
index 058b2d7..a778497 100644
--- a/users/common/programs/gdb.nix
+++ b/users/common/programs/gdb.nix
@@ -1,4 +1,5 @@
-{
+{pkgs, ...}: {
+  home.packages = [pkgs.pwndbg];
   home.enableDebugInfo = true;
   home.file.gdbinit = {
     target = ".gdbinit";
diff --git a/users/common/graphical/kitty.nix b/users/common/programs/kitty.nix
similarity index 100%
rename from users/common/graphical/kitty.nix
rename to users/common/programs/kitty.nix
diff --git a/users/common/shells/pager.nix b/users/common/shells/pager.nix
index 635a9b6..0f5dfed 100644
--- a/users/common/shells/pager.nix
+++ b/users/common/shells/pager.nix
@@ -1,20 +1,29 @@
 {pkgs, ...}: let
   initLua = pkgs.writeText "init.lua" ''
-    vim.opt.buftype = "nowrite"
-    vim.opt.history=0
-    vim.opt.backup=false
-    vim.opt.modeline=false
-    vim.opt.shelltemp=false
-    vim.opt.swapfile=false
-    vim.opt.undofile=false
-    vim.opt.writebackup = false
-    vim.opt.shada-file = vim.fn.stdpath "state" .. "/shada/man.shada"
+       vim.opt.buftype = "nowrite"
+       vim.opt.backup=false
+       vim.opt.modeline=false
+       vim.opt.shelltemp=false
+       vim.opt.swapfile=false
+       vim.opt.undofile=false
+       vim.opt.writebackup = false
+       vim.opt.shada-file = vim.fn.stdpath "state" .. "/shada/man.shada"
+    vim.opt.virtualedit = "all"
+    vim.opt.splitkeep = "screen"
+
+    vim.opt.termguicolors = false
+
+    vim.keymap.set('n', '<CR>', '<C-]>', {silent = true, desc = "Jump to tag under cursor})
+    vim.keymap.set('n', '<Bs>', ':pop<CR>', {silent = true, desc = "Jump to tag under cursor})
+    vim.keymap.set('n', '<C-Left>', ':pop<CR>', {silent = true, desc = "Jump to tag under cursor})
+    vim.keymap.set('n', '<C-Right>', ':tag<CR>', {silent = true, desc = "Jump to tag under cursor})
   '';
   nvimPager = pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped neovimConfig;
   neovimConfig =
     pkgs.neovimUtils.makeNeovimConfig {
       wrapRc = false;
       withPython3 = false;
+      withRuby = false;
     }
     // {
       wrapperArgs = ["--add-flags" "--clean -u ${initLua}"];
diff --git a/users/patrick/default.nix b/users/patrick/default.nix
index 3b454d2..a46d44e 100644
--- a/users/patrick/default.nix
+++ b/users/patrick/default.nix
@@ -36,12 +36,17 @@
 
       ../common
       ../common/impermanence.nix
-      ../common/interactive.nix
       ../common/graphical
 
+      ../common/programs/direnv.nix
+      ../common/programs/htop.nix
+      ../common/programs/nvim
+      ../common/programs/git.nix
       ../common/programs/bottles.nix
       ../common/programs/gdb.nix
       ../common/programs/streamdeck.nix
+      ../common/programs/firefox.nix
+      ../common/programs/kitty.nix
     ];
   };
 }
diff --git a/users/patrick/patrick.nix b/users/patrick/patrick.nix
index f2ded17..6b13d7a 100644
--- a/users/patrick/patrick.nix
+++ b/users/patrick/patrick.nix
@@ -4,7 +4,6 @@
       nextcloud-client
       discord
       netflix
-      pwndbg
     ];
   };
 }