Skip to content

Commit 1e10919

Browse files
committed
added neo-tree, removed lazygit
1 parent 2d0abf4 commit 1e10919

File tree

6 files changed

+90
-109
lines changed

6 files changed

+90
-109
lines changed

lua/peteskiis/plugins/alpha.lua

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
return {
2-
"goolord/alpha-nvim",
3-
event = "VimEnter",
2+
'goolord/alpha-nvim',
3+
event = 'VimEnter',
44
config = function()
5-
local alpha = require("alpha")
6-
local dashboard = require("alpha.themes.dashboard")
5+
local alpha = require 'alpha'
6+
local dashboard = require 'alpha.themes.dashboard'
77

88
-- Set header
99
dashboard.section.header.val = {
10-
" ",
11-
" ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ",
12-
" ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ",
13-
" ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ",
14-
" ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ",
15-
" ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ",
16-
" ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ",
17-
" ",
10+
' ',
11+
' ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ',
12+
' ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ',
13+
' ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ',
14+
' ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ',
15+
' ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ',
16+
' ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ',
17+
' ',
1818
}
1919

2020
-- Set menu
2121
dashboard.section.buttons.val = {
22-
dashboard.button("e", " > New File", "<cmd>ene<CR>"),
23-
dashboard.button("SPC ee", " > Toggle file explorer", "<cmd>NvimTreeToggle<CR>"),
24-
dashboard.button("SPC ff", "󰱼 > Find File", "<cmd>Telescope find_files<CR>"),
25-
dashboard.button("SPC fs", " > Find Word", "<cmd>Telescope live_grep<CR>"),
26-
dashboard.button("SPC wr", "󰁯 > Restore Session For Current Directory", "<cmd>SessionRestore<CR>"),
27-
dashboard.button("q", " > Quit NVIM", "<cmd>qa<CR>"),
22+
dashboard.button('e', ' > New File', '<cmd>ene<CR>'),
23+
dashboard.button('SPC e', ' > Toggle file explorer', '<cmd>NvimTreeToggle<CR>'),
24+
dashboard.button('SPC ff', '󰱼 > Find File', '<cmd>Telescope find_files<CR>'),
25+
dashboard.button('SPC fs', ' > Find Word', '<cmd>Telescope live_grep<CR>'),
26+
dashboard.button('SPC wr', '󰁯 > Restore Session For Current Directory', '<cmd>SessionRestore<CR>'),
27+
dashboard.button('q', ' > Quit NVIM', '<cmd>qa<CR>'),
2828
}
2929

3030
-- Send config to alpha
3131
alpha.setup(dashboard.opts)
3232

3333
-- Disable folding on alpha buffer
34-
vim.cmd([[autocmd FileType alpha setlocal nofoldenable]])
34+
vim.cmd [[autocmd FileType alpha setlocal nofoldenable]]
3535
end,
3636
}

