backup

nvim/lazy-lock.json

@@ -1,8 +1,8 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" },
+  "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" },
   "NeoColumn.nvim": { "branch": "main", "commit": "db7695c7c70fcacd290712deef659bca464634ee" },
-  "arshamiser.nvim": { "branch": "master", "commit": "421521f001f7ba922865760ee1dae5870e214525" },
+  "arshamiser.nvim": { "branch": "dev", "commit": "53a73d60d426cb17860d4de169bce00ec3996c16" },
   "arshlib.nvim": { "branch": "master", "commit": "111fd439268adda206a24b133096893869a50764" },
   "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" },
   "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
@@ -17,12 +17,12 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "codesnap.nvim": { "branch": "main", "commit": "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b" },
   "cphelper.nvim": { "branch": "main", "commit": "ab259315496514d58b2021048ef40437ad0f5814" },
-  "diffview.nvim": { "branch": "main", "commit": "0bae1a371ac68be86ead374ee2c4f36bd96bb6c6" },
+  "diffview.nvim": { "branch": "main", "commit": "1ec7b56b959dab18f7030f541c33ae60e18a6f88" },
   "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" },
   "eslint.nvim": { "branch": "main", "commit": "158f2289907d377018752fcfe0d61b746dc11767" },
   "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "fzf-lua": { "branch": "main", "commit": "b442569ab827f72e344236c598b02cb9dc754e9f" },
+  "fzf-lua": { "branch": "main", "commit": "0c4458b0f0d12970e54c8cd7c5ad60676edcf764" },
   "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" },
   "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
   "goto-preview": { "branch": "main", "commit": "3552fad4a0244ffd9ac86508e29ccc5166f19eb8" },
@@ -32,7 +32,8 @@
   "image.nvim": { "branch": "master", "commit": "2a618c86d9f8fd9f7895d12b55ec2f31fd14fa05" },
   "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
   "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" },
-  "legendary.nvim": { "branch": "master", "commit": "38d1f3950792295c38b8ce33d134ace3ad75a9a1" },
+  "legendary.nvim": { "branch": "master", "commit": "c1345db98e4c6e6e80d528384f3b5acbcb90bc40" },
+  "listish.nvim": { "branch": "master", "commit": "3bc4bb02036f3802c6428c6232633d3192ac3604" },
   "lsp_signature.nvim": { "branch": "master", "commit": "43729353dec224fa620a877639b8b0744112b286" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "marks.nvim": { "branch": "master", "commit": "74e8d01b2a2131b6e46354cffc553aa7f81bcf5b" },
@@ -42,8 +43,8 @@
   "modicator.nvim": { "branch": "main", "commit": "780ea1e98c9bee8f3816685213b0aac42b34cd75" },
   "monokai": { "branch": "master", "commit": "aafde73a622435891d36b411d8623e705ead6293" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
-  "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
+  "neodev.nvim": { "branch": "main", "commit": "56268d602feaf4fb5131f7d49c0334b4863b0470" },
-  "neogit": { "branch": "master", "commit": "daebc4bc94bdcfa69d8d75c731878bff758e16fa" },
+  "neogit": { "branch": "master", "commit": "69e0f1264f583dbe85a6bcd63c5ec9cb29f94571" },
   "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
   "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
@@ -53,13 +54,14 @@
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-numbertoggle": { "branch": "main", "commit": "c5827153f8a955886f1b38eaea6998c067d2992f" },
   "nvim-surround": { "branch": "main", "commit": "79aaa42da1f698ed31bcbe7f83081f69dca7ba17" },
-  "nvim-treesitter": { "branch": "master", "commit": "298a9dd4f8a0d95b347a7ebd301849d8b0e3917e" },
+  "nvim-treesitter": { "branch": "master", "commit": "6d56c5f404d3b116bab167bc03993cfb0a83f8aa" },
   "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" },
-  "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
   "outline.nvim": { "branch": "main", "commit": "139e363dd5a44f66a51041264aabe3884df4dd98" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "prettier.nvim": { "branch": "main", "commit": "d98e732cb73690b07c00c839c924be1d1d9ac5c2" },
   "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
+  "sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" },
   "telescope-git-file-history.nvim": { "branch": "master", "commit": "f94fab1d5a51fa28dd95b1a6bd377505dc1a8e82" },
   "telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" },
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },

nvim/lua/config.lua

