pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Re-enable python treesitter indenting, add telescope git search plugin

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-03-06 17:28:33 +00:00
parent da8f04a146
commit ef16ea6de2
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
config/nvim/lua/config/init.lua
View file

@ -15,15 +15,17 @@ vim.opt.autoindent = true
vim.opt.smartindent = true vim.opt.smartindent = true
vim.opt.splitbelow = true vim.opt.splitbelow = true
vim.opt.splitright = true vim.opt.splitright = true
vim.cmd "filetype indent off"
-- Global -- Global
vim.g.python3_host_prog = vim.fn.stdpath "config" .. "/.venv/bin/python" vim.g.python3_host_prog = vim.fn.stdpath "config" .. "/.venv/bin/python"
vim.g.python_indent = { -- vim.g.python_indent = {
open_paren = "shiftwidth()", -- open_paren = "shiftwidth()",
nested_paren = "shiftwidth()", -- nested_paren = "shiftwidth()",
continue = "shiftwidth()", -- continue = "shiftwidth()",
closed_paren_align_last_line = "v:false", -- closed_paren_align_last_line = "v:false",
} -- disable_parentheses_indenting = 1,
-- }
vim.g.loaded_ruby_provider = 0 vim.g.loaded_ruby_provider = 0
vim.g.loaded_perl_provider = 0 vim.g.loaded_perl_provider = 0
@ -42,12 +44,10 @@ vim.keymap.set({ "n", "t" }, "<A-p>", "<CMD>NavigatorPrevious<CR>")
vim.keymap.set("n", "<leader>;", "<cmd>Telescope builtin<cr>") vim.keymap.set("n", "<leader>;", "<cmd>Telescope builtin<cr>")
vim.keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>") vim.keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>")
vim.keymap.set("n", "<leader>fb", "<cmd>Telescope buffers<cr>") vim.keymap.set("n", "<leader>fb", "<cmd>Telescope buffers<cr>")
vim.keymap.set("n", "<leader>fg", "<cmd>Telescope live_grep<cr>")
vim.keymap.set("n", "<leader>fl", "<cmd>Telescope lsp_document_symbols<cr>") vim.keymap.set("n", "<leader>fl", "<cmd>Telescope lsp_document_symbols<cr>")
vim.keymap.set("n", "<leader>fe", "<cmd>Telescope diagnostics<cr>") vim.keymap.set("n", "<leader>fe", "<cmd>Telescope diagnostics<cr>")
vim.keymap.set("n", "<leader>fs", "<cmd>Telescope treesitter<cr>") vim.keymap.set("n", "<leader>fs", "<cmd>Telescope treesitter<cr>")
vim.keymap.set("n", "<leader>fz", "<cmd>Telescope current_buffer_fuzzy_find<cr>") vim.keymap.set("n", "<leader>fz", "<cmd>Telescope current_buffer_fuzzy_find<cr>")
vim.keymap.set("n", "<leader>fa", "<cmd>Telescope aerial<cr>")
-- Neotree -- Neotree
vim.keymap.set("n", "<leader>n", "<cmd>Neotree toggle<cr>") vim.keymap.set("n", "<leader>n", "<cmd>Neotree toggle<cr>")

2
config/nvim/lua/config/treesitter.lua
View file

@ -15,6 +15,6 @@ return {
}, },
indent = { indent = {
enable = true, enable = true,
disable = { "python" }, -- disable = { "python" },
}, },
} }

1
config/nvim/lua/plugins/aerial.lua
View file

@ -12,5 +12,6 @@ return {
}, },
config = function() config = function()
require("aerial").setup(require "config.aerial") require("aerial").setup(require "config.aerial")
vim.keymap.set("n", "<leader>fa", "<cmd>Telescope aerial<cr>")
end, end,
} }

6
config/nvim/lua/plugins/telescope.lua
View file

@ -17,6 +17,7 @@ return {
require("telescope").load_extension "git_diffs" require("telescope").load_extension "git_diffs"
require("telescope").load_extension "command_center" require("telescope").load_extension "command_center"
require("telescope").load_extension "http" require("telescope").load_extension "http"
require("telescope").load_extension "advanced_git_search"
end, end,
}, },
-- Additional telescope extensions -- Additional telescope extensions
@ -60,4 +61,9 @@ return {
dependencies = { "savq/paq-nvim", "nvim-telescope/telescope.nvim" }, dependencies = { "savq/paq-nvim", "nvim-telescope/telescope.nvim" },
lazy = true, lazy = true,
}, },
{
"aaronhallaert/advanced-git-search.nvim",
dependencies = { "nvim-telescope/telescope.nvim" },
lazy = true,
},
} }