diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index cea7e26..965b4e9 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -40,3 +40,82 @@ colors: magenta: '#c594c5' cyan: '#5fb3b3' white: '#f3f4f5' + +# this stupid shit is needed because alacritty can't take the option key as Alt +key_bindings: + - { key: A, mods: Alt, chars: "\x1ba" } + - { key: B, mods: Alt, chars: "\x1bb" } + - { key: C, mods: Alt, chars: "\x1bc" } + - { key: D, mods: Alt, chars: "\x1bd" } + - { key: E, mods: Alt, chars: "\x1be" } + - { key: F, mods: Alt, chars: "\x1bf" } + - { key: G, mods: Alt, chars: "\x1bg" } + - { key: H, mods: Alt, chars: "\x1bh" } + - { key: I, mods: Alt, chars: "\x1bi" } + - { key: J, mods: Alt, chars: "\x1bj" } + - { key: K, mods: Alt, chars: "\x1bk" } + - { key: L, mods: Alt, chars: "\x1bl" } + - { key: M, mods: Alt, chars: "\x1bm" } + - { key: N, mods: Alt, chars: "\x1bn" } + - { key: O, mods: Alt, chars: "\x1bo" } + - { key: P, mods: Alt, chars: "\x1bp" } + - { key: Q, mods: Alt, chars: "\x1bq" } + - { key: R, mods: Alt, chars: "\x1br" } + - { key: S, mods: Alt, chars: "\x1bs" } + - { key: T, mods: Alt, chars: "\x1bt" } + - { key: U, mods: Alt, chars: "\x1bu" } + - { key: V, mods: Alt, chars: "\x1bv" } + - { key: W, mods: Alt, chars: "\x1bw" } + - { key: X, mods: Alt, chars: "\x1bx" } + - { key: Y, mods: Alt, chars: "\x1by" } + - { key: Z, mods: Alt, chars: "\x1bz" } + - { key: A, mods: Alt|Shift, chars: "\x1bA" } + - { key: B, mods: Alt|Shift, chars: "\x1bB" } + - { key: C, mods: Alt|Shift, chars: "\x1bC" } + - { key: D, mods: Alt|Shift, chars: "\x1bD" } + - { key: E, mods: Alt|Shift, chars: "\x1bE" } + - { key: F, mods: Alt|Shift, chars: "\x1bF" } + - { key: G, mods: Alt|Shift, chars: "\x1bG" } + - { key: H, mods: Alt|Shift, chars: "\x1bH" } + - { key: I, mods: Alt|Shift, chars: "\x1bI" } + - { key: J, mods: Alt|Shift, chars: "\x1bJ" } + - { key: K, mods: Alt|Shift, chars: "\x1bK" } + - { key: L, mods: Alt|Shift, chars: "\x1bL" } + - { key: M, mods: Alt|Shift, chars: "\x1bM" } + - { key: N, mods: Alt|Shift, chars: "\x1bN" } + - { key: O, mods: Alt|Shift, chars: "\x1bO" } + - { key: P, mods: Alt|Shift, chars: "\x1bP" } + - { key: Q, mods: Alt|Shift, chars: "\x1bQ" } + - { key: R, mods: Alt|Shift, chars: "\x1bR" } + - { key: S, mods: Alt|Shift, chars: "\x1bS" } + - { key: T, mods: Alt|Shift, chars: "\x1bT" } + - { key: U, mods: Alt|Shift, chars: "\x1bU" } + - { key: V, mods: Alt|Shift, chars: "\x1bV" } + - { key: W, mods: Alt|Shift, chars: "\x1bW" } + - { key: X, mods: Alt|Shift, chars: "\x1bX" } + - { key: Y, mods: Alt|Shift, chars: "\x1bY" } + - { key: Z, mods: Alt|Shift, chars: "\x1bZ" } + - { key: Key1, mods: Alt, chars: "\x1b1" } + - { key: Key2, mods: Alt, chars: "\x1b2" } + - { key: Key3, mods: Alt, chars: "\x1b3" } + - { key: Key4, mods: Alt, chars: "\x1b4" } + - { key: Key5, mods: Alt, chars: "\x1b5" } + - { key: Key6, mods: Alt, chars: "\x1b6" } + - { key: Key7, mods: Alt, chars: "\x1b7" } + - { key: Key8, mods: Alt, chars: "\x1b8" } + - { key: Key9, mods: Alt, chars: "\x1b9" } + - { key: Key0, mods: Alt, chars: "\x1b0" } + - { key: Space, mods: Control, chars: "\x00" } # Ctrl + Space + - { key: Grave, mods: Alt, chars: "\x1b`" } # Alt + ` + - { key: Grave, mods: Alt|Shift, chars: "\x1b~" } # Alt + ~ + - { key: Period, mods: Alt, chars: "\x1b." } # Alt + . + - { key: Key8, mods: Alt|Shift, chars: "\x1b*" } # Alt + * + - { key: Key3, mods: Alt|Shift, chars: "\x1b#" } # Alt + # + - { key: Period, mods: Alt|Shift, chars: "\x1b>" } # Alt + > + - { key: Comma, mods: Alt|Shift, chars: "\x1b<" } # Alt + < + - { key: Minus, mods: Alt|Shift, chars: "\x1b_" } # Alt + _ + - { key: Key5, mods: Alt|Shift, chars: "\x1b%" } # Alt + % + - { key: Key6, mods: Alt|Shift, chars: "\x1b^" } # Alt + ^ + - { key: Backslash, mods: Alt, chars: "\x1b\\" } # Alt + \ + - { key: Backslash, mods: Alt, chars: "\x1b\\" } # Alt + \ + - { key: Slash, mods: Alt, chars: "\x1b/" } # Alt + / diff --git a/nvim/.config/nvim/after/plugin/mason-lspconfig.lua b/nvim/.config/nvim/after/plugin/mason-lspconfig.lua new file mode 100644 index 0000000..3f024e4 --- /dev/null +++ b/nvim/.config/nvim/after/plugin/mason-lspconfig.lua @@ -0,0 +1,2 @@ +require("mason").setup() +require("mason-lspconfig").setup() diff --git a/nvim/.config/nvim/lua/clint/keybindings.lua b/nvim/.config/nvim/lua/clint/keybindings.lua index 179ddc1..95f5e7d 100644 --- a/nvim/.config/nvim/lua/clint/keybindings.lua +++ b/nvim/.config/nvim/lua/clint/keybindings.lua @@ -1,6 +1,6 @@ +--[[ -- Generic Keybindings for all files --- --- +--]] local keymap = vim.api.nvim_set_keymap local default_ops = { noremap = true, silent = true } @@ -12,10 +12,10 @@ keymap('i', 'jk', '', default_ops) keymap("n", "x", '"_x', default_ops) -- Window management -keymap("n", "sv", "v", default_ops) -keymap("n", "sh", "s", default_ops) -keymap("n", "se", "=", default_ops) -keymap("n", "sx", ":close", default_ops) +keymap("n", "sv", "v", default_ops) +keymap("n", "sh", "s", default_ops) +keymap("n", "se", "=", default_ops) +keymap("n", "sx", ":close", default_ops) -- Save, Save/Quit keymap('n', '', ':w', default_ops) diff --git a/nvim/.config/nvim/lua/clint/lsp.lua b/nvim/.config/nvim/lua/clint/lsp.lua index c58146f..f8f1346 100644 --- a/nvim/.config/nvim/lua/clint/lsp.lua +++ b/nvim/.config/nvim/lua/clint/lsp.lua @@ -1,13 +1,25 @@ local cmp = require'cmp' -local capabilities = require('cmp_nvim_lsp').default_capabilities() +-- local capabilities = require('cmp_nvim_lsp').default_capabilities() -require'lspconfig'.jedi_language_server.setup{ - on_attach = - function() +local on_attach = function() vim.keymap.set("n", "K", vim.lsp.buf.hover, {buffer=0}) vim.keymap.set("n", "gd", vim.lsp.buf.definition, {buffer=0}) vim.keymap.set("n", "r", vim.lsp.buf.rename, {buffer=0}) end + +require'lspconfig'.jedi_language_server.setup{ + on_attach = on_attach +} + +require'lspconfig'.sumneko_lua.setup{ + on_attach = on_attach, + settings = { + Lua = { + diagnostics = { + globals = { 'vim' } + } + } + } } cmp.setup({ diff --git a/nvim/.config/nvim/lua/clint/plugins.lua b/nvim/.config/nvim/lua/clint/plugins.lua index 622490d..a64df3b 100644 --- a/nvim/.config/nvim/lua/clint/plugins.lua +++ b/nvim/.config/nvim/lua/clint/plugins.lua @@ -1,3 +1,5 @@ +vim.fn.setenv("MACOSX_DEPLOYMENT_TARGET", "12.2.1") + vim.cmd [[packadd packer.nvim]] return require('packer').startup(function(use) @@ -5,6 +7,9 @@ return require('packer').startup(function(use) use('wbthomason/packer.nvim') -- LSP + -- mason - manager for lsp, dap, linter + use("williamboman/mason.nvim") + use("williamboman/mason-lspconfig.nvim") use('neovim/nvim-lspconfig') use('hrsh7th/cmp-nvim-lsp') use('hrsh7th/cmp-nvim-lua') @@ -43,7 +48,7 @@ return require('packer').startup(function(use) -- SuperTab use('ervandew/supertab') - + -- Slime, for tmux repl-ing use('jpalardy/vim-slime') @@ -99,6 +104,21 @@ return require('packer').startup(function(use) end } + -- mason - manager for lsp, dap, linter + use { "williamboman/mason.nvim" } + + -- Tree + use { + "nvim-neo-tree/neo-tree.nvim", + branch = "v2.x", + requires = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended + "MunifTanjim/nui.nvim", + } + } + + end )