diff --git a/.bashrc b/.bashrc index c58984d..a7a65e5 100644 --- a/.bashrc +++ b/.bashrc @@ -126,6 +126,9 @@ fi #export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) #gpgconf --launch gpg-agent +### ripgrep +export RIPGREP_CONFIG_PATH="$HOME/.ripgreprc" + ### Passbook setup export PASSBOOK_GPG_PATH="/usr/bin/gpg" export PASSBOOK_ROOT_DIRECTORY="/home/wholteza/.password-store" diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index a9cfde0..568ab8d 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -50,12 +50,17 @@ vim.keymap.set('n', '', 'nohlsearch') vim.keymap.set('n', 'f', vim.lsp.buf.format, { desc = "Format buffer" }) -- Start the file picker in different modes -vim.keymap.set('n', 'sf', ":Pick files", { desc = "Search files" }) -vim.keymap.set('n', 'sg', ":Pick grep_live", { desc = "Search files" }) +vim.keymap.set('n', 'sf', function() + require('mini.pick').builtin.files() +end, { desc = "Search files" }) +vim.keymap.set('n', 'sg', ":Pick grep_live", { desc = "Search file contents" }) -- Get help with keybinds vim.keymap.set('n', '?', ":WhichKey", { desc = "Show keybinds" }) +-- File explorer +vim.keymap.set('n', '\\', ":Oil --float", { desc = "File explorer" }) + -- SECTION: Install packages vim.pack.add({ 'https://github.com/catppuccin/nvim', -- color scheme @@ -70,8 +75,8 @@ vim.pack.add({ 'https://github.com/folke/which-key.nvim', -- Shortcut hints (bar at the bottom when pressing space) 'https://github.com/nvim-lua/plenary.nvim', -- Helper lua functions, dep of todo-comments. 'https://github.com/folke/todo-comments.nvim', -- Helper lua functions, dep of todo-comments. - 'https://github.com/nvim-treesitter/nvim-treesitter', - + 'https://github.com/nvim-treesitter/nvim-treesitter', -- Syntax highlighting + 'https://github.com/stevearc/oil.nvim', -- File explorer }) -- SECTION: Colorscheme @@ -99,10 +104,17 @@ require('todo-comments').setup({ }) -- Mini -require('mini.pick').setup() +local MiniPicker = require('mini.pick').setup({ + source = { + show = require('mini.pick').default_show, + }, +}) + require('mini.pairs').setup() require('mini.notify').setup() +require('oil').setup() + require('nvim-treesitter').setup({ auto_install = true }) @@ -111,7 +123,7 @@ require('nvim-treesitter').setup({ require("mason").setup() require("mason-lspconfig").setup({ -- Install lsp deps here - ensure_installed = { 'lua_ls' }, + ensure_installed = { 'lua_ls', 'ts_ls', 'ansiblels' }, automatic_enable = true }) require("mason-tool-installer").setup({ diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json index a8c566f..b688b4b 100644 --- a/.config/nvim/nvim-pack-lock.json +++ b/.config/nvim/nvim-pack-lock.json @@ -48,6 +48,10 @@ "rev": "eb1f8e80cb28eb7892f347609e0bdc5eb574b945", "src": "https://github.com/nvim-treesitter/nvim-treesitter" }, + "oil.nvim": { + "rev": "0fcc83805ad11cf714a949c98c605ed717e0b83e", + "src": "https://github.com/stevearc/oil.nvim" + }, "plenary.nvim": { "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509", "src": "https://github.com/nvim-lua/plenary.nvim"