dvorak

lua/config/bindings.lua

@@ -23,6 +23,17 @@ vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")				--exit terminal mode with esc
 vim.keymap.set("n", "<A-ESC>", ":tabnew | terminal htop<cr>")		--open htop in new tab
 vim.keymap.set("n", "<A-t>", ":tabnew | terminal termusic<cr>")		--open termusic (a music player) in new tab
 vim.keymap.set("n", "<A-m>", ":tabnew | terminal gomuks<cr>")		--open gomuks (a matrix client) in new tab
-vim.keymap.set("n", "<A-r>", ":tabnew | terminal ranger<cr>")		--open ranger (a file manager) in new tab
 vim.keymap.set("n", "<A-V>", ":split new<cr>")				--create a new split
 vim.keymap.set("n", "<A-v>", ":vs new<cr>")				--create a vplit
+
+--dvorak
+vim.keymap.set({"n","v","o"}, "h", "h")					--move left
+vim.keymap.set({"n","v","o"}, "t", "j")					--move down
+vim.keymap.set({"n","v","o"}, "n", "k")					--move up
+vim.keymap.set({"n","v","o"}, "s", "l")					--move right
+vim.keymap.set({"n","v","o"}, "l", "n")					--next
+vim.keymap.set({"n","v","o"}, "L", "N")					--last
+vim.keymap.set("n", "<A-s>", ":wincmd l<cr>")
+vim.keymap.set("n", "<A-n>", ":wincmd k<cr>")
+vim.keymap.set("n", "<A-t>", ":wincmd j<cr>")
+vim.keymap.set("n", "<A-h>", ":wincmd h<cr>")

lua/config/lsp-config.lua

@@ -64,10 +64,16 @@
 
 
 
+  require("mason").setup()
+  require("mason-lspconfig").setup()
 
   -- Set up lspconfig.
   local capabilities = require('cmp_nvim_lsp').default_capabilities()
   -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
+  --
+  require("mason-lspconfig").setup({
+	  ensure_installed = { "lua_ls" }
+  })
   require('lspconfig')['clangd'].setup {
     capabilities = capabilities
   }
@@ -80,3 +86,13 @@
   require('lspconfig')['bashls'].setup {
     capabilities = capabilities
   }
+  require('lspconfig')['rust_analyzer'].setup {
+    capabilities = capabilities
+  }
+  require('lspconfig')['arduino_language_server'].setup {
+	cmd = {"arduino-language-server",
+		"-fqbn", "arduino:avr:mega",
+		"-cli", "arduino-cli",
+		"-clangd", "clangd",
+		"-cli-config", "$HOME/.arduino15/arduino-cli.yaml"}
+  }