diff --git a/home/kitty.nix b/home/kitty.nix
index fa8a1ba..4799950 100644
--- a/home/kitty.nix
+++ b/home/kitty.nix
@@ -12,12 +12,13 @@
       # how many windows should be open before kitty asks
       # for confirmation
       confirm_os_window_close = 0;
+      clear_all_shortcuts = true;
     };
     keybindings = {
       # kitty_mod is ctrl+shift by default
       "kitty_mod+c" = "copy_to_clipboard";
       "kitty_mod+v" = "paste_from_clipboard";
-      "ctrl+q" = "quit";
+      # "ctrl+q" = "quit";
 
       # windows
       "kitty_mod+h" = "neighboring_window left";
@@ -28,12 +29,14 @@
       "kitty_mod+alt+j" = "move_window down";
       "kitty_mod+k" = "neighboring_window up";
       "kitty_mod+alt+k" = "move_window up";
-      "ctrl+f2" = "detach_tab";
       "ctrl+f3" = "detach_window new-tab";
-      "ctrl+f4" = "detach_window prev-tab";
+      "ctrl+f4" = "detach_window tab-left";
+      "ctrl+f5" = "load_config_file";
       "ctrl+alt+l" = "next_layout";
       "ctrl+alt+t" = "goto_layout tall";
       "ctrl+alt+s" = "goto_layout stack";
+      "kitty_mod+enter" = "new_window_with_cwd";
+      "kitty_mod+r" = "resize_window";
 
       # tabs
       "kitty_mod+n" = "next_tab";
@@ -41,6 +44,16 @@
       "kitty_mod+alt+n" = "move_tab_forward";
       "kitty_mod+alt+p" = "move_tab_backward";
       "kitty_mod+w" = "close_tab";
+      "kitty_mod+t" = "new_tab_with_cwd";
+      "ctrl+f2" = "detach_tab";
+
+      # hints
+      "kitty_mod+o>o" = "open_url_with_hints";
+      "kitty_mod+o>p" = "kitten hints --type path --program -";
+      "kitty_mod+o>n" = "kitten hints --type line --program -";
+      "kitty_mod+o>w" = "kitten hints --type word --program -";
+      "kitty_mod+o>h" = "kitten hints --type hash --program -";
+      "kitty_mod+o>l" = "kitten hints --type linenum";
     };
   };
 }
diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix
index 98a97ee..8a302b0 100644
--- a/home/nixvim/default.nix
+++ b/home/nixvim/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
   programs.nixvim = {
     enable = true;
@@ -15,15 +15,18 @@
       incsearch = true;
       smartcase = true;
     };
-    colorscheme = "iceberg";
-    clipboard.register = "unnamedplus";
+    colorscheme = "github_dark_tritanopia";
+    clipboard.register = "unnamed";
 
     globals = {
       mapleader = ",";
     };
 
-    extraPlugins = with pkgs.vimPlugins; [
-      iceberg-vim
+    extraPlugins = [
+      (pkgs.vimUtils.buildVimPlugin {
+        name = "gitub-theme";
+        src = inputs.nvim-github-theme;
+      })
     ];
 
     keymaps = [