From bc7ce79c2015090401aad4e639df76e7ec19d473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 7 Nov 2023 16:11:00 +0100 Subject: [PATCH 1/4] Update lock file --- nvim/lazy-lock.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 375a554..cbd24bb 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -6,33 +6,33 @@ "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp-snippy": { "branch": "master", "commit": "c4dc31232c510cd32d4708701e6f06746d46df90" }, - "diffview.nvim": { "branch": "main", "commit": "0437ef8bfdd67156d87140d692840a3c2824fa20" }, - "flash.nvim": { "branch": "main", "commit": "6d76c5dee65181ab55cbdfb0760260e800d643f4" }, + "cmp-snippy": { "branch": "master", "commit": "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3" }, + "diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" }, + "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "formatter.nvim": { "branch": "master", "commit": "34dcdfa0c75df667743b2a50dd99c84a557376f0" }, - "lazy.nvim": { "branch": "main", "commit": "2947f104e140e21cc87c55f86c1599fbe26caf0f" }, - "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "lush.nvim": { "branch": "main", "commit": "966aad1accd47fa11fbe2539234f81f678fef2de" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ddefe5ab051e7ca6a7b374754f0920c44668b54f" }, - "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, - "neogit": { "branch": "master", "commit": "3f6e559cc9c8a708f8b883ad9987c0a12aa1b3fa" }, - "nvim-autopairs": { "branch": "master", "commit": "748e72c05495a3d30e88a6ef04b21697019a9aa9" }, - "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, - "nvim-lspconfig": { "branch": "master", "commit": "2b361e043810d5587d9af0787f8ce40da92ec5e9" }, - "nvim-snippy": { "branch": "master", "commit": "5787f088c99c04309a8aa6363fd3ac9a5a26b780" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" }, + "mason.nvim": { "branch": "main", "commit": "eabf6d347fdb75be360d4c0ced1145670a171453" }, + "neogit": { "branch": "master", "commit": "29583c2bd0c4b552fbb16e93bf4f26febbe4a3c2" }, + "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, + "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, + "nvim-lspconfig": { "branch": "master", "commit": "37457f268af5cd6765e589b0dcd7cbd192d8da00" }, + "nvim-snippy": { "branch": "master", "commit": "c3e289ee651957c44d5f62b1daa92bc1ac80ebf4" }, "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" }, - "nvim-treesitter": { "branch": "master", "commit": "0eb1a0ad1c82e080e77e7b9d7a5e42632cefb543" }, - "nvim-web-devicons": { "branch": "master", "commit": "a1e6268779411048a87f767a27380089362a0ce2" }, - "oil.nvim": { "branch": "master", "commit": "f72b9b2637eec2b3db8255c196aa4bf11231af81" }, - "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, + "nvim-treesitter": { "branch": "master", "commit": "9a746b4b6a1ef215943f07e6aa2ec35fb14097d4" }, + "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" }, + "oil.nvim": { "branch": "master", "commit": "6175bd646272335c8db93264760760d8f2a611d5" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, - "telescope.nvim": { "branch": "master", "commit": "5a747a9587e4bfc4ae086a38cc679fe54f983b69" }, - "trim.nvim": { "branch": "master", "commit": "2df124c2c2844d3143091ebd3ae8b49bbe06bc5e" }, - "trouble.nvim": { "branch": "main", "commit": "02219b557d4726a789be58c5d6bd6e139c46a9fe" }, + "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "trim.nvim": { "branch": "master", "commit": "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7" }, + "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-bracketed-paste": { "branch": "master", "commit": "45411da73cc159e4fc2138d930553d247bbfbcdc" }, "vim-rooter": { "branch": "master", "commit": "1353fa47ee3a81083c284e28ff4f7d92655d7c9e" }, - "vim-snippets": { "branch": "master", "commit": "ccc2fa1529d372f7ac16d5eb07a385a72b50e05d" }, - "vimtex": { "branch": "master", "commit": "03c83443108a6984bf90100f6d00ec270b84a339" }, - "vimwiki": { "branch": "dev", "commit": "f0fe154ede6b11e3db9b058b930005a056a3d1c6" } + "vim-snippets": { "branch": "master", "commit": "b039190177d97a968d80518470910aae7faf182a" }, + "vimtex": { "branch": "master", "commit": "7d1dbd0eebe041fbda4d1132622bf051b1546497" }, + "vimwiki": { "branch": "dev", "commit": "0bb1b4945bb205a076a35b66174e5d66be8eaafe" } } \ No newline at end of file From caef18ce132658c9730043557a56e2bda8cfc887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 7 Nov 2023 16:13:54 +0100 Subject: [PATCH 2/4] Update micromamba config --- zsh/.zshrc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index b43400d..3ecc645 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -136,17 +136,13 @@ export GOPATH=/tmp/go # >>> mamba initialize >>> # !! Contents within this block are managed by 'mamba init' !! -export MAMBA_EXE="/usr/bin/micromamba"; +export MAMBA_EXE="$HOME/.local/bin/micromamba"; export MAMBA_ROOT_PREFIX="$HOME/.micromamba"; -__mamba_setup="$('/usr/bin/micromamba' shell hook --shell zsh --prefix '$HOME/.micromamba' 2> /dev/null)" +__mamba_setup="$("$MAMBA_EXE" shell hook --shell zsh --root-prefix "$MAMBA_ROOT_PREFIX" 2> /dev/null)" if [ $? -eq 0 ]; then eval "$__mamba_setup" else - if [ -f "$HOME/.micromamba/etc/profile.d/micromamba.sh" ]; then - . "$HOME/.micromamba/etc/profile.d/micromamba.sh" - else - export PATH="$HOME/.micromamba/bin:$PATH" # extra space after export prevents interference from conda init - fi + alias micromamba="$MAMBA_EXE" # Fallback on help from mamba activate fi unset __mamba_setup # <<< mamba initialize <<< From fd3ea440c5dad2b87fca6b8575dc04f26152923b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 7 Nov 2023 16:14:28 +0100 Subject: [PATCH 3/4] Update Lumentis links --- nvim/lua/wiki_utils.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nvim/lua/wiki_utils.lua b/nvim/lua/wiki_utils.lua index 0555392..61ab417 100644 --- a/nvim/lua/wiki_utils.lua +++ b/nvim/lua/wiki_utils.lua @@ -6,7 +6,7 @@ local conf = require("telescope.config").values local wiki_utils = {} -local root_path = '/home/user/Workspace/DnD/Lumentis Campaign Setting' +local root_path = '/home/server/Workspace/DnD/Lumentis Campaign Setting' local function get_title(file) for line in io.lines(file) do @@ -30,7 +30,6 @@ local choose_link = function(opts, titles, links) actions.select_default:replace(function() actions.close(prompt_bufnr) local selection = action_state.get_selected_entry() - -- print(vim.inspect(selection['index'])) vim.api.nvim_put({ links[selection['index']] }, "", false, true) end) return true From 0e8c1f10a82f63d7808c974fe93cee57b25c53ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 7 Nov 2023 17:33:12 +0100 Subject: [PATCH 4/4] Add ruff lsp --- nvim/lua/lsp_config.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nvim/lua/lsp_config.lua b/nvim/lua/lsp_config.lua index 2b8ba85..9b551f9 100644 --- a/nvim/lua/lsp_config.lua +++ b/nvim/lua/lsp_config.lua @@ -115,7 +115,7 @@ require("mason").setup { } } require("mason-lspconfig").setup { - ensure_installed = { "pyright", "texlab", "clangd", "bashls", "cmake", "jsonls", "tsserver", "vuels", "dockerls", "vimls", "html", "yamlls", "cssls", "lua_ls", "ltex", "gopls", "rust_analyzer", "jdtls", "emmet_ls" }, + ensure_installed = { "pyright", "texlab", "clangd", "bashls", "cmake", "jsonls", "tsserver", "vuels", "dockerls", "vimls", "html", "yamlls", "cssls", "lua_ls", "ltex", "gopls", "rust_analyzer", "jdtls", "emmet_ls", "ruff_lsp" }, } require('lspconfig').pyright.setup { @@ -222,6 +222,10 @@ require('lspconfig').gopls.setup { capabilities = capabilities } +require('lspconfig').ruff_lsp.setup { + capabilities = capabilities +} + require('lspconfig').lua_ls.setup { settings = { Lua = {