From dbf47db8036c134733e89f317c95b577357abda6 Mon Sep 17 00:00:00 2001
From: Henrik Bakken <bakken.henrik@gmail.com>
Date: Sun, 11 Jul 2021 15:20:04 +0200
Subject: [PATCH] updates

---
 HOME/.Xresources                           | 83 +++++++++++-----------
 fish/config.fish                           |  6 +-
 fish/functions/fish_user_key_bindings.fish | 12 ----
 nvim/init.lua                              |  8 +--
 4 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/HOME/.Xresources b/HOME/.Xresources
index 19f54c1..6b0e8ec 100644
--- a/HOME/.Xresources
+++ b/HOME/.Xresources
@@ -6,47 +6,50 @@ Xft.autohint:  false
 Xft.hintstyle: hintslight
 Xft.lcdfilter: lcddefault
 
-#define nord0 #2E3440
-#define nord1 #3B4252
-#define nord2 #434C5E
-#define nord3 #4C566A
-#define nord4 #D8DEE9
-#define nord5 #E5E9F0
-#define nord6 #ECEFF4
-#define nord7 #8FBCBB
-#define nord8 #88C0D0
-#define nord9 #81A1C1
-#define nord10 #5E81AC
-#define nord11 #BF616A
-#define nord12 #D08770
-#define nord13 #EBCB8B
-#define nord14 #A3BE8C
-#define nord15 #B48EAD
-
-*.foreground:  nord4
-*.background:  nord0
-*.cursorColor: nord4
-*fadeColor:    nord3
-*fading:       35
-
-*.color0: nord1
-*.color1: nord11
-*.color2: nord14
-*.color3: nord13
-*.color4: nord9
-*.color5: nord15
-*.color6: nord8
-*.color7: nord5
-*.color8: nord3
-*.color9: nord11
-*.color10: nord14
-*.color11: nord13
-*.color12: nord9
-*.color13: nord15
-*.color14: nord7
-*.color15: nord6
-
 *pointerColorBackground: #2B2C2B
 *pointerColorForeground: #16A085
 Xcursor.theme: Adwaita
 Xcursor.size:            0
+
+#define base00 #2d2d2d
+#define base01 #393939
+#define base02 #515151
+#define base03 #747369
+#define base04 #a09f93
+#define base05 #d3d0c8
+#define base06 #e8e6df
+#define base07 #f2f0ec
+#define base08 #f2777a
+#define base09 #f99157
+#define base0A #ffcc66
+#define base0B #99cc99
+#define base0C #66cccc
+#define base0D #6699cc
+#define base0E #cc99cc
+#define base0F #d27b53
+
+*.foreground:   base05
+#ifdef background_opacity
+*.background:   [background_opacity]base00
+#else
+*.background:   base00
+#endif
+*.cursorColor:  base05
+
+*.color0:       base00
+*.color1:       base08
+*.color2:       base0B
+*.color3:       base0A
+*.color4:       base0D
+*.color5:       base0E
+*.color6:       base0C
+*.color7:       base05
+
+*.color8:       base03
+*.color9:       base08
+*.color10:      base0B
+*.color11:      base0A
+*.color12:      base0D
+*.color13:      base0E
+*.color14:      base0C
+*.color15:      base07
diff --git a/fish/config.fish b/fish/config.fish
index e57f157..93a75a5 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -7,5 +7,7 @@ set -x CUDA_HOME /opt/cuda
 set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH $CUDA_HOME/lib64
 set -Ua fish_user_paths /home/hjalmarlucius/.local/bin/
 
-# fzf bindings
-set -U FZF_LEGACY_KEYBINDINGS 0
+if status --is-interactive
+    set BASE16_SHELL "$HOME/.config/base16-shell/"
+    source "$BASE16_SHELL/profile_helper.fish"
+end
diff --git a/fish/functions/fish_user_key_bindings.fish b/fish/functions/fish_user_key_bindings.fish
index 6b485d5..7c818eb 100644
--- a/fish/functions/fish_user_key_bindings.fish
+++ b/fish/functions/fish_user_key_bindings.fish
@@ -1,15 +1,3 @@
-function fish_user_key_bindings
-  for mode in insert default visual
-        bind -M $mode \cf forward-char
-  end
-  bind -M insert \ew __fzf_reverse_isearch
-  bind -M insert \eo '__fzf_cd --hidden'
-  bind -M insert \eF __fzf_find_file
-  bind -M insert \ef __fzf_open
-end
-
 function ll --description 'List contents of directory using long format'
     ls -lha $argv
 end
-
-fzf_key_bindings
diff --git a/nvim/init.lua b/nvim/init.lua
index f30ab90..9bd0837 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -121,8 +121,8 @@ map("n", "<leader>ww", [[:cd %:p:h<cr>]], { noremap = true })
 map("n", "<esc><esc>", ":noh<cr>", { silent = true, noremap = true } )
 
 -- <Tab> to navigate the completion menu
-map("i", "<S-Tab>", [[pumvisible() ? "\<C-p>" : "\<Tab>"]], { expr = true, noremap = true })
-map("i", "<Tab>", [[pumvisible() ? "\<C-n>" : "\<S-Tab>"]], { expr = true, noremap = true })
+map("i", "<S-Tab>", [[pumvisible() ? "\<C-p>" : "\<S-Tab>"]], { expr = true, noremap = true })
+map("i", "<Tab>", [[pumvisible() ? "\<C-n>" : "\<Tab>"]], { expr = true, noremap = true })
 
 -- CURSOR
 -- stay visual when indenting
@@ -448,8 +448,8 @@ require("packer").startup {function(use)
               ["<C-s>"] = actions.select_horizontal,
               ["<C-v>"] = actions.select_vertical,
               ["<C-t>"] = actions.select_tab,
-              ["<Tab>"] = actions.toggle_selection + actions.move_selection_worse,
-              ["<S-Tab>"] = actions.toggle_selection + actions.move_selection_better,
+              ["<S-Tab>"] = actions.toggle_selection + actions.move_selection_worse,
+              ["<Tab>"] = actions.toggle_selection + actions.move_selection_better,
               ["<C-q>"] = actions.send_to_qflist + actions.open_qflist,
               ["<M-q>"] = actions.send_selected_to_qflist + actions.open_qflist,
               ["<C-l>"] = actions.complete_tag