From 3855d643726f54fc13f2cad0697330172daab3ad Mon Sep 17 00:00:00 2001
From: Nicholas Noll <nbnoll@eml.cc>
Date: Thu, 14 Oct 2021 09:25:19 -0700
Subject: fix: merge

---
 .config/mutt/mailcap          | 2 +-
 .config/nvim/lua/lsp.lua      | 5 +++--
 .config/nvim/lua/settings.lua | 1 +
 .config/qutebrowser/config.py | 2 +-
 .config/tmux/config           | 4 ++++
 .gdbinit                      | 1 +
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.config/mutt/mailcap b/.config/mutt/mailcap
index 01dbaa1..d4e8f63 100644
--- a/.config/mutt/mailcap
+++ b/.config/mutt/mailcap
@@ -11,7 +11,7 @@ image/gif; ~/.config/mutt/view_attachment.sh %s gif
 application/pdf; ~/.config/mutt/view_attachment.sh %s pdf
 
 # Explicitly render in browser with "v" (view attachment):
-# text/html; CHARSET=%{charset} ~/.config/mutt/view_attachment.sh %s html
+text/html; CHARSET=%{charset} ~/.config/mutt/view_attachment.sh %s html; needsterminal;
 text/html; w3m -I %{charset} -T text/html; copiousoutput;
 text/plain; ~/.config/mutt/view_mail.sh %s %{charset}; needsterminal
 
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 90dfce9..1eb2e9c 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -15,12 +15,13 @@ local setup = function(client, buffer)
 
     set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
     set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-    set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+    set_keymap('n', 'K',  '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
     set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
     set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
     set_keymap('n', '[c', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
     set_keymap('n', ']c', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
-    set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
+
+    set_keymap('n', '<Leader><Leader>r', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
 end
 
 local servers = { 'clangd', 'tsserver' }
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index 729add9..05e00c9 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -157,6 +157,7 @@ vim.g.fzf_colors = {
       ["fg+"]     = { "fg", "NormalFloat" },
       ["bg+"]     = { "bg", "Normal" },
       ["hl+"]     = { "fg", "Statement" },
+      ["query"]   = { "fg", "Type" },
       ["info"]    = { "fg", "PreProc" },
       ["prompt"]  = { "fg", "Conditional" },
       ["pointer"] = { "fg", "Exception" },
diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py
index e155b06..7728fb9 100644
--- a/.config/qutebrowser/config.py
+++ b/.config/qutebrowser/config.py
@@ -334,8 +334,8 @@ c.colors.tabs.pinned.selected.odd.fg = c.colors.tabs.selected.odd.fg
 
 # Background color for webpages if unset (or empty to use the theme's
 # color).
-# c.colors.darkmode.enabled = True
 # c.colors.webpage.bg = bg4
+# c.colors.webpage.darkmode.enabled = True
 
 # ------------------------------------------------------------------------
 # fonts
diff --git a/.config/tmux/config b/.config/tmux/config
index a9113af..7136129 100644
--- a/.config/tmux/config
+++ b/.config/tmux/config
@@ -38,6 +38,10 @@ bind -n C-k run "tmux-send up"
 bind -n C-h run "tmux-send left"
 bind -n C-l run "tmux-send right"
 
+# Pane-layout
+bind K swap-pane -U
+bind J swap-pane -D
+
 # Layout rotation
 bind-key C-o rotate-window
 
diff --git a/.gdbinit b/.gdbinit
index e88f195..dd2ec31 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -2227,6 +2227,7 @@ set breakpoint pending on
 
 python Dashboard.start()
 
+dashboard -style syntax_highlighting 'gruvbox-dark'
 dashboard -style prompt_not_running '\[\e[1;34m\]>>>\[\e[0m\]'
 dashboard -style style_low '1;34'
 
-- 
cgit v1.2.1