[fix] Update nvim and fish configs

README.md

@@ -2,6 +2,9 @@
 
 These are dotfiles for my Linux as MacOS machines
 
+Linux is running Arch Linux with [hyprland](https://hyprland.org) / bspwm
+MacOS is running MacOS Ventura with [yabai](https://github.com/koekeishiya/yabai)
+
 To install simply do
 
 ```sh

config/fish/conf.d/00brew.fish

@@ -1,7 +1,7 @@
 if [ (uname) = "Darwin" ]
     set arch (arch)
     if [ "$arch" = "i386" ]
-        eval /usr/local/Caskroom/miniconda/base/bin/conda "shell.fish" "hook" $argv | source
+        # eval /usr/local/Caskroom/miniconda/base/bin/conda "shell.fish" "hook" $argv | source
         /usr/local/bin/brew shellenv | source
         export PATH="/usr/local/opt/llvm/bin:$PATH"
     else

config/fish/fish_variables

@@ -35,6 +35,6 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow
 SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
 SETUVAR fish_pager_color_selected_background:\x2dr
-SETUVAR fish_user_paths:/usr/lib/emscripten\x1e/home/fs0c131y/\x2elocal/bin\x1e/home/fs0c131y/\x2ecargo/bin\x1e/opt/homebrew/Cellar/arm\x2dgcc\x2dbin\x408/8\x2d2019\x2dq3\x2dupdate_2/bin\x1e/Users/fs0c131y/\x2ecargo/bin\x1e/Users/fs0c131y/\x2elocal/bin
+SETUVAR fish_user_paths:/opt/homebrew/bin\x1e/usr/lib/emscripten\x1e/home/fs0c131y/\x2elocal/bin\x1e/home/fs0c131y/\x2ecargo/bin\x1e/opt/homebrew/Cellar/arm\x2dgcc\x2dbin\x408/8\x2d2019\x2dq3\x2dupdate_2/bin\x1e/Users/fs0c131y/\x2ecargo/bin\x1e/Users/fs0c131y/\x2elocal/bin
 SETUVAR nvm_data:/Users/fs0c131y/\x2elocal/share/nvm
 SETUVAR nvm_mirror:https\x3a//nodejs\x2eorg/dist

config/nvim/lazy-lock.json

@@ -1,46 +1,46 @@
 {
   "comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" },
   "copilot.vim": { "branch": "release", "commit": "1358e8e45ecedc53daf971924a0541ddf6224faf" },
-  "coq.artifacts": { "branch": "artifacts", "commit": "6e15912d7cb19c4c0f5d947b8d95bb54099a1dfb" },
+  "coq.artifacts": { "branch": "artifacts", "commit": "c5f5546a89acc9c423d883199f641db99ba28b5b" },
-  "coq.thirdparty": { "branch": "3p", "commit": "5f6b110575c123de369604f4846440089bfb938f" },
+  "coq.thirdparty": { "branch": "3p", "commit": "ba47209b2c029dd4b6eb42e267dc7e716b12eb5d" },
-  "coq_nvim": { "branch": "coq", "commit": "1349edcd03478718223edd0abbe23990c38c10c4" },
+  "coq_nvim": { "branch": "coq", "commit": "55ca08083cab18bb5cd1b08f2d5c295b87fce0ef" },
   "d2-vim": { "branch": "master", "commit": "981c87dccb63df2887cc41b96e84bf550f736c57" },
-  "diffview.nvim": { "branch": "main", "commit": "1d6ea6ced1c3ec0f6464761a138bb35afd79ef63" },
+  "diffview.nvim": { "branch": "main", "commit": "6ca4cce071d527fa16c27781f98b843774ae84a7" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
   "formatter.nvim": { "branch": "master", "commit": "fa4f2729cc2909db599169f22d8e55632d4c8d59" },
   "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" },
   "git-conflict.nvim": { "branch": "main", "commit": "8d962d83cae924a314965f738ed1e05a4000d682" },
   "glow.nvim": { "branch": "main", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" },
-  "lazy.nvim": { "branch": "main", "commit": "652b6febf8d5c99eb8cf4a1cec63da6db62e77d2" },
+  "lazy.nvim": { "branch": "main", "commit": "ae25448d39fb2bdc38a139339233270edec44484" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lspsaga.nvim": { "branch": "main", "commit": "a6d2661f22735f314540dd6e7b0fb57a69dec41a" },
+  "lspsaga.nvim": { "branch": "main", "commit": "4f075452c466df263e69ae142f6659dcf9324bf6" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "90a8bbf106b85b76951a34c542058ffa807de2b1" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" },
-  "mason.nvim": { "branch": "main", "commit": "e634134312bb936f472468a401c9cae6485ab54b" },
+  "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" },
-  "neorg": { "branch": "main", "commit": "4f5448c88f1a09bd7a4dddcfef3b2148619e7280" },
+  "neorg": { "branch": "main", "commit": "04af06b69ab7c6d1519cf0932e46c288f817c06e" },
   "no-neck-pain.nvim": { "branch": "main", "commit": "d3527936c4944baf0227c4f5b7fd64e7119ac13c" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "6cedcb527e264c8f25e86afa8dae74c6692dee51" },
+  "nvim-dap": { "branch": "master", "commit": "7c1d47cf7188fc31acdf951f9eee22da9d479152" },
-  "nvim-dap-ui": { "branch": "master", "commit": "078972d39338a49ec13fc43a44e235cc43189276" },
+  "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "df58d91c9351a9dc5be6cf8d54f49ab0d9a64e73" },
+  "nvim-lspconfig": { "branch": "master", "commit": "458fa2ee2115c693ca48a04afa65f6de6b40a2db" },
-  "nvim-treesitter": { "branch": "master", "commit": "32d0baae44f5fd0416128c871fca6d9e27b60b3d" },
+  "nvim-treesitter": { "branch": "master", "commit": "33eb472b459f1d2bf49e16154726743ab3ca1c6d" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "f24a86c32238867f24fbff49913db0068f8488d2" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "e2ea37627c0681421ccf4a3cf19d68bb958e1817" },
-  "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" },
+  "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" },
-  "octo.nvim": { "branch": "master", "commit": "1c9a79412a1d92dd3c5a601e2261c158ebb4d4bd" },
+  "octo.nvim": { "branch": "master", "commit": "2d2769ff80a82a0da24dcf636ae146f3ed5d7ae5" },
-  "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
+  "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "rest.nvim": { "branch": "main", "commit": "d8dc204e9f6fd930d9d1d709f0d19138f804431a" },
+  "rest.nvim": { "branch": "main", "commit": "5714b71120622a3ba64c8784cf29073a45528161" },
   "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
   "sonokai": { "branch": "master", "commit": "a9b2a3e83ed4fa7a5541e41be9becaa7b436edcf" },
   "ssr.nvim": { "branch": "main", "commit": "e5768511518a397fa712f26389ba30d0404990de" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
-  "telescope.nvim": { "branch": "master", "commit": "d77b37f4520e5fc2cf4c74c12e42ed4b589bd367" },
+  "telescope.nvim": { "branch": "master", "commit": "9e3922f628ae2fbb29abac89668eed633a3da141" },
-  "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" },
+  "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
-  "toggleterm.nvim": { "branch": "main", "commit": "68fdf851c2b7901a7065ff129b77d3483419ddce" },
+  "toggleterm.nvim": { "branch": "main", "commit": "cf146a267a6a7db62b1e2aff40414b20081048a1" },
   "tree-sitter-just": { "branch": "main", "commit": "4e5f5f3ff37b12a1bbf664eb3966b3019e924594" },
-  "trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" },
+  "trouble.nvim": { "branch": "main", "commit": "23c1327b85bd51258f9f8bd8f77f024acef6de69" },
   "vim-abolish": { "branch": "master", "commit": "cb3dcb220262777082f63972298d57ef9e9455ec" },
   "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
   "vim-fugitive": { "branch": "master", "commit": "5f0d280b517cacb16f59316659966c7ca5e2bea2" },
@@ -49,5 +49,5 @@
   "vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
-  "which-key.nvim": { "branch": "main", "commit": "5a6c954a5a46023c19acc03a8b6d7c3e57964fc5" }
+  "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" }
 }

config/nvim/lua/lsp/init.lua

@@ -5,7 +5,7 @@ require 'lsp.lua-language-server'
 require 'lsp.clangd'
 
 require 'lspconfig'.tsserver.setup {}
-require 'lspconfig'.pyright.setup {}
+-- require 'lspconfig'.pyright.setup {}
 require 'lspconfig'.sqlls.setup {}
 -- require 'lspconfig'.jsonls.setup {
 --     settings = {

config/nvim/lua/plugins.lua

@@ -19,13 +19,22 @@ vim.opt.rtp:prepend(lazypath)
 -- local use = require('packer').use
 
 return require('lazy').setup({
-    { "ellisonleao/glow.nvim",         config = true,                                                                                                   cmd = "Glow" },
+    {
+        "ellisonleao/glow.nvim",
+        config = true,
+        cmd =
+        "Glow"
+    },
     'samoshkin/vim-mergetool',
     'mhartington/formatter.nvim',
     -- 'christianrondeau/vim-base64',
 
     { 'tpope/vim-commentary',          lazy = false },
-    { 'tpope/vim-fugitive',            cmd = { "Git", "Gdiffsplit", "Gvdiffsplit", "Gedit", "Gread", "Gwrite", "Ggrep", "Gbrowse", "GMove", "GDelete" } },
+    {
+        'tpope/vim-fugitive',
+        cmd = { "Git", "Gdiffsplit", "Gvdiffsplit", "Gedit", "Gread", "Gwrite",
+            "Ggrep", "Gbrowse", "GMove", "GDelete" }
+    },
     { 'tpope/vim-repeat',              lazy = false },
     { 'tpope/vim-speeddating',         lazy = false },
     { 'tpope/vim-surround',            lazy = false },
@@ -37,7 +46,12 @@ return require('lazy').setup({
     -- 'b0o/SchemaStore.nvim',
     -- 'rcarriga/nvim-notify',
     { 'folke/todo-comments.nvim',      event = "BufEnter" },
-    { 'github/copilot.vim',            event = "LspAttach",                                                                                             cmd = "Copilot" },
+    {
+        'github/copilot.vim',
+        event = "LspAttach",
+        cmd =
+        "Copilot"
+    },
     -- 'ggandor/leap.nvim',
     {
         'shortcuts/no-neck-pain.nvim',
@@ -47,7 +61,8 @@ return require('lazy').setup({
     -- { 'folke/zen-mode.nvim',         config = function() require('zen-mode').setup() end },
     -- { 'folke/twilight.nvim',         config = function() require('twilight').setup() end },
     {
-        'pwntester/octo.nvim', cmd = "Octo",
+        'pwntester/octo.nvim',
+        cmd = "Octo",
         config = function()
             require(
                 'octo').setup()
@@ -91,9 +106,11 @@ return require('lazy').setup({
         }
     },
     { 'folke/which-key.nvim',        config = function() require("which-key").setup() end, event = "BufEnter" },
-    { 'nvim-telescope/telescope.nvim',
+    {
+        'nvim-telescope/telescope.nvim',
         cmd = "Telescope",
-        dependencies = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope-ui-select.nvim', 'nvim-telescope/telescope-fzf-native.nvim' }
+        dependencies = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope-ui-select.nvim',
+            'nvim-telescope/telescope-fzf-native.nvim' }
     },
     -- {
     --     'utilyre/barbecue.nvim',
@@ -132,13 +149,14 @@ return require('lazy').setup({
         "williamboman/mason-lspconfig.nvim",
         config = function()
             require("mason-lspconfig").setup({
-                ensure_installed = { "lua_ls", "rust_analyzer" },
+                ensure_installed = { "lua_ls", "rust_analyzer", "pylsp" },
                 automatic_installation = true,
             })
         end
     },
     {
-        'NTBBloodbath/galaxyline.nvim', branch = 'main',
+        'NTBBloodbath/galaxyline.nvim',
+        branch = 'main',
         lazy = false,
         config = function() require('statusline') end,
         dependencies = { 'nvim-tree/nvim-web-devicons' }
@@ -164,13 +182,21 @@ return require('lazy').setup({
             require('telescope').load_extension('fzf')
         end,
     },
-    { 'nvim-telescope/telescope-ui-select.nvim',
+    {
+        'nvim-telescope/telescope-ui-select.nvim',
         config = function()
             require("telescope").load_extension("ui-select")
         end
     },
     { 'norcalli/nvim-colorizer.lua', config = function() require 'colorizer'.setup() end },
-    { 'IndianBoy42/tree-sitter-just', config = function() require 'tree-sitter-just'.setup({}) end, dependencies = { "nvim-treesitter/nvim-treesitter" }, ft = "just" },
+    {
+        'IndianBoy42/tree-sitter-just',
+        config = function() require 'tree-sitter-just'.setup({}) end,
+        dependencies = {
+            "nvim-treesitter/nvim-treesitter" },
+        ft =
+        "just"
+    },
     -- lsp
     -- use { 'onsails/lspkind-nvim', config = function() require'lspkind'.init() end, }
     {
@@ -196,8 +222,9 @@ return require('lazy').setup({
             }
         end,
     },
-    { 'neovim/nvim-lspconfig',
+    {
-        ft = { "rust", "toml", "lua", "c", "cpp", "markdown", "sql" },
+        'neovim/nvim-lspconfig',
+        ft = { "rust", "toml", "lua", "c", "cpp", "markdown", "sql", "python" },
         config = function()
             require("lsp")
         end
@@ -226,7 +253,8 @@ return require('lazy').setup({
                 auto_update = true,
                 main_image = "file",
             })
-        end },
+        end
+    },
     {
         'ms-jpq/coq_nvim',
         ft = { "rust", "toml", "lua" },
@@ -237,7 +265,8 @@ return require('lazy').setup({
         end
     },
     -- { 'ms-jpq/chadtree',   build = ':CHADdeps' },
-    { 'ms-jpq/coq.thirdparty',
+    {
+        'ms-jpq/coq.thirdparty',
         config = function()
             require("coq_3p")({
                 {
@@ -270,7 +299,11 @@ return require('lazy').setup({
             }
         end
     },
-    { 'sindrets/diffview.nvim', cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewToggleFiles", "DiffviewFocusFiles", "DiffviewRefresh" }, dependencies = 'nvim-lua/plenary.nvim' },
+    {
+        'sindrets/diffview.nvim',
+        cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewToggleFiles", "DiffviewFocusFiles", "DiffviewRefresh" },
+        dependencies = 'nvim-lua/plenary.nvim'
+    },
     {
         'akinsho/toggleterm.nvim',
         cmd = "ToggleTerm",
@@ -304,11 +337,17 @@ return require('lazy').setup({
     --         }
     --     end,
     -- },
-    { 'simrat39/rust-tools.nvim', ft = 'rust', config = function()
-        require 'setup.rust-tools'
-    end, dependencies = "ms-jpq/coq_nvim" },
     {
-        "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap" },
+        'simrat39/rust-tools.nvim',
+        ft = 'rust',
+        config = function()
+            require 'setup.rust-tools'
+        end,
+        dependencies = "ms-jpq/coq_nvim"
+    },
+    {
+        "rcarriga/nvim-dap-ui",
+        dependencies = { "mfussenegger/nvim-dap" },
         config = function() require("dapui").setup() end
     },
     -- {