diff --git a/init.lua b/init.lua index 35ac108..87b0759 100644 --- a/init.lua +++ b/init.lua @@ -1,13 +1,13 @@ if vim.g.vscode then + -- config vscode Map = vim.keymap.set Cmd = vim.cmd VSCodeNotify = vim.fn.VSCodeNotify VSCodeCall = vim.fn.VSCodeCall - -- require("vscode.options") require("vscode.functions") require("vscode.mappings") --- vim.cmd([[source C:\\Users\\Asep\\AppData\\Local\\nvim\\settings.vim]]) else + -- config neovim require("core") end diff --git a/lazy-lock.json b/lazy-lock.json index c4ea8be..0819f3a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -46,7 +46,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "smart-splits.nvim": { "branch": "master", "commit": "c8a9173d70cbbd1f6e4a414e49e31df2b32a1362" }, - "telescope.nvim": { "branch": "master", "commit": "ae6708a90b89a686f85b51288f488f4186dff2d4" }, + "telescope.nvim": { "branch": "master", "commit": "c0ee29e8e4700ef49623d12ca3ffb8481c8d69f3" }, "toggleterm.nvim": { "branch": "main", "commit": "cbd041d91b90cd3c02df03fe6133208888f8e008" }, "tokyonight.nvim": { "branch": "main", "commit": "633039585dff7fd2b9b62fb190bf768702609d95" }, "vim-bbye": { "branch": "master", "commit": "903f5eb17f72ebf7b0b1524bbb792c0b36761af6" }, diff --git a/lua/vscode/functions.lua b/lua/vscode/functions.lua index fa014f2..4e67a5b 100644 --- a/lua/vscode/functions.lua +++ b/lua/vscode/functions.lua @@ -1,5 +1,5 @@ -function Center_screen() - Cmd("call 3_reveal('center', 0)") +function Active_whichkey() + VSCodeNotify("whichkey.show") end function Top_screen() diff --git a/lua/vscode/mappings.lua b/lua/vscode/mappings.lua index 3b18664..e26a580 100644 --- a/lua/vscode/mappings.lua +++ b/lua/vscode/mappings.lua @@ -6,14 +6,8 @@ -- c = command mode -- o = operator pending mode --- Map("", "L", Move_to_bottom_screen) --- Map("", "H", Move_to_top_screen) --- Map("", "", Trim__save__no_highlight) Map({ "n", "x" }, "", Active_whichkey) --- Map({ "n", "x" }, "", Navigation_down) --- Map({ "n", "x" }, "", Navigation_up) --- Map({ "n", "x" }, "", Navigation_left) --- Map({ "n", "x" }, "", Navigation_right) + Map("", "U", Trim__save__format) Map("n", "gD", Reveal_definition_aside) diff --git a/lua/vscode/options.lua b/lua/vscode/options.lua deleted file mode 100644 index 2587920..0000000 --- a/lua/vscode/options.lua +++ /dev/null @@ -1,23 +0,0 @@ -vim.opt.number = true -vim.opt.relativenumber = true -vim.opt.tabstop = 4 -vim.opt.shiftwidth = 4 -vim.opt.expandtab = false -vim.opt.smartindent = true -vim.opt.mouse = "a" -vim.opt.ignorecase = false -vim.opt.smartcase = true -vim.opt.hlsearch = true -vim.opt.colorcolumn = "" -vim.opt.syntax = "enable" -vim.opt.termguicolors = true -vim.opt.background = "dark" -vim.opt.backup = false -vim.opt.writebackup = false -vim.opt.swapfile = false -vim.opt.undofile = true -vim.opt.timeout = false -vim.g.mapleader = "," -vim.g.rust_recommended_style = true -vim.g.targets_nl = "nh" -vim.o.cpoptions = "aABceFs"