Compare commits
10 Commits
6a7ef6a503
...
90f0774e7b
Author | SHA1 | Date | |
---|---|---|---|
90f0774e7b | |||
fc88e7db50 | |||
b9536f72d3 | |||
08559bae7a | |||
f58ffdb0e4 | |||
94de21bc88 | |||
417fb2b9b6 | |||
e2b33c4bc2 | |||
48f6ccd87c | |||
65f3a2511d |
1
.bashrc
1
.bashrc
@ -1,4 +1,5 @@
|
|||||||
# Navigation
|
# Navigation
|
||||||
|
alias vim="nvim"
|
||||||
alias lg="lazygit"
|
alias lg="lazygit"
|
||||||
alias ls="eza --long --header --git --group --time-style long-iso"
|
alias ls="eza --long --header --git --group --time-style long-iso"
|
||||||
alias cat="bat --theme=\"Visual Studio Dark+\""
|
alias cat="bat --theme=\"Visual Studio Dark+\""
|
||||||
|
@ -47,7 +47,5 @@ set -g status-right '#(date "+%%Y-%m-%d %%H:%%M:%%S")'
|
|||||||
# bell
|
# bell
|
||||||
set-window-option -g window-status-bell-style fg=white,bg=red #base2, red
|
set-window-option -g window-status-bell-style fg=white,bg=red #base2, red
|
||||||
|
|
||||||
|
set -g default-terminal "tmux"
|
||||||
set-option -g terminal-overrides ',xterm*:Cr=\E]12;gray\007'
|
|
||||||
set -ga terminal-overrides ",xterm-256color:Tc"
|
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
lazygit-0.39.3
|
lazygit-0.42.0
|
Binary file not shown.
119
nvim/init.lua
119
nvim/init.lua
@ -307,9 +307,15 @@ require('lazy').setup({
|
|||||||
vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
|
vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
|
||||||
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
|
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
|
||||||
vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
|
vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
|
||||||
vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
|
|
||||||
vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
|
vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
|
||||||
|
|
||||||
|
-- vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
|
||||||
|
vim.keymap.set('n', '<leader>s.', function()
|
||||||
|
builtin.oldfiles {
|
||||||
|
cwd_only = true,
|
||||||
|
}
|
||||||
|
end, { desc = '[S]earch Recent Files in CWD' })
|
||||||
|
|
||||||
-- Slightly advanced example of overriding default behavior and theme
|
-- Slightly advanced example of overriding default behavior and theme
|
||||||
vim.keymap.set('n', '<leader>/', function()
|
vim.keymap.set('n', '<leader>/', function()
|
||||||
-- You can pass additional configuration to Telescope to change the theme, layout, etc.
|
-- You can pass additional configuration to Telescope to change the theme, layout, etc.
|
||||||
@ -476,26 +482,23 @@ require('lazy').setup({
|
|||||||
-- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
|
-- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
|
||||||
-- - settings (table): Override the default settings passed when initializing the server.
|
-- - settings (table): Override the default settings passed when initializing the server.
|
||||||
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
|
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
|
||||||
|
--
|
||||||
|
-- See `:help lspconfig-all` for a list of all the pre-configured LSPs
|
||||||
local servers = {
|
local servers = {
|
||||||
-- clangd = {},
|
|
||||||
gopls = {
|
gopls = {
|
||||||
gofumpt = true,
|
gofumpt = true,
|
||||||
},
|
},
|
||||||
-- pyright = {},
|
|
||||||
-- rust_analyzer = {},
|
|
||||||
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
|
|
||||||
--
|
|
||||||
-- Some languages (like typescript) have entire language plugins that can be useful:
|
-- Some languages (like typescript) have entire language plugins that can be useful:
|
||||||
-- https://github.com/pmizio/typescript-tools.nvim
|
-- https://github.com/pmizio/typescript-tools.nvim
|
||||||
--
|
--
|
||||||
-- But for many setups, the LSP (`tsserver`) will work just fine
|
-- But for many setups, the LSP (`tsserver`) will work just fine
|
||||||
-- tsserver = {},
|
tsserver = {},
|
||||||
--
|
|
||||||
|
eslint = {},
|
||||||
|
tailwindcss = {},
|
||||||
|
|
||||||
lua_ls = {
|
lua_ls = {
|
||||||
-- cmd = {...},
|
|
||||||
-- filetypes = { ...},
|
|
||||||
-- capabilities = {},
|
|
||||||
settings = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
completion = {
|
completion = {
|
||||||
@ -690,21 +693,76 @@ require('lazy').setup({
|
|||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
{ -- You can easily change to a different colorscheme.
|
{
|
||||||
-- Change the name of the colorscheme plugin below, and then
|
-- Set the colorscheme.
|
||||||
-- change the command in the config to whatever the name of that colorscheme is.
|
|
||||||
--
|
|
||||||
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
|
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
|
||||||
'folke/tokyonight.nvim',
|
'catppuccin/nvim',
|
||||||
|
name = 'catppuccin',
|
||||||
priority = 1000, -- Make sure to load this before all the other start plugins.
|
priority = 1000, -- Make sure to load this before all the other start plugins.
|
||||||
|
opts = {
|
||||||
|
flavour = 'latte',
|
||||||
|
integrations = {
|
||||||
|
cmp = true,
|
||||||
|
dap = true,
|
||||||
|
diffview = true,
|
||||||
|
gitsigns = true,
|
||||||
|
mason = true,
|
||||||
|
native_lsp = {
|
||||||
|
enabled = true,
|
||||||
|
virtual_text = {
|
||||||
|
errors = { 'italic' },
|
||||||
|
hints = { 'italic' },
|
||||||
|
warnings = { 'italic' },
|
||||||
|
information = { 'italic' },
|
||||||
|
ok = { 'italic' },
|
||||||
|
},
|
||||||
|
underlines = {
|
||||||
|
errors = { 'underline' },
|
||||||
|
hints = { 'underline' },
|
||||||
|
warnings = { 'underline' },
|
||||||
|
information = { 'underline' },
|
||||||
|
ok = { 'underline' },
|
||||||
|
},
|
||||||
|
inlay_hints = {
|
||||||
|
background = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
telescope = true,
|
||||||
|
which_key = true,
|
||||||
|
},
|
||||||
|
color_overrides = {
|
||||||
|
latte = {
|
||||||
|
rosewater = '#cc7983',
|
||||||
|
flamingo = '#bb5d60',
|
||||||
|
pink = '#d54597',
|
||||||
|
mauve = '#a65fd5',
|
||||||
|
red = '#b7242f',
|
||||||
|
maroon = '#db3e68',
|
||||||
|
peach = '#e46f2a',
|
||||||
|
yellow = '#bc8705',
|
||||||
|
green = '#1a8e32',
|
||||||
|
teal = '#00a390',
|
||||||
|
sky = '#089ec0',
|
||||||
|
sapphire = '#0ea0a0',
|
||||||
|
blue = '#017bca',
|
||||||
|
lavender = '#8584f7',
|
||||||
|
text = '#444444',
|
||||||
|
subtext1 = '#555555',
|
||||||
|
subtext0 = '#666666',
|
||||||
|
overlay2 = '#777777',
|
||||||
|
overlay1 = '#888888',
|
||||||
|
overlay0 = '#999999',
|
||||||
|
surface2 = '#aaaaaa',
|
||||||
|
surface1 = '#bbbbbb',
|
||||||
|
surface0 = '#cccccc',
|
||||||
|
base = '#fffffa',
|
||||||
|
mantle = '#eeeeee',
|
||||||
|
crust = '#dddddd',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
init = function()
|
init = function()
|
||||||
-- Load the colorscheme here.
|
vim.cmd.colorscheme 'catppuccin'
|
||||||
-- Like many other themes, this one has different styles, and you could load
|
|
||||||
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
|
|
||||||
vim.cmd.colorscheme 'tokyonight-night'
|
|
||||||
|
|
||||||
-- You can configure highlights by doing something like:
|
|
||||||
vim.cmd.hi 'Comment gui=none'
|
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -780,29 +838,20 @@ require('lazy').setup({
|
|||||||
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
|
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
-- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
|
|
||||||
-- init.lua. If you want these files, they are in the repository, so you can just download them and
|
|
||||||
-- place them in the correct locations.
|
|
||||||
|
|
||||||
-- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
|
|
||||||
--
|
--
|
||||||
-- Here are some example plugins that I've included in the Kickstart repository.
|
-- 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).
|
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
|
||||||
--
|
--
|
||||||
-- require 'kickstart.plugins.debug',
|
-- require 'kickstart.plugins.debug',
|
||||||
-- require 'kickstart.plugins.indent_line',
|
-- require 'kickstart.plugins.indent_line',
|
||||||
-- require 'kickstart.plugins.lint',
|
require 'kickstart.plugins.lint',
|
||||||
-- require 'kickstart.plugins.autopairs',
|
require 'kickstart.plugins.autopairs',
|
||||||
-- require 'kickstart.plugins.neo-tree',
|
-- require 'kickstart.plugins.neo-tree',
|
||||||
require 'kickstart.plugins.gitsigns',
|
require 'kickstart.plugins.gitsigns',
|
||||||
|
|
||||||
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
|
|
||||||
-- This is the easiest way to modularize your config.
|
|
||||||
--
|
--
|
||||||
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
||||||
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
|
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
|
||||||
-- { import = 'custom.plugins' },
|
{ import = 'custom.plugins' },
|
||||||
}, {
|
}, {
|
||||||
ui = {
|
ui = {
|
||||||
-- If you are using a Nerd Font: set icons to an empty table which will use the
|
-- If you are using a Nerd Font: set icons to an empty table which will use the
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
-- You can add your own plugins here or in other files in this directory!
|
|
||||||
-- I promise not to create any merge conflicts in this directory :)
|
|
||||||
--
|
|
||||||
-- See the kickstart.nvim README for more information
|
|
||||||
return {}
|
|
11
nvim/lua/custom/plugins/nvim-treesitter-context.lua
Normal file
11
nvim/lua/custom/plugins/nvim-treesitter-context.lua
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
-- Display context that has scrolled off the top of the screen.
|
||||||
|
-- For example, signature of the current function, or if-case.
|
||||||
|
-- https://github.com/nvim-treesitter/nvim-treesitter-context
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
'nvim-treesitter/nvim-treesitter-context',
|
||||||
|
opts = {
|
||||||
|
max_lines = 5,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user