From f421c9f95d74f05a35457fdfce4fd95565877f12 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sat, 20 Nov 2021 22:24:07 +0100 Subject: Updated project-open to use $TERMINAL and changing the variable to alacritty --- config/alacritty/alacritty.linux.yml | 2 +- config/nvim/init.lua | 6 ++++++ config/nvim/lua/plugins.lua | 15 ++++++++++++++- config/zsh/zprofile | 8 ++++---- local/bin/project-open | 6 +++--- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/config/alacritty/alacritty.linux.yml b/config/alacritty/alacritty.linux.yml index 6c3b53e..db962d5 100644 --- a/config/alacritty/alacritty.linux.yml +++ b/config/alacritty/alacritty.linux.yml @@ -9,7 +9,7 @@ font: x: 0 y: 0 normal: - family: Fira Code + family: FiraCode Nerd Font Mono style: Regular italic: style: Italic diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 1afc4a3..bd37585 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,5 +1,7 @@ require('plugins') +-- print('init.lua') + -- common vim.g.mapleader = ' ' -- set leader key to space vim.g.maplocalleader = '-' -- set file local leader key to backslash @@ -103,6 +105,10 @@ vim.cmd [[ highlight link pythonTSKeywordOperator Keyword ]] require('nvim_comment').setup() +require('todo-comments').setup { + +} + -- local on_attach = function(_, bufnr) -- local opts = {noremap = true, silent = true } -- vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', 'lua vim.lsp.buf.declaration()', opts) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 1d5d0b4..05712a6 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -1,4 +1,4 @@ -vim.cmd [[packadd packer.nvim]] +vim.cmd [[ packadd packer.nvim ]] return require('packer').startup(function() use 'wbthomason/packer.nvim' -- plugin manager (can manage itself) @@ -30,4 +30,17 @@ return require('packer').startup(function() {'kyazdani42/nvim-web-devicons', opt = true}, } } + -- todos,fix,etc.. highlight and list + use { + 'folke/todo-comments.nvim', + requires = 'nvim-lua/plenary.nvim', + config = function() + print("plugins") + require('todo-comments').setup { + } + end + } end) + +-- TODO: bonjour +-- FIX: bonjour diff --git a/config/zsh/zprofile b/config/zsh/zprofile index 1388cd9..e9527f3 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -3,24 +3,24 @@ if [ "$(uname)" = 'Linux' ] then export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.local/bin" - export TERM='st-256color' export MAIL='me@cacharle.xyz' export SUDO='doas' elif [ "$(uname)" = 'Darwin' ] then export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" export PATH="$PATH:$HOME/.brew/bin:$HOME/git/dotfiles/bin:$HOME/bin:/usr/local/anaconda3/bin" - export TERM='xterm-256color' export MAIL='charles.cabergs@colruytgroup.com' export SUDO='sudo' fi # applications -export EDITOR='vim' -export TERMINAL='st' +export EDITOR='nvim' +export TERMINAL='alacritty' export BROWSER='qutebrowser' export BROWSERCLI='w3m' +export TERM='xterm-256color' + # XDG all the things export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" diff --git a/local/bin/project-open b/local/bin/project-open index adb27a4..63d9314 100755 --- a/local/bin/project-open +++ b/local/bin/project-open @@ -16,7 +16,7 @@ dest_path="$HOME/git/$dest" if cd "$dest_path" 2> /dev/null then touch "$dest_path" - exec st + exec "$TERMINAL" else while [ -z "$choice" ] do @@ -28,7 +28,7 @@ else mkdir -p "$dest_path" cd "$dest_path" || exit 1 git init - exec st + exec "$TERMINAL" ;; "clone") @@ -43,7 +43,7 @@ else other) ;; esac url="$prefix$(echo "$dest" | dmenu -p "Enter repository url: $prefix")" - st -e /bin/sh -c "git clone --recursive '$url' '$dest_path' && cd '$dest_path' && exec $SHELL" || + "$TERMINAL" -e /bin/sh -c "git clone --recursive '$url' '$dest_path' && cd '$dest_path' && exec $SHELL" || notify-send -u critical "Could not clone $url in $dest_path" && exit 1 ;; -- cgit From 3ab16167f2035aa7f4313a081d89d691161831b9 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sat, 20 Nov 2021 22:33:41 +0100 Subject: Added neovim todo-comments plugins to highlight and list todos --- config/nvim/init.lua | 6 ++---- config/nvim/lua/mappings.lua | 3 ++- config/nvim/lua/plugins.lua | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index bd37585..7988cee 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,7 +1,5 @@ require('plugins') --- print('init.lua') - -- common vim.g.mapleader = ' ' -- set leader key to space vim.g.maplocalleader = '-' -- set file local leader key to backslash @@ -105,9 +103,9 @@ vim.cmd [[ highlight link pythonTSKeywordOperator Keyword ]] require('nvim_comment').setup() -require('todo-comments').setup { +-- require('todo-comments').setup { -} +-- } -- local on_attach = function(_, bufnr) -- local opts = {noremap = true, silent = true } diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index 08e9862..990c4df 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -57,5 +57,6 @@ map('n', 'h', 'SidewaysLeft', {}) map('n', 'w', 'ArgWrap', {}) map('n', '', 'Telescope git_files', {}) -map('n', '', 'Telescope help_tags', {}) +map('n', 'H', 'Telescope help_tags', {}) +map('n', ';', 'Telescope commands', {}) map('n', ';', 'Telescope commands', {}) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 05712a6..c1c9bf3 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -35,12 +35,9 @@ return require('packer').startup(function() 'folke/todo-comments.nvim', requires = 'nvim-lua/plenary.nvim', config = function() - print("plugins") require('todo-comments').setup { + signs = false } end } end) - --- TODO: bonjour --- FIX: bonjour -- cgit From e248ebefcecc82f3b12da4ea0b3b8efd34252779 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sat, 20 Nov 2021 22:46:20 +0100 Subject: Moved nvim plugins config in plugins.lua file, Switching to comments.nvim since the other one add a bug with blank lines --- config/nvim/init.lua | 59 +--------------------------------- config/nvim/lua/mappings.lua | 1 - config/nvim/lua/plugins.lua | 75 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 71 insertions(+), 64 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 7988cee..c4125fc 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -43,69 +43,12 @@ vim.opt.laststatus=2 -- always a statusline (all window) vim.opt.showcmd = true -- show current partial command in the bottom right vim.opt.showmode = false -- dont show current mode (i.e --INSERT--) --- colorscheme -vim.opt.termguicolors = true -vim.opt.background = "dark" -vim.cmd [[ colorscheme gruvbox ]] -vim.g.gruvbox_italic = 1 -vim.g.gruvbox_bold = 1 -vim.g.gruvbox_termcolors = 256 -vim.g.gruvbox_contrast_dark = 'medium' -vim.g.gruvbox_contrast_light = 'hard' -vim.g.gruvbox_invert_selection = 0 - -local actions = require('telescope.actions') -require('telescope').setup { - defaults = { - mappings = { - i = { - [''] = actions.move_selection_next, - [''] = actions.move_selection_previous, - [''] = actions.close, - ['kj'] = actions.close, - } - }, - } -} - -require('lualine').setup { - options = { - theme = 'gruvbox', - icons_enabled = true, - section_separators = '', - component_separators = '' - } -} - -require('nvim-treesitter.configs').setup { - highlight = { - enable = true - }, - -- indent = { - -- enable = true - -- }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "gnn", - node_incremental = "grn", - scope_incremental = "grc", - node_decremental = "grm", - } - } -} -vim.cmd [[ highlight link pythonTSKeywordOperator Keyword ]] -- require 'nvim-treesitter.highlight' -- local hlmap = vim.treesitter.TSHighlighter.hl_map -- hlmap.error = nil - -require('nvim_comment').setup() - --- require('todo-comments').setup { - --- } +-- require('nvim_comment').setup() -- local on_attach = function(_, bufnr) -- local opts = {noremap = true, silent = true } diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index 990c4df..a99a478 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -59,4 +59,3 @@ map('n', 'w', 'ArgWrap', {}) map('n', '', 'Telescope git_files', {}) map('n', 'H', 'Telescope help_tags', {}) map('n', ';', 'Telescope commands', {}) -map('n', ';', 'Telescope commands', {}) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index c1c9bf3..7356e43 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -2,7 +2,6 @@ vim.cmd [[ packadd packer.nvim ]] return require('packer').startup(function() use 'wbthomason/packer.nvim' -- plugin manager (can manage itself) - use 'terrortylor/nvim-comment' -- comments use 'junegunn/vim-easy-align' -- align use 'AndrewRadev/sideways.vim' -- Move arguments sideways use 'FooSoft/vim-argwrap' -- Put arguments on multiple lines @@ -10,17 +9,67 @@ return require('packer').startup(function() use 'romainl/vim-cool' -- only highlight search matches when searching use 'neovim/nvim-lspconfig' -- nvim lsp configuration + use { + 'numToStr/Comment.nvim', + config = function() + require('Comment').setup() + end + } + -- color scheme - use {'ellisonleao/gruvbox.nvim', requires = {'rktjmp/lush.nvim'}} + use { + 'ellisonleao/gruvbox.nvim', + requires = {'rktjmp/lush.nvim'}, + config = function() + vim.opt.termguicolors = true + vim.opt.background = "dark" + vim.cmd [[ colorscheme gruvbox ]] + vim.g.gruvbox_italic = 1 + vim.g.gruvbox_bold = 1 + vim.g.gruvbox_termcolors = 256 + vim.g.gruvbox_contrast_dark = 'medium' + vim.g.gruvbox_contrast_light = 'hard' + vim.g.gruvbox_invert_selection = 0 + end + } -- status line use { 'nvim-lualine/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true} + requires = {'kyazdani42/nvim-web-devicons', opt = true}, + config = function() + require('lualine').setup { + options = { + theme = 'gruvbox', + icons_enabled = true, + section_separators = '', + component_separators = '' + } + } + end } -- better syntax highlight for everything use { 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate' + run = ':TSUpdate', + config = function() + require('nvim-treesitter.configs').setup { + highlight = { + enable = true + }, + -- indent = { enable = true }, + -- TODO: could be neat + -- incremental_selection = { + -- enable = true, + -- keymaps = { + -- init_selection = "gnn", + -- node_incremental = "grn", + -- scope_incremental = "grc", + -- node_decremental = "grm", + -- } + -- } + } + vim.cmd [[ highlight link pythonTSKeywordOperator Keyword ]] + end } -- fuzzy finder (replace fzf.vim or ctrlp.vim) use { @@ -28,7 +77,23 @@ return require('packer').startup(function() requires = { {'nvim-lua/plenary.nvim'}, {'kyazdani42/nvim-web-devicons', opt = true}, - } + }, + config = function() + local actions = require('telescope.actions') + require('telescope').setup { + defaults = { + mappings = { + i = { + [''] = actions.move_selection_next, + [''] = actions.move_selection_previous, + [''] = actions.close, + ['kj'] = actions.close, + } + }, + } + } + end + } -- todos,fix,etc.. highlight and list use { -- cgit From e7dcd16d9097b5387563c06ed867a9bb588cf9d8 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Mon, 22 Nov 2021 20:40:15 +0100 Subject: Updated alacritty to use Fira Mono Italic --- config/alacritty/alacritty.linux.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/alacritty/alacritty.linux.yml b/config/alacritty/alacritty.linux.yml index db962d5..d30521e 100644 --- a/config/alacritty/alacritty.linux.yml +++ b/config/alacritty/alacritty.linux.yml @@ -2,6 +2,9 @@ # alacritty # ############# +env: + TERM: xterm-256color + # font font: size: 9.0 @@ -9,11 +12,13 @@ font: x: 0 y: 0 normal: - family: FiraCode Nerd Font Mono + family: Fira Code style: Regular italic: + family: FiraMono style: Italic bold: + family: Fira Code style: Bold use_thin_strokes: false -- cgit From 3dc9c82a978dbc61099bcfd28639f72665b4d328 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Mon, 22 Nov 2021 20:42:33 +0100 Subject: Fixing CI by not recompiling xmonad in it --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index 1f881f0..b32e3a4 100755 --- a/test +++ b/test @@ -29,6 +29,6 @@ then fi # XMONAD -xmonad --recompile || ret=$? +[ ! "$CI" = 'true' ] && { xmonad --recompile || ret=$?; } exit $ret -- cgit From 871f5a843847e5a3103646ecdfb300a0250e486f Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 1 Dec 2021 18:06:28 +0100 Subject: Added rust lsp to neovim --- config/alacritty/alacritty.linux.yml | 1 + config/nvim/lua/plugins.lua | 31 ++++++++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/config/alacritty/alacritty.linux.yml b/config/alacritty/alacritty.linux.yml index d30521e..7ca4f80 100644 --- a/config/alacritty/alacritty.linux.yml +++ b/config/alacritty/alacritty.linux.yml @@ -4,6 +4,7 @@ env: TERM: xterm-256color + WINIT_X11_SCALE_FACTOR: '1' # font font: diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 7356e43..4cd9db0 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -7,18 +7,40 @@ return require('packer').startup(function() use 'FooSoft/vim-argwrap' -- Put arguments on multiple lines use 'tpope/vim-eunuch' -- basic commands on current file (Rename/Remove) use 'romainl/vim-cool' -- only highlight search matches when searching - use 'neovim/nvim-lspconfig' -- nvim lsp configuration + -- nvim lsp configuration + use { + 'neovim/nvim-lspconfig', + config = function() + end + } + + -- rust lsp (needs rust-analyser) + use { + 'simrat39/rust-tools.nvim', + requires = {'neovim/nvim-lspconfig'}, + ft = {'rust'}, + config = function() + require('rust-tools').setup { + tools = { + inlay_hints = { + -- only_current_line = true, + }, + }, + } + end + } + + -- comment text objects use { 'numToStr/Comment.nvim', config = function() require('Comment').setup() end } - -- color scheme use { - 'ellisonleao/gruvbox.nvim', + 'ellisonleao/gruvbox.nvim', requires = {'rktjmp/lush.nvim'}, config = function() vim.opt.termguicolors = true @@ -105,4 +127,7 @@ return require('packer').startup(function() } end } + + use { 'nvim-treesitter/playground', opt = true, cmd = { 'TSPlaygroundToggle' } } + use { '~/git/argwrap.nvim', opt = true } end) -- cgit From 2a913aaf1574ccdce25a0a0b687515d4276676aa Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 1 Dec 2021 18:07:03 +0100 Subject: Added autocmd to run PackerCompile after modifing plugins.lua --- config/nvim/init.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index c4125fc..d038f0d 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -60,4 +60,11 @@ vim.opt.showmode = false -- dont show current mode (i.e --INSERT--) -- require('lspconfig').clangd.setup {} -- require('lspconfig').pyright.setup { on_attach = on_attach } +vim.cmd [[ +augroup packer_user_config + autocmd! + autocmd BufWritePost plugins.lua source | PackerCompile +augroup end +]] + require('mappings') -- cgit From 76d9b52f8eef8bc389ae47a1a47ff5f2f1f8375f Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 1 Dec 2021 18:15:53 +0100 Subject: Added C lsp for neovim --- config/nvim/init.lua | 4 ---- config/nvim/lua/plugins.lua | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index d038f0d..7436b8b 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -43,13 +43,10 @@ vim.opt.laststatus=2 -- always a statusline (all window) vim.opt.showcmd = true -- show current partial command in the bottom right vim.opt.showmode = false -- dont show current mode (i.e --INSERT--) - -- require 'nvim-treesitter.highlight' -- local hlmap = vim.treesitter.TSHighlighter.hl_map -- hlmap.error = nil --- require('nvim_comment').setup() - -- local on_attach = function(_, bufnr) -- local opts = {noremap = true, silent = true } -- vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', 'lua vim.lsp.buf.declaration()', opts) @@ -57,7 +54,6 @@ vim.opt.showmode = false -- dont show current mode (i.e --INSERT--) -- vim.api.nvim_buf_set_keymap(bufnr, 'n', '', 'lua vim.lsp.buf.signature_help()', opts) -- end --- require('lspconfig').clangd.setup {} -- require('lspconfig').pyright.setup { on_attach = on_attach } vim.cmd [[ diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 4cd9db0..652c1c6 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -12,6 +12,7 @@ return require('packer').startup(function() use { 'neovim/nvim-lspconfig', config = function() + require('lspconfig').clangd.setup {} end } -- cgit From 8ddbd88a633894f7cb411e6c16bac232ce30b179 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 1 Dec 2021 21:10:16 +0100 Subject: Added python lsp for neovim (with flake8 integration) --- config/nvim/lua/plugins.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 652c1c6..6b57eee 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -11,9 +11,14 @@ return require('packer').startup(function() -- nvim lsp configuration use { 'neovim/nvim-lspconfig', + ft = {'rust', 'python', 'c', 'cpp'}, config = function() - require('lspconfig').clangd.setup {} - end + local lspconfig = require('lspconfig') + lspconfig.clangd.setup {} + -- need python-lsp-server and pyls-flake8 + lspconfig.pylsp.setup {} + end, + run = 'pip3 install python-lsp-server pyls-flake8', } -- rust lsp (needs rust-analyser) -- cgit From 9110076ffb4bc58f7cd7a4fc42657c05a06dd0b0 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 1 Dec 2021 21:14:33 +0100 Subject: Updated neovim config to disable treesitter error highlight --- config/nvim/init.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 7436b8b..cb1d827 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -43,9 +43,10 @@ vim.opt.laststatus=2 -- always a statusline (all window) vim.opt.showcmd = true -- show current partial command in the bottom right vim.opt.showmode = false -- dont show current mode (i.e --INSERT--) --- require 'nvim-treesitter.highlight' --- local hlmap = vim.treesitter.TSHighlighter.hl_map --- hlmap.error = nil +-- remove ugly treesitter error highlight +require 'nvim-treesitter.highlight' +local hlmap = vim.treesitter.highlighter.hl_map +hlmap.error = nil -- local on_attach = function(_, bufnr) -- local opts = {noremap = true, silent = true } -- cgit From 21aced73025d56d0a8375053043aa3f977e9c46c Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 1 Dec 2021 21:28:09 +0100 Subject: Added emoji font to qutebrowser --- config/qutebrowser/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py index 15b0343..269a38c 100644 --- a/config/qutebrowser/config.py +++ b/config/qutebrowser/config.py @@ -40,7 +40,8 @@ c.url.searchengines = { c.window.hide_decoration = False config.bind("", "config-cycle window.hide_decoration true false", mode="normal") -c.fonts.default_family = ["Fira Mono", "Baekmuk", "Symbola"] +# package noto-fonts-emoji on ArchLinux +c.fonts.default_family = ["Fira Mono", "Baekmuk", "Noto Color Emoji", "Symbola"] c.fonts.hints = "bold 11pt default_family" if platform.system() == 'Darwin': c.fonts.default_size = '13pt' @@ -439,3 +440,4 @@ c.colors.tabs.selected.even.bg = base05 c.colors.webpage.bg = base00 # vim:TSBufDisable highlight +# vim:LspStop -- cgit From 162f1689c620c79d822f9604db398f5c9ff0ec91 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Thu, 2 Dec 2021 20:32:46 +0100 Subject: Disabling lsp diagnostics sign in gutter neovim --- config/nvim/lua/plugins.lua | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 6b57eee..7124738 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -11,14 +11,14 @@ return require('packer').startup(function() -- nvim lsp configuration use { 'neovim/nvim-lspconfig', - ft = {'rust', 'python', 'c', 'cpp'}, - config = function() - local lspconfig = require('lspconfig') - lspconfig.clangd.setup {} - -- need python-lsp-server and pyls-flake8 - lspconfig.pylsp.setup {} - end, - run = 'pip3 install python-lsp-server pyls-flake8', + -- ft = {'rust', 'python', 'c', 'cpp'}, + -- config = function() + -- local lspconfig = require('lspconfig') + -- lspconfig.clangd.setup {} + -- -- need python-lsp-server and pyls-flake8 + -- lspconfig.pylsp.setup {} + -- -- lspconfig.rust_analyser.setup {} + -- end, } -- rust lsp (needs rust-analyser) @@ -27,12 +27,10 @@ return require('packer').startup(function() requires = {'neovim/nvim-lspconfig'}, ft = {'rust'}, config = function() - require('rust-tools').setup { - tools = { - inlay_hints = { - -- only_current_line = true, - }, - }, + require('rust-tools').setup {} + vim.diagnostic.config { + signs = false, + update_in_insert = false, } end } -- cgit From 7495daf2b5073739ec2f3af027542a4a28d47c60 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Fri, 3 Dec 2021 21:31:46 +0100 Subject: Added remove trailing white spaces on save to neovim --- config/nvim/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index cb1d827..9409c5c 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -64,4 +64,7 @@ augroup packer_user_config augroup end ]] +-- remove trailing white space on save +vim.cmd [[ autocmd BufWritePre * %s/\s\+$//e ]] + require('mappings') -- cgit From 164162c72c529c3bc4219a59fff21daa3c6841ea Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sun, 5 Dec 2021 16:46:49 +0100 Subject: Added distant.nvim and magma nvim plugins --- config/nvim/lua/mappings.lua | 5 ----- config/nvim/lua/plugins.lua | 47 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index a99a478..1e051d7 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -47,7 +47,6 @@ vim.cmd [[ autocmd FileType python nmap bd :g/^\s*breakpoint()$/d ]] vim.cmd [[ autocmd FileType python nmap ba mqobreakpoint()`q ]] -- pluggins - map('x', 'ga', 'EasyAlign', {}) map('n', 'ga', 'EasyAlign', {}) @@ -55,7 +54,3 @@ map('n', 'l', 'SidewaysRight', {}) map('n', 'h', 'SidewaysLeft', {}) map('n', 'w', 'ArgWrap', {}) - -map('n', '', 'Telescope git_files', {}) -map('n', 'H', 'Telescope help_tags', {}) -map('n', ';', 'Telescope commands', {}) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 7124738..3a365e3 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -11,14 +11,14 @@ return require('packer').startup(function() -- nvim lsp configuration use { 'neovim/nvim-lspconfig', - -- ft = {'rust', 'python', 'c', 'cpp'}, - -- config = function() - -- local lspconfig = require('lspconfig') - -- lspconfig.clangd.setup {} - -- -- need python-lsp-server and pyls-flake8 - -- lspconfig.pylsp.setup {} - -- -- lspconfig.rust_analyser.setup {} - -- end, + ft = {'rust', 'python', 'c', 'cpp'}, + config = function() + local lspconfig = require('lspconfig') + lspconfig.clangd.setup {} + -- need python-lsp-server and pyls-flake8 + lspconfig.pylsp.setup {} + -- lspconfig.rust_analyser.setup {} + end, } -- rust lsp (needs rust-analyser) @@ -118,6 +118,10 @@ return require('packer').startup(function() }, } } + local map = vim.api.nvim_set_keymap + map('n', '', 'Telescope git_files', {}) + map('n', 'H', 'Telescope help_tags', {}) + map('n', ';', 'Telescope commands', {}) end } @@ -132,6 +136,33 @@ return require('packer').startup(function() end } + -- remote files and lsp + use { + 'chipsenkbeil/distant.nvim', + config = function() + require('distant').setup { + ['*'] = require('distant.settings').chip_default() + } + end, + run = ':DistantInstall' + } + + -- jupyter kernel in nvim (with images, needs ueberzug) + use { + 'dccsillag/magma-nvim', + -- ft = { 'python' }, -- doesn't work + run = ':UpdateRemotePlugins', + config = function() + local map = vim.api.nvim_set_keymap + map('n', 'm', "nvim_exec('MagmaEvaluateOperator', v:true)", { expr = true}) + map('n', 'mm', ':MagmaEvaluateLine', {}) + map('x', 'm', ':MagmaEvaluateVisual', {}) + map('n', 'mc', ':MagmaReevaluateCell', {}) + map('n', 'md', ':MagmaDelete', {}) + map('n', 'mo', ':MagmaShowOutput', {}) + end + } + use { 'nvim-treesitter/playground', opt = true, cmd = { 'TSPlaygroundToggle' } } use { '~/git/argwrap.nvim', opt = true } end) -- cgit From 2dc81b49c99d14ea7c604dc73f5c35e134588518 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sun, 5 Dec 2021 17:26:20 +0100 Subject: Added lsp key bindings --- config/nvim/lua/mappings.lua | 3 +++ config/nvim/lua/plugins.lua | 29 ++++++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index 1e051d7..008405d 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -7,6 +7,9 @@ map('n', 'sc', 'source $MYVIMRC', {}) -- source vimrc map('n', ';', 'mqA;`q', {}) -- put semicolon at the end of line map('n', 'cu', 'ct_', {}) -- common change until map('n', 'ss', 'setlocal spell!', {}) -- toggle spelling check +map('n', ']', '', {}) -- toggle spelling check +map('n', 't', '', {}) -- toggle spelling check + -- split navigation map('n', '', '', {}) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 3a365e3..8786fe0 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -13,10 +13,25 @@ return require('packer').startup(function() 'neovim/nvim-lspconfig', ft = {'rust', 'python', 'c', 'cpp'}, config = function() + local on_attach = function(client, bufnr) + local opts = { noremap = true, silent = true } + local map = function(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end + map('n', '[', 'lua vim.lsp.buf.declaration()', opts) + map('n', ']', 'lua vim.lsp.buf.definition()', opts) + map('n', 'K', 'lua vim.lsp.buf.hover()', opts) + map('n', '[d', 'lua vim.diagnostic.goto_prev()', opts) + map('n', ']d', 'lua vim.diagnostic.goto_next()', opts) + map('n', 'q', 'Telescope lsp_workspace_diagnostics', opts) + map('n', 'rn', 'lua vim.lsp.buf.rename()', opts) + end local lspconfig = require('lspconfig') - lspconfig.clangd.setup {} + lspconfig.clangd.setup { on_attach = on_attach } -- need python-lsp-server and pyls-flake8 - lspconfig.pylsp.setup {} + lspconfig.pylsp.setup { on_attach = on_attach } + vim.diagnostic.config { + signs = false, + update_in_insert = false, + } -- lspconfig.rust_analyser.setup {} end, } @@ -155,11 +170,11 @@ return require('packer').startup(function() config = function() local map = vim.api.nvim_set_keymap map('n', 'm', "nvim_exec('MagmaEvaluateOperator', v:true)", { expr = true}) - map('n', 'mm', ':MagmaEvaluateLine', {}) - map('x', 'm', ':MagmaEvaluateVisual', {}) - map('n', 'mc', ':MagmaReevaluateCell', {}) - map('n', 'md', ':MagmaDelete', {}) - map('n', 'mo', ':MagmaShowOutput', {}) + map('n', 'mm', 'MagmaEvaluateLine', {}) + map('x', 'm', 'MagmaEvaluateVisual', {}) + map('n', 'mc', 'MagmaReevaluateCell', {}) + map('n', 'md', 'MagmaDelete', {}) + map('n', 'mo', 'MagmaShowOutput', {}) end } -- cgit From 6bb3fa958f775c9ff5769e2cb00ccaabe664fd99 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sun, 5 Dec 2021 19:08:59 +0100 Subject: Added rust_analyzer lsp --- config/nvim/lua/plugins.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 8786fe0..dca67fb 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -28,11 +28,12 @@ return require('packer').startup(function() lspconfig.clangd.setup { on_attach = on_attach } -- need python-lsp-server and pyls-flake8 lspconfig.pylsp.setup { on_attach = on_attach } + -- rust_analyzer + lspconfig.rust_analyzer.setup { on_attach = on_attach } vim.diagnostic.config { signs = false, update_in_insert = false, } - -- lspconfig.rust_analyser.setup {} end, } -- cgit From 4adc57a365aa52ff5d4509fb6b09fc54878d9342 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sun, 5 Dec 2021 19:24:37 +0100 Subject: Added lua lsp --- config/nvim/lua/plugins.lua | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index dca67fb..72ef03d 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -11,7 +11,7 @@ return require('packer').startup(function() -- nvim lsp configuration use { 'neovim/nvim-lspconfig', - ft = {'rust', 'python', 'c', 'cpp'}, + ft = {'rust', 'python', 'c', 'cpp', 'lua'}, config = function() local on_attach = function(client, bufnr) local opts = { noremap = true, silent = true } @@ -30,6 +30,31 @@ return require('packer').startup(function() lspconfig.pylsp.setup { on_attach = on_attach } -- rust_analyzer lspconfig.rust_analyzer.setup { on_attach = on_attach } + -- package lua-language-server on ArchLinux + lspconfig.sumneko_lua.setup { + on_attach = on_attach , + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = vim.split(package.path, ';'), + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'}, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = { + [vim.fn.expand('$VIMRUNTIME/lua')] = true, + [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true, + }, + }, + } + }, + } vim.diagnostic.config { signs = false, update_in_insert = false, -- cgit