diff --git a/__pycache__/sample.d.er b/__pycache__/sample.d.er deleted file mode 100644 index 5201f30d..00000000 --- a/__pycache__/sample.d.er +++ /dev/null @@ -1,23 +0,0 @@ -##[pylyzer] succeed c:\users\foo50\appdata\local\nvim\sample.py 1762887677 757 - - - -.json: global::Dict!({{"d"}: {4}, {"b"}: {2}, {"c"}: {3}, {"a"}: {1}}) - -.sample_func: () -> NoneType - - - - -.json: global::Dict!({{"d"}: {4}, {"b"}: {2}, {"c"}: {3}, {"a"}: {1}}) - - - - - -.json: global::Dict!({{"d"}: {4}, {"b"}: {2}, {"c"}: {3}, {"a"}: {1}}) - - - - - diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 730cb325..a003f6ae 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -16,4 +16,7 @@ map('n', '', '', { desc = 'Move focus to the right window' }) map('n', '', '', { desc = 'Move focus to the lower window' }) map('n', '', '', { desc = 'Move focus to the upper window' }) +-- open Oil map("n", "-", "Oil", { desc = "Open parent directory" } ) +-- Change current dir +map("n", "cc", "cd %:p:h", { desc = "Change current dir to a current buffer" }) diff --git a/lua/config/options.lua b/lua/config/options.lua index ef8d3619..413085e2 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -49,8 +49,7 @@ vim.diagnostic.config({ -- Set updatetime for faster diagnostic updates vim.opt.updatetime = 300 -vim.opt.expandtab = true -vim.opt.tabstop = 4 -vim.opt.shiftwidth = 4 +vim.opt.tabstop = 2 +vim.opt.shiftwidth = 2 vim.opt.virtualedit = "block" diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index b574577f..2696eee7 100644 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -1,3 +1,5 @@ +local keymap = vim.keymap.set + return { { @@ -88,20 +90,21 @@ return { { 'nvim-telescope/telescope.nvim', tag = '0.1.8', - dependencies = { 'nvim-lua/plenary.nvim' }, - config = function() - require('telescope').setup({}) - local builtin = require 'telescope.builtin' - vim.keymap.set('n', 'fh', builtin.help_tags, { desc = '[F]ind [H]elp' }) - vim.keymap.set('n', 'fk', builtin.keymaps, { desc = '[F]ind [K]eymaps' }) - vim.keymap.set('n', 'ff', builtin.find_files, { desc = '[F]ind [F]iles' }) - vim.keymap.set('n', 'fs', builtin.builtin, { desc = '[F]ind Telescope' }) - vim.keymap.set('n', 'fw', builtin.grep_string, { desc = '[F]ind current [W]ord' }) - vim.keymap.set('n', 'fg', builtin.live_grep, { desc = '[F]ind by [G]rep' }) - vim.keymap.set('n', 'fd', builtin.diagnostics, { desc = '[F]ind [D]iagnostics' }) - vim.keymap.set('n', 'fr', builtin.resume, { desc = '[F]ind [R]esume' }) - vim.keymap.set('n', 'f.', builtin.oldfiles, { desc = '[F]ind Recent Files ("." for repeat)' }) - vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + require('telescope').setup({}) + local builtin = require 'telescope.builtin' + keymap('n', 'fh', builtin.help_tags, { desc = '[F]ind [H]elp' }) + keymap('n', 'fk', builtin.keymaps, { desc = '[F]ind [K]eymaps' }) + keymap('n', 'ff', builtin.find_files, { desc = '[F]ind [F]iles' }) + keymap('n', 'fa', builtin.find_files, { desc = '[F]ind [A]ll Files' }) + keymap('n', 'fs', builtin.builtin, { desc = '[F]ind Telescope' }) + keymap('n', 'fw', builtin.grep_string, { desc = '[F]ind current [W]ord' }) + keymap('n', 'fg', builtin.live_grep, { desc = '[F]ind by [G]rep' }) + keymap('n', 'fd', builtin.diagnostics, { desc = '[F]ind [D]iagnostics' }) + keymap('n', 'fr', builtin.resume, { desc = '[F]ind [R]esume' }) + keymap('n', 'f.', builtin.oldfiles, { desc = '[F]ind Recent Files ("." for repeat)' }) + keymap('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) end, }, @@ -116,10 +119,11 @@ return { { "stevearc/oil.nvim", - ---@module 'oil' - ---@type oil.SetupOpts - opts = {}, lazy = false, + config = function () + require("oil").setup() + keymap("n", "-", "Oil", { desc = "Open parent directory" }) + end } }