From 7ca0c57cf767dfaf1ca4b0e4c2db02c03b5ceadf Mon Sep 17 00:00:00 2001
From: Zach Drone <zvdrone@gmail.com>
Date: Sun, 1 Dec 2024 12:41:23 -0500
Subject: [PATCH] update
---
init.lua | 12 +++++++-----
lua/custom/keymaps.lua | 2 ++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/init.lua b/init.lua
index 0128fb7c..467f70ee 100644
--- a/init.lua
+++ b/init.lua
@@ -217,9 +217,6 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
end ---@diagnostic disable-next-line: undefined-field
vim.opt.rtp:prepend(lazypath)
-require 'custom.keymaps'
-require 'custom.options'
-
-- [[ Configure and install plugins ]]
--
-- To check the current status of your plugins, run
@@ -621,7 +618,7 @@ require('lazy').setup({
local servers = {
-- clangd = {},
-- gopls = {},
- pyright = {},
+ pylsp = {},
-- rust_analyzer = {},
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
--
@@ -661,6 +658,8 @@ require('lazy').setup({
local ensure_installed = vim.tbl_keys(servers or {})
vim.list_extend(ensure_installed, {
'stylua', -- Used to format Lua code
+ 'pylsp',
+ 'black',
})
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
@@ -714,7 +713,7 @@ require('lazy').setup({
formatters_by_ft = {
lua = { 'stylua' },
-- Conform can also run multiple formatters sequentially
- -- python = { "isort", "black" },
+ python = { 'isort', 'black' },
--
-- You can use 'stop_after_first' to run the first available formatter from the list
-- javascript = { "prettierd", "prettier", stop_after_first = true },
@@ -970,5 +969,8 @@ require('lazy').setup({
},
})
+require 'custom.keymaps'
+require 'custom.options'
+
-- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua
index 79141339..30177eaa 100644
--- a/lua/custom/keymaps.lua
+++ b/lua/custom/keymaps.lua
@@ -1,2 +1,4 @@
+local builtin = require 'telescope.builtin'
vim.keymap.set('n', '<leader>sv', '<C-w>v', { desc = 'Open verticle split' })
vim.keymap.set('n', '<leader>sh', '<C-w>h', { desc = 'Open horizontal split' })
+vim.keymap.set('n', '<C-p>', builtin.git_files, {})