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

Move plugin configs into dedicated files

Browse source
This commit is contained in:
Evie Litherland-Smith 2022-11-01 14:52:38 +00:00
parent 27c72a484d
commit d2e33f4c33
12 changed files with 101 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
config_gitsigns.lua Normal file
View file

@ -0,0 +1,15 @@
require('gitsigns').setup{
signcolumn = true,
numhl = true,
linehl = true,
current_line_blame = true,
on_attach = function(bufnr)
-- Setup keymaps
vim.api.nvim_buf_set_keymap(bufnr, 'n', '[g', '<cmd>Gitsigns prev_hunk<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', ']g', '<cmd>Gitsigns next_hunk<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hp', '<cmd>Gitsigns preview_hunk<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hs', '<cmd>Gitsigns select_hunk<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bl', '<cmd>Gitsigns blame_line<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bt', '<cmd>Gitsigns toggle_current_line_blame<CR>', {})
end,
}

0
lsp_config.lua → config_lsp.lua
View file

2
lualine_config.lua → config_lualine.lua
View file

@ -7,5 +7,5 @@ require('lualine').setup{
-- lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_x = {'aerial', 'filetype'}
},
extensions = {'aerial', 'fugitive', 'fzf', 'nerdtree'}
extensions = {'aerial', 'fugitive', 'fzf', 'nvim-tree', 'toggleterm'}
}

14
config_nightfox.lua Normal file
View file

@ -0,0 +1,14 @@
require('nightfox').setup{
modules = {
aerial = true,
cmp = true,
diagnostic = true,
fidget = true,
gitgutter = true,
hop = true,
lsp_trouble = true,
nvimtree = true,
telescope = true,
treesitter = true,
},
}

3
config_nvim-tree.lua Normal file
View file

@ -0,0 +1,3 @@
require('nvim-tree').setup{
filters = { custom = { "^.git$" } }
}

12
config_plugins.lua Normal file
View file

@ -0,0 +1,12 @@
require 'config_gitsigns'
require 'config_lualine'
require 'config_nightfox'
require 'config_nvim-tree'
require 'config_sniprun'
require 'config_tabby'
require 'config_telescope'
require 'config_toggleterm'
require('trouble').setup()
require('fidget').setup()
require('hop').setup()

7
config_sniprun.lua Normal file
View file

@ -0,0 +1,7 @@
require('sniprun').setup{
selected_interpreters = { 'Python3_fifo' },
repl_enable = {'Python3_fifo'},
display = {
"NvimNotify"
},
}

2
config_tabby.lua Normal file
View file

@ -0,0 +1,2 @@
vim.o.showtabline = 2
require('tabby.tabline').use_preset('active_wins_at_tail', { nerdfont = false })

14
config_telescope.lua Normal file
View file

@ -0,0 +1,14 @@
require('telescope').load_extension('aerial')
require('telescope').load_extension('notify')
local actions = require('telescope.actions')
local trouble = require('trouble.providers.telescope')
require('telescope').setup{
defaults = {
mappings = {
i = { ["<c-t>"] = trouble.open_with_trouble },
n = { ["<c-t>"] = trouble.open_with_trouble },
},
},
}

31
config_toggleterm.lua Normal file
View file

@ -0,0 +1,31 @@
require('toggleterm').setup{
open_mapping = [[\t]],
size = 20,
hide_numbers = true, -- hide the number column in toggleterm buffers
persist_size = false,
}
function _G.set_terminal_keymaps()
local opts = {buffer = 0}
vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
end
vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')
local Terminal = require('toggleterm.terminal').Terminal
local lazygit = Terminal:new({ cmd = "lazygit", count = 99, direction = 'float' })
local ranger = Terminal:new({ cmd = "ranger", count = 100, direction = 'float' })
function _lazygit_toggle()
lazygit:toggle()
end
function _ranger_toggle()
ranger:toggle()
end
vim.api.nvim_set_keymap("n", "<leader>g", "<cmd>lua _lazygit_toggle()<CR>", {noremap = true, silent = true})
vim.api.nvim_set_keymap("n", "<leader>r", "<cmd>lua _ranger_toggle()<CR>", {noremap = true, silent = true})

118
init.lua
View file

@ -1,117 +1,3 @@
vim.o.showtabline = 2
require('tabby.tabline').use_preset('active_wins_at_tail', { nerdfont = false })
require('trouble').setup()
require('fidget').setup()
require('hop').setup()
-- gitsigns config
require('gitsigns').setup{
signcolumn = true,
numhl = true,
linehl = true,
current_line_blame = true,
on_attach = function(bufnr)
-- Setup keymaps
vim.api.nvim_buf_set_keymap(bufnr, 'n', '[g', '<cmd>Gitsigns prev_hunk<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', ']g', '<cmd>Gitsigns next_hunk<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hp', '<cmd>Gitsigns preview_hunk<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>hs', '<cmd>Gitsigns select_hunk<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bl', '<cmd>Gitsigns blame_line<CR>', {})
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bt', '<cmd>Gitsigns toggle_current_line_blame<CR>', {})
end,
}
-- lualine config
require('lualine').setup{
options = {
icons_enabled = true,
theme = 'auto',
},
sections = {
-- lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_x = {'aerial', 'filetype'}
},
extensions = {'aerial', 'fugitive', 'fzf', 'nvim-tree', 'toggleterm'}
}
-- nightfox setup
require('nightfox').setup{
modules = {
aerial = true,
cmp = true,
diagnostic = true,
fidget = true,
gitgutter = true,
hop = true,
lsp_trouble = true,
nvimtree = true,
telescope = true,
treesitter = true,
},
}
-- nvim-tree config
require('nvim-tree').setup{
filters = { custom = { "^.git$" } }
}
-- toggleterm config
require('toggleterm').setup{
open_mapping = [[\t]],
size = 20,
hide_numbers = true, -- hide the number column in toggleterm buffers
persist_size = false,
}
function _G.set_terminal_keymaps()
local opts = {buffer = 0}
vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
end
vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')
local Terminal = require('toggleterm.terminal').Terminal
local lazygit = Terminal:new({ cmd = "lazygit", count = 99, direction = 'float' })
local ranger = Terminal:new({ cmd = "ranger", count = 100, direction = 'float' })
function _lazygit_toggle()
lazygit:toggle()
end
function _ranger_toggle()
ranger:toggle()
end
vim.api.nvim_set_keymap("n", "<leader>g", "<cmd>lua _lazygit_toggle()<CR>", {noremap = true, silent = true})
vim.api.nvim_set_keymap("n", "<leader>r", "<cmd>lua _ranger_toggle()<CR>", {noremap = true, silent = true})
-- load telescope integrations
require('telescope').load_extension('aerial')
require('telescope').load_extension('notify')
local actions = require('telescope.actions')
local trouble = require('trouble.providers.telescope')
require('telescope').setup{
defaults = {
mappings = {
i = { ["<c-t>"] = trouble.open_with_trouble },
n = { ["<c-t>"] = trouble.open_with_trouble },
},
},
}
-- Set nvim-notify as default for notifications
vim.notify = require("notify")
-- SnipRun config
require('sniprun').setup{
selected_interpreters = { 'Python3_fifo' },
repl_enable = {'Python3_fifo'},
display = {
"NvimNotify"
},
}
require 'config_lsp'
require 'config_plugins'

1
init.vim
View file

@ -65,7 +65,6 @@ endif
colorscheme nightfox
luafile ~/.vim/init.lua
luafile ~/.vim/lsp_config.lua
if executable('ag')
let g:ackprg = 'ag --vimgrep'