Skip to content
Closed

Master #2153

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,15 @@ do
-- i = { ['<c-enter>'] = 'to_fuzzy_refine' },
-- },
-- },
-- pickers = {}
pickers = {
find_files = {
hidden = true,
no_ignore = false,
},
live_grep = {
additional_args = function(_) return { '--hidden' } end,
},
},
extensions = {
['ui-select'] = { require('telescope.themes').get_dropdown() },
},
Expand Down Expand Up @@ -692,16 +700,16 @@ do
-- See `:help lsp-config` for information about keys and how to configure
---@type table<string, vim.lsp.Config>
local servers = {
-- clangd = {},
-- gopls = {},
-- pyright = {},
-- rust_analyzer = {},
clangd = {},
gopls = {},
pyright = {},
rust_analyzer = {},
--
-- Some languages (like typescript) have entire language plugins that can be useful:
-- https://github.com/pmizio/typescript-tools.nvim
--
-- But for many setups, the LSP (`ts_ls`) will work just fine
-- ts_ls = {},
ts_ls = {},

stylua = {}, -- Used to format Lua code

Expand Down Expand Up @@ -750,7 +758,7 @@ do

-- Translates between nvim-lspconfig server names and mason.nvim package names (e.g. lua_ls <-> lua-language-server)
require('mason-lspconfig').setup {
automatic_enable = false, -- Change this to true if you want to automatically enable servers that are installed manually (e.g. via :Mason / :MasonInstall)
automatic_enable = true, -- Change this to true if you want to automatically enable servers that are installed manually (e.g. via :Mason / :MasonInstall)
}

-- Ensure the servers and tools above are installed
Expand Down Expand Up @@ -785,8 +793,8 @@ do
format_on_save = function(bufnr)
-- You can specify filetypes to autoformat on save here:
local enabled_filetypes = {
-- lua = true,
-- python = true,
lua = true,
python = true,
}
if enabled_filetypes[vim.bo[bufnr].filetype] then
return { timeout_ms = 500 }
Expand All @@ -799,12 +807,12 @@ do
},
-- You can also specify external formatters in here.
formatters_by_ft = {
-- rust = { 'rustfmt' },
rust = { 'rustfmt' },
-- 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 },
javascript = { 'prettierd', 'prettier', stop_after_first = true },
},
}

Expand Down Expand Up @@ -969,17 +977,17 @@ do
-- Here are some example plugins that I've included in the Kickstart repository.
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
--
-- require 'kickstart.plugins.debug'
-- require 'kickstart.plugins.indent_line'
-- require 'kickstart.plugins.lint'
-- require 'kickstart.plugins.autopairs'
require 'kickstart.plugins.debug'
require 'kickstart.plugins.indent_line'
require 'kickstart.plugins.lint'
require 'kickstart.plugins.autopairs'
-- require 'kickstart.plugins.neo-tree'
-- require 'kickstart.plugins.gitsigns' -- adds gitsigns recommended keymaps
require 'kickstart.plugins.gitsigns' -- adds gitsigns recommended keymaps

-- NOTE: You can add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
--
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-- require 'custom.plugins'
require 'custom.plugins'
end

-- The line beneath this is called `modeline`. See `:help modeline`
Expand Down
17 changes: 17 additions & 0 deletions lua/custom/plugins/gitmarks.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
local plugin_path = vim.fn.expand '~/Projects/Personal/gitmarks'

vim.opt.rtp:prepend(plugin_path)

local gitmarks = require 'gitmarks'

gitmarks.setup {
width = 100,
}

vim.keymap.set('n', '<leader>g', '<Nop>', {
desc = '[G]itmarks',
})

vim.keymap.set('n', '<leader>gh', function() gitmarks.hello() end, {
desc = 'Hello from gitmarks',
})
26 changes: 26 additions & 0 deletions lua/custom/plugins/yazi.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
local gh = 'https://github.com/'

vim.pack.add {
gh .. 'mikavilpas/yazi.nvim',
gh .. 'nvim-lua/plenary.nvim',
}

require('yazi').setup {
open_for_directories = false,
keymaps = {
show_help = '<f1>',
},
}

vim.g.loaded_netrwPlugin = 1
vim.api.nvim_create_autocmd('UIEnter', {
callback = function()
require('yazi').setup {
open_for_directories = true,
}
end,
})

vim.keymap.set('n', '<leader>-', '<cmd>Yazi<cr>', {
desc = 'Open Yazi',
})
5 changes: 5 additions & 0 deletions lua/kickstart/plugins/neo-tree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ vim.keymap.set('n', '\\', '<Cmd>Neotree reveal<CR>', { desc = 'NeoTree reveal',

require('neo-tree').setup {
filesystem = {
filtered_items = {
visible = true,
hide_dotfiles = true,
hide_gitignored = true,
},
window = {
mappings = {
['\\'] = 'close_window',
Expand Down