lua/peteskiis/plugins/lazygit.lua

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
return {
2-
"williamboman/mason.nvim",
2+
'williamboman/mason.nvim',
33
dependencies = {
4-
"williamboman/mason-lspconfig.nvim",
5-
"WhoIsSethDaniel/mason-tool-installer.nvim",
4+
'williamboman/mason-lspconfig.nvim',
5+
'WhoIsSethDaniel/mason-tool-installer.nvim',
66
},
77
config = function()
88
-- import mason
9-
local mason = require("mason")
9+
local mason = require 'mason'
1010

1111
-- import mason-lspconfig
12-
local mason_lspconfig = require("mason-lspconfig")
12+
local mason_lspconfig = require 'mason-lspconfig'
1313

14-
local mason_tool_installer = require("mason-tool-installer")
14+
local mason_tool_installer = require 'mason-tool-installer'
1515

1616
-- enable mason and configure icons
17-
mason.setup({
17+
mason.setup {
1818
ui = {
1919
icons = {
20-
package_installed = "",
21-
package_pending = "",
22-
package_uninstalled = "",
20+
package_installed = '',
21+
package_pending = '',
22+
package_uninstalled = '',
2323
},
2424
},
25-
})
25+
}
2626

27-
mason_lspconfig.setup({
27+
mason_lspconfig.setup {
2828
-- list of servers for mason to install
2929
ensure_installed = {
30-
"tsserver",
31-
"html",
32-
"cssls",
33-
"tailwindcss",
34-
"svelte",
35-
"lua_ls",
36-
"graphql",
37-
"emmet_ls",
38-
"prismals",
39-
"pyright",
30+
'ts_ls',
31+
'html',
32+
'cssls',
33+
'tailwindcss',
34+
'svelte',
35+
'lua_ls',
36+
'graphql',
37+
'emmet_ls',
38+
'prismals',
39+
'pyright',
4040
},
41-
})
41+
}
4242

43-
mason_tool_installer.setup({
43+
mason_tool_installer.setup {
4444
ensure_installed = {
45-
"prettier", -- prettier formatter
46-
"stylua", -- lua formatter
47-
"isort", -- python formatter
48-
"black", -- python formatter
49-
"pylint",
50-
"eslint_d",
45+
'prettier', -- prettier formatter
46+
'stylua', -- lua formatter
47+
'isort', -- python formatter
48+
'black', -- python formatter
49+
'pylint',
50+
'eslint_d',
5151
},
52-
})
52+
}
5353
end,
5454
}
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
return {
2-
"nvim-tree/nvim-tree.lua",
3-
dependencies = "nvim-tree/nvim-web-devicons",
2+
'nvim-tree/nvim-tree.lua',
3+
dependencies = 'nvim-tree/nvim-web-devicons',
44
config = function()
5-
local nvimtree = require("nvim-tree")
5+
local nvimtree = require 'nvim-tree'
66

77
-- recommended settings from nvim-tree documentation
88
vim.g.loaded_netrw = 1
99
vim.g.loaded_netrwPlugin = 1
1010

11-
nvimtree.setup({
11+
nvimtree.setup {
1212
view = {
1313
width = 35,
1414
relativenumber = true,
@@ -21,8 +21,8 @@ return {
2121
icons = {
2222
glyphs = {
2323
folder = {
24-
arrow_closed = "", -- arrow when folder is closed
25-
arrow_open = "", -- arrow when folder is open
24+
arrow_closed = '', -- arrow when folder is closed
25+
arrow_open = '', -- arrow when folder is open
2626
},
2727
},
2828
},
@@ -38,19 +38,19 @@ return {
3838
},
3939
},
4040
filters = {
41-
custom = { ".DS_Store" },
41+
custom = { '.DS_Store' },
4242
},
4343
git = {
4444
ignore = false,
4545
},
46-
})
46+
}
4747

4848
-- set keymaps
4949
local keymap = vim.keymap -- for conciseness
5050

51-
keymap.set("n", "<leader>ee", "<cmd>NvimTreeToggle<CR>", { desc = "Toggle file explorer" }) -- toggle file explorer
52-
keymap.set("n", "<leader>ef", "<cmd>NvimTreeFindFileToggle<CR>", { desc = "Toggle file explorer on current file" }) -- toggle file explorer on current file
53-
keymap.set("n", "<leader>ec", "<cmd>NvimTreeCollapse<CR>", { desc = "Collapse file explorer" }) -- collapse file explorer
54-
keymap.set("n", "<leader>er", "<cmd>NvimTreeRefresh<CR>", { desc = "Refresh file explorer" }) -- refresh file explorer
55-
end
51+
keymap.set('n', '<leader>e', '<cmd>NvimTreeToggle<CR>', { desc = 'Toggle file explorer' }) -- toggle file explorer
52+
keymap.set('n', '<leader>ef', '<cmd>NvimTreeFindFileToggle<CR>', { desc = 'Toggle file explorer on current file' }) -- toggle file explorer on current file
53+
keymap.set('n', '<leader>ec', '<cmd>NvimTreeCollapse<CR>', { desc = 'Collapse file explorer' }) -- collapse file explorer
54+
keymap.set('n', '<leader>er', '<cmd>NvimTreeRefresh<CR>', { desc = 'Refresh file explorer' }) -- refresh file explorer
55+
end,
5656
}
Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
return {
2-
"nvim-telescope/telescope.nvim",
3-
branch = "0.1.x",
2+
'nvim-telescope/telescope.nvim',
3+
branch = '0.1.x',
44
dependencies = {
5-
"nvim-lua/plenary.nvim",
6-
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
7-
"nvim-tree/nvim-web-devicons",
8-
"folke/todo-comments.nvim",
5+
'nvim-lua/plenary.nvim',
6+
{ 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
7+
'nvim-tree/nvim-web-devicons',
8+
'folke/todo-comments.nvim',
99
},
1010
config = function()
11-
local telescope = require("telescope")
12-
local actions = require("telescope.actions")
13-
local transform_mod = require("telescope.actions.mt").transform_mod
11+
local telescope = require 'telescope'
12+
local actions = require 'telescope.actions'
13+
local transform_mod = require('telescope.actions.mt').transform_mod
1414

15-
local trouble = require("trouble")
16-
local trouble_telescope = require("trouble.sources.telescope")
15+
local trouble = require 'trouble'
16+
local trouble_telescope = require 'trouble.sources.telescope'
1717

1818
-- or create your custom action
19-
local custom_actions = transform_mod({
19+
local custom_actions = transform_mod {
2020
open_trouble_qflist = function(prompt_bufnr)
21-
trouble.toggle("quickfix")
21+
trouble.toggle 'quickfix'
2222
end,
23-
})
23+
}
2424

25-
telescope.setup({
25+
telescope.setup {
2626
defaults = {
27-
path_display = { "smart" },
27+
path_display = { 'smart' },
2828
mappings = {
2929
i = {
30-
["<C-k>"] = actions.move_selection_previous, -- move to prev result
31-
["<C-j>"] = actions.move_selection_next, -- move to next result
32-
["<C-q>"] = actions.send_selected_to_qflist + custom_actions.open_trouble_qflist,
33-
["<C-t>"] = trouble_telescope.open,
30+
['<C-k>'] = actions.move_selection_previous, -- move to prev result
31+
['<C-j>'] = actions.move_selection_next, -- move to next result
32+
['<C-q>'] = actions.send_selected_to_qflist + custom_actions.open_trouble_qflist,
33+
['<C-t>'] = trouble_telescope.open,
3434
},
3535
},
3636
},
37-
})
37+
}
3838

39-
telescope.load_extension("fzf")
39+
telescope.load_extension 'fzf'
4040

4141
-- set keymaps
4242
local keymap = vim.keymap -- for conciseness
4343

44-
keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>", { desc = "Fuzzy find files in cwd" })
45-
keymap.set("n", "<leader>fr", "<cmd>Telescope oldfiles<cr>", { desc = "Fuzzy find recent files" })
46-
keymap.set("n", "<leader>fs", "<cmd>Telescope live_grep<cr>", { desc = "Find string in cwd" })
47-
keymap.set("n", "<leader>fc", "<cmd>Telescope grep_string<cr>", { desc = "Find string under cursor in cwd" })
48-
keymap.set("n", "<leader>ft", "<cmd>TodoTelescope<cr>", { desc = "Find todos" })
44+
keymap.set('n', '<leader>f', '<cmd>Telescope find_files<cr>', { desc = 'Fuzzy find files in cwd' })
45+
keymap.set('n', '<leader>fr', '<cmd>Telescope oldfiles<cr>', { desc = 'Fuzzy find recent files' })
46+
keymap.set('n', '<leader>g', '<cmd>Telescope live_grep<cr>', { desc = 'Find string in cwd' })
47+
keymap.set('n', '<leader>fc', '<cmd>Telescope grep_string<cr>', { desc = 'Find string under cursor in cwd' })
48+
keymap.set('n', '<leader>ft', '<cmd>TodoTelescope<cr>', { desc = 'Find todos' })
4949
end,
5050
}

0 commit comments

Comments
 (0)