@@ -1,4 +1,5 @@
-vim.opt.exrc = true
+vim.cmd("set encoding=utf-8")
+vim.cmd("set exrc")
 vim.cmd("set pumblend=40")
 vim.cmd("set winblend=40")
 vim.cmd("set expandtab")
@@ -21,20 +22,13 @@ vim.cmd("set signcolumn=yes")
 vim.cmd("set list")
 vim.cmd("set noequalalways")
 vim.cmd("set cmdheight=0")
-vim.opt.scrolloff = 10
+vim.cmd("set scrolloff=10")
-vim.opt.foldmethod = 'expr'
+vim.cmd("set foldmethod=expr")
-vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
+vim.cmd("set foldexpr=nvim_treesitter#foldexpr()")
-vim.opt.foldlevelstart = 99
+vim.cmd("set foldlevelstart=99")
-vim.opt.guicursor = {
+vim.cmd("set guicursor=i:ver25-blinkon500-blinkoff500,a:ver25-iCursor")
-    "i:ver25-blinkon500-blinkoff500,a:ver25-iCursor",
+vim.cmd("set list")
-}
+vim.cmd('set listchars="eol:↵,tab:→\\ ,trail=␣,precedes=«,extends=»"')
-vim.opt.listchars = {
-    eol = "↵",
-    tab = "→ ",
-    trail = "␣",
-    precedes = "«",
-    extends = "»"
-}
 vim.diagnostic.config({
     update_in_insert = true,
     float = {
@@ -175,12 +169,15 @@ local plugins = {
     },
     {
     	"arielherself/arshamiser.nvim",
+        branch = "dev",
 	    dependencies = {
 		    "arsham/arshlib.nvim",
 		    "famiu/feline.nvim",
 		    "rebelot/heirline.nvim",
 		    "kyazdani42/nvim-web-devicons",
             "lewis6991/gitsigns.nvim",
+            "nanotee/sqls.nvim",
+            "arsham/listish.nvim",
 	    },
 	    config = function()
             require('gitsigns').setup()
@@ -326,8 +323,9 @@ local plugins = {
     { 'stevearc/dressing.nvim' },
     { 'NvChad/nvim-colorizer.lua' },
     { 'debugloop/telescope-undo.nvim' },
+    { "arielherself/neodev.nvim", opts = {} },
 }
-local opts = { 
+local opts = {
 }
 
 require("lazy").setup(plugins, opts)
@@ -586,7 +584,7 @@ vim.keymap.set('i', '<C-x>', '<ESC>ddi')
 vim.keymap.set('i', '<Home>', '<ESC>^i')
 vim.keymap.set('i', '<C-a>', '<ESC>ggVG')
 vim.keymap.set('n', '<C-a>', 'ggVG')
-vim.keymap.set('n', '<leader>`', '<Cmd>split<CR><Cmd>terminal<CR>i')
+vim.keymap.set('n', '<leader>`', '<Cmd>split<CR><Cmd>terminal zsh<CR>i')
 vim.keymap.set('n', '<leader>n', '<Cmd>tabnew<CR>')
 vim.keymap.set('t', '<ESC>', '<C-\\><C-n>', {noremap=true})
 vim.keymap.set('n', '<leader>s', '<Cmd>Outline<CR>')
@@ -608,6 +606,9 @@ vim.keymap.set('n', '<C-g>', '<Cmd>Neogit kind=split_above<CR>', {noremap=true})
 vim.keymap.set({'v', 'x'}, '<leader>cc', '<Cmd>CodeSnap<CR>', {noremap=true});
 vim.keymap.set('n', '<C-s>', '<Cmd>PopupSaveas<CR>', {noremap=true});
 vim.keymap.set('n', '<S-U>', '<Cmd>Telescope undo<CR>', {noremap=true})
+vim.keymap.set('n', '<C-CR>', 'i{<ESC>A}<ESC>%li<CR><ESC>$i<CR><ESC>k^', {noremap=true})
+vim.keymap.set('n', '<C-BS>', 'd0i<BS><ESC>l', {noremap=true})
+vim.keymap.set('i', '<C-BS>', '<C-u><BS>', {noremap=true})
 
 vim.api.nvim_create_user_command('PopupSaveas', function()
   vim.ui.input({ prompt = 'Save As: ' }, function(input)
@@ -951,4 +952,8 @@ require('colorizer').setup {}
 
 require('ibl').setup {}
 
-vim.lsp.inlay_hint.enable(nil)
+vim.api.nvim_create_autocmd("LspAttach",  {
+    callback = function(ev)
+        vim.lsp.inlay_hint.enable(true)
+    end,
+})