Update nvim and add kitty config

config/nvim/lua/keymaps.lua

@@ -32,15 +32,17 @@ local normal_mode_maps = {
     { key = 'K', map = [[<cmd>lua vim.lsp.buf.hover()<cr>]] },
     { key = '<C-k>', map = [[<cmd>lua vim.lsp.buf.definition()<cr>]] },
     { key = 'gi', map = [[<cmd>lua vim.lsp.buf.implementation()<cr>]] },
-    { key = '<leader>o', map = [[<cmd>LspTroubleToggle<cr>]] },
+    { key = '<leader>o', map = [[<cmd>TroubleToggle<cr>]] },
     -- { key = '<leader>a', map = [[<cmd>lua vim.lsp.buf.document_highlight()<cr>]] },
     -- { key = '<leader>c', map = [[<cmd>lua vim.lsp.buf.clear_references()<cr>]] },
     { key = '<leader>"', map = [["+]] },
     { key = 'F', map = [[<cmd>lua vim.lsp.buf.formatting()<cr>]] },
     { key = 'T', map = [[<cmd>lua require'lsp_extensions'.inlay_hints()<cr>]] },
 
+
     -- Other
     { key = '<leader>m', map = [[<cmd>silent !mpcfzf<cr>]] },
+    { key = '<leader>l', map = [[<cmd>Glow<cr>]] },
 }
 
 

config/nvim/lua/lsp/init.lua

@@ -3,7 +3,9 @@
 
 require("lsp.rust-analyzer")
 require("lsp.lua-language-server")
-require("lsp.deno")
+require("lsp.tsserver")
+-- require("lsp.solang")
+require("lsp.pyright")
 
 -- Set completeopt to have a better completion experience
 -- vim.o.completeopt= "menuone,noinsert,noselect"

config/nvim/lua/lsp/lua-language-server.lua

@@ -1,11 +1,11 @@
 local lspconfig = require'lspconfig'
 local lspstatus = require('lsp-status')
-local coq = require'coq'
+-- local coq = require'coq'
 
 lspconfig.sumneko_lua.setup{
     cmd = { "lua-language-server" },
     on_attach=function(client) lspstatus.on_attach(client)  return end,
-    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
+    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
     filetypes = { "lua" },
     log_level = 2,
     settings = {

config/nvim/lua/lsp/pyls.lua

@@ -1,8 +1,10 @@
 local lspconfig = require'lspconfig'
+local lspstatus = require('lsp-status')
+local coq = require'coq'
 
 lspconfig.pyls.setup{
-    coq.lsp_ensure_capabilities{
-        cmd = { "pyls" },
-        filetypes = { "python" },
-    }
+    cmd = { "pyls" },
+    on_attach=function(client) lspstatus.on_attach(client)  return end,
+    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
+    filetypes = { "python" },
 }

config/nvim/lua/lsp/pyright.lua

@@ -0,0 +1 @@
+require'lspconfig'.pyright.setup{}

config/nvim/lua/lsp/rust-analyzer.lua

@@ -1,10 +1,10 @@
 local lspconfig = require'lspconfig'
 local lspstatus = require'lsp-status'
-local coq = require'coq'
+-- local coq = require'coq'
 
 lspconfig.rust_analyzer.setup{
-    on_attach=function(client) lspstatus.on_attach(client)  return end,
-    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
+    on_attach=function(client) lspstatus.on_attach(client) end,
+    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
     cmd = { "rust-analyzer" },
     filetypes = { "rust" },
     root_dir = lspconfig.util.root_pattern("Cargo.toml"),
@@ -20,7 +20,7 @@ lspconfig.rust_analyzer.setup{
             },
             checkOnSave = {
                 command = "clippy",
-                allTargets = true,
+                allTargets = false,
             },
             cargo = {
                 loadOutDirsFromCheck = true,

config/nvim/lua/lsp/solang.lua

@@ -0,0 +1,8 @@
+local lspconfig = require'lspconfig'
+local lspstatus = require'lsp-status'
+-- local coq = require'coq'
+
+lspconfig.solang.setup{
+    on_attach=function(client) lspstatus.on_attach(client) end,
+    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
+}

config/nvim/lua/lsp/tsserver.lua

@@ -0,0 +1,8 @@
+local lspconfig = require'lspconfig'
+local lspstatus = require'lsp-status'
+-- local coq = require'coq'
+
+lspconfig.tsserver.setup{
+    on_attach=function(client) lspstatus.on_attach(client)  return end,
+    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
+}

config/nvim/lua/plugins.lua

@@ -14,9 +14,10 @@ return require('packer').startup(function()
   -- Packer can manage itself
     use 'wbthomason/packer.nvim'
 
+    use 'christianrondeau/vim-base64'
 
     use {
-        'glepnir/galaxyline.nvim', branch = 'main',
+      'NTBBloodbath/galaxyline.nvim', branch = 'main',
         config = function() require('statusline') end,
         requires = { 'kyazdani42/nvim-web-devicons' }
     }
@@ -31,7 +32,9 @@ return require('packer').startup(function()
         config = function() require("which-key").setup() end,
     }
 
-    use { 'yuttie/comfortable-motion.vim' }
+    use 'yuttie/comfortable-motion.vim'
+
+    use 'ruanyl/vim-gh-line'
 
     use {
         'junegunn/fzf',
@@ -50,47 +53,100 @@ return require('packer').startup(function()
     use { 'norcalli/nvim-colorizer.lua', config = function() require'colorizer'.setup() end, }
 
     -- lsp
-    use { 'onsails/lspkind-nvim', config = function() require'lspkind'.init() end, }
+    -- use { 'onsails/lspkind-nvim', config = function() require'lspkind'.init() end, }
     use { 'folke/lsp-trouble.nvim', config = function() require("trouble").setup() end, }
 
     use { 'neovim/nvim-lspconfig', config = function() require("lsp") end, }
     use { 'williamboman/nvim-lsp-installer' }
     use { 'nvim-lua/lsp-status.nvim' }
 
-    use { 'ms-jpq/coq_nvim', requires =  { 'ms-jpq/coq.artifacts' } }
-    
-    use { 'folke/lsp-colors.nvim' }
-    use { 'nvim-lua/lsp_extensions.nvim' }
+
+
+    use { 'ray-x/cmp-treesitter' }
+    use { 'andersevenrud/cmp-tmux' }
+    use { 'hrsh7th/cmp-vsnip' }
+    use { 'hrsh7th/vim-vsnip' }
+    use { 'hrsh7th/cmp-nvim-lsp' }
+    use { 'hrsh7th/cmp-buffer' }
+    use { 'hrsh7th/cmp-path' }
+    use { 'hrsh7th/cmp-cmdline' }
+    use { 'hrsh7th/nvim-cmp',
+        config = function() 
+            local cmp = require("cmp")
+            cmp.setup({
+            snippet = {
+              -- REQUIRED - you must specify a snippet engine
+              expand = function(args)
+                vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+                -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+                -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+                -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+              end,
+            },
+            mapping = {
+              ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+              ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
+              ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
+              ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
+              ['<C-e>'] = cmp.mapping({
+                i = cmp.mapping.abort(),
+                c = cmp.mapping.close(),
+              }),
+              ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+            },
+            sources = cmp.config.sources({
+              { name = 'nvim_lsp' },
+              { name = 'vsnip' }, -- For vsnip users.
+            }, {
+              { name = 'buffer' },
+              { name = 'tmux' },
+              { name = 'treesitter' },
+              -- { name = 'snippy' }, -- For snippy users.
+            })
+        }) end,
+    }
+
+
+
+    -- use { 'ms-jpq/coq_nvim', requires =  { 'ms-jpq/coq.artifacts' } }
+
+    -- use { 'folke/lsp-colors.nvim',
+    --     config = function() require("lsp-colors").setup({
+    --       Error = "#db4b4b",
+    --       Warning = "#e0af68",
+    --       Information = "#0db9d7",
+    --       Hint = "#10B981"
+    --     }) end,
+    -- }
+    -- use 'nvim-lua/lsp_extensions.nvim'
         -- config = function() vim.cmd([[autocmd BufEnter,BufWinEnter,TabEnter *.rs :lua require'lsp_extensions'.inlay_hints()]]) end,
 	--
     -- Qol
-	use { 'sindrets/diffview.nvim' }
+    use { 'sindrets/diffview.nvim', requires = 'nvim-lua/plenary.nvim' }
     -- use { 'justinmk/vim-sneak' }
-    use { 
+    use {
         'akinsho/nvim-toggleterm.lua',
         config = function() require'setup.toggleterm' end,
     }
 
-    -- use { 'airblade/vim-rooter' }
-    use { 'glepnir/dashboard-nvim' }
+    -- use 'airblade/vim-rooter'
+    use 'glepnir/dashboard-nvim'
 
-    -- Treesitter {{{
-    use { 
+    use {
         'nvim-treesitter/nvim-treesitter',
         run = ':TSUpdate'
     }
 
-    -- }}}
 
-    --: rust {{{
     use {
-        'rust-lang/rust.vim',
+        -- 'rust-lang/rust.vim',
         'mhinz/vim-crates',
-        'cespare/vim-toml',
+        -- 'cespare/vim-toml',
     }
-    -- }}}
-    use { 'vim-python/python-syntax' }
 
-    use { 'ms-jpq/chadtree' }
+    -- use 'ms-jpq/chadtree'
+    use 'tomlion/vim-solidity'
+    use 'ellisonleao/glow.nvim'
+
+end);
 
-end)

config/nvim/lua/statusline.lua

@@ -2,16 +2,16 @@ local vim = vim
 local gl = require('galaxyline')
 
 local condition = require('galaxyline.condition')
--- local diagnostic = require('galaxyline.provider_diagnostic')
-local diagnostic = require('lsp-status.diagnostics')
-local vcs = require('galaxyline.provider_vcs')
-local fileinfo = require('galaxyline.provider_fileinfo')
--- local extension = require('galaxyline.provider_extensions')
+-- local diagnostic = require('galaxyline.providers.diagnostic')
+-- local diagnostic = require('lsp-status.diagnostics')
+local vcs = require('galaxyline.providers.vcs')
+-- local fileinfo = require('galaxyline.providers.fileinfo')
+-- local extension = require('galaxyline.providers.extensions')
 -- local colors = require('galaxyline.colors')
--- local buffer = require('galaxyline.provider_buffer')
--- local whitespace = require('galaxyline.provider_whitespace')
--- local lspclient = require('galaxyline.provider_lsp')
-local lsp_status = require('lsp-status')
+-- local buffer = require('galaxyline.providers.buffer')
+-- local whitespace = require('galaxyline.providers.whitespace')
+-- local lspclient = require('galaxyline.providers.lsp')
+-- local lsp_status = require('lsp-status')
 
 
 -- local gls = gl.section
@@ -113,7 +113,12 @@ gls.left[1] = {
 gls.left[2] = {
     GitBranch = {
         provider = function() return vcs.get_git_branch()..' ' end,
-        condition = condition.check_git_workspace,
+        condition = function()
+            local function is_empty()
+                return vcs.get_git_branch() ~= nil
+            end
+            return condition.check_git_workspace() and condition.hide_in_width() and is_empty()
+        end,
         highlight = { colors.purple , colors.bg1 },
         icon = '  ',
         separator = '',