From 3dfe1bdc05b9340158dc9819dd50178192f558ec Mon Sep 17 00:00:00 2001
From: Benjamin Kyd <benjamin.kyd@intel.com>
Date: Mon, 22 May 2023 19:47:30 +0100
Subject: [PATCH] epic

---
 common/.config/btop/btop.conf           |  4 ++--
 common/.config/nvim/lua/lsp-general.lua | 14 +++++++++++---
 common/.config/nvim/lua/plugins.lua     |  3 ++-
 common/.config/nvim/neovim.vim          |  2 ++
 common/.vimrc                           | 14 ++++++--------
 common/.zshrc                           |  8 +++-----
 6 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/common/.config/btop/btop.conf b/common/.config/btop/btop.conf
index 00084d7..ac2601b 100644
--- a/common/.config/btop/btop.conf
+++ b/common/.config/btop/btop.conf
@@ -54,7 +54,7 @@ update_ms = 400
 
 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
 #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "memory"
+proc_sorting = "cpu lazy"
 
 #* Reverse sorting order, True or False.
 proc_reversed = False
@@ -69,7 +69,7 @@ proc_colors = True
 proc_gradient = True
 
 #* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
-proc_per_core = False
+proc_per_core = True
 
 #* Show process memory as bytes instead of percent.
 proc_mem_bytes = True
diff --git a/common/.config/nvim/lua/lsp-general.lua b/common/.config/nvim/lua/lsp-general.lua
index 2cb596d..9ba5303 100644
--- a/common/.config/nvim/lua/lsp-general.lua
+++ b/common/.config/nvim/lua/lsp-general.lua
@@ -48,7 +48,6 @@ lsp.setup_nvim_cmp({
     mapping = cmp_mappings,
 })
 
-
 lsp.on_attach(function(_, bufnr)
     vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
@@ -83,9 +82,18 @@ lsp.on_attach(function(_, bufnr)
     vim.keymap.set('n', 'gw', '<Cmd>StripWhitespace<CR>', opts)
 end)
 
+local rust_lsp = lsp.build_options('rust_analyzer', {
+      --cmd = { "/home/benk/programming/rust-analyzer/target/release/rust-analyzer" },
+})
 
-local rust_lsp = lsp.build_options('rust_analyzer', {})
-require('rust-tools').setup({ server = rust_lsp })
+require('rust-tools').setup({
+    server = rust_lsp,
+    tools = {
+        inlay_hints = {
+            auto = false,
+        }
+    },
+})
 
 lsp.setup()
 
diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua
index 419422e..fd773d0 100644
--- a/common/.config/nvim/lua/plugins.lua
+++ b/common/.config/nvim/lua/plugins.lua
@@ -48,7 +48,7 @@ local packer = require('packer').startup(function(use)
             vim.keymap.set("n", "<leader>hh", require("harpoon.ui").toggle_quick_menu, { desc = "Toggle harpoon menu" })
             vim.keymap.set("n", "<leader>hg", require("harpoon.mark").toggle_file, { desc = "Add file to harpoon list" })
             for pos = 1, 9 do
-                vim.keymap.set("n", "<leader>h" .. pos, function()
+                vim.keymap.set("n", "<C-w>" .. pos, function()
                     require("harpoon.ui").nav_file(pos)
                 end, { desc = "Move to harpoon mark #" .. pos })
             end
@@ -186,6 +186,7 @@ local packer = require('packer').startup(function(use)
                     .. '.'
                     .. vim.version().minor
                 },
+                border = 'none';
             })
         end
     }
diff --git a/common/.config/nvim/neovim.vim b/common/.config/nvim/neovim.vim
index d260f01..808206f 100644
--- a/common/.config/nvim/neovim.vim
+++ b/common/.config/nvim/neovim.vim
@@ -9,3 +9,5 @@ augroup vimload
     autocmd VimEnter * lua require('fsplash').open_window()
 augroup END
 
+colorscheme kanagawa
+
diff --git a/common/.vimrc b/common/.vimrc
index abff988..1c010a4 100644
--- a/common/.vimrc
+++ b/common/.vimrc
@@ -1,6 +1,4 @@
-if has('nvim')
-    colorscheme kanagawa
-else
+if !has('nvim')
     colorscheme evening
 endif
 
@@ -42,17 +40,17 @@ augroup numbertoggle
     autocmd BufLeave,FocusLost,InsertEnter,WinLeave   * if &nu                  | set nornu | endif
 augroup END
 
-set nolazyredraw
-set timeoutlen=600
-
 let g:netrw_banner=0
 let g:netrw_liststyle=3
 let g:netrw_browse_split=4
 let g:netrw_altv=1
 let g:netrw_winsize=25
 
+set nolazyredraw
+set updatetime=300
+set ttimeoutlen=50
+set timeoutlen=1000
 set history=1000
-set updatetime=69
 set mouse=nvi
 set cursorline
 
@@ -86,7 +84,7 @@ nn U <C-r>
 nn <C-r> <nop>
 
 " Peep the registers
-nn <lader>r :Telescope registers<cr>
+nn <leader>r :Telescope registers<cr>
 
 " Paste and keep the " register
 nn <leader>p "_dP
diff --git a/common/.zshrc b/common/.zshrc
index fb6b494..2d0f7e6 100644
--- a/common/.zshrc
+++ b/common/.zshrc
@@ -23,10 +23,8 @@ export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || pr
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
+export PATH=$PATH:$HOME/.local/bin/
+export PATH=$PATH:$HOME/.cargo/env/
+
 source $HOME/.zshrc.local
 
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-
-export PATH=$PATH:$HOME/.local/bin/
-