Compare commits
10 Commits
445e8a8835
...
6ff1da83ef
Author | SHA1 | Date | |
---|---|---|---|
|
6ff1da83ef | ||
264319500b | |||
04483ed6aa | |||
1d254adcfe | |||
074b01085a | |||
24a7baf2e8 | |||
2db0b063ec | |||
d9f05d8ead | |||
fb284a3068 | |||
f3acf64dbc |
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
fish_variables
|
||||||
|
lazy-lock.json
|
8
.luarc.json
Normal file
8
.luarc.json
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"diagnostics.globals": [
|
||||||
|
"vim"
|
||||||
|
],
|
||||||
|
"diagnostics.disable": [
|
||||||
|
"undefined-global"
|
||||||
|
]
|
||||||
|
}
|
@ -5,17 +5,3 @@ if [ -d "$FNM_PATH" ]
|
|||||||
set PATH "$FNM_PATH" $PATH
|
set PATH "$FNM_PATH" $PATH
|
||||||
fnm env | source
|
fnm env | source
|
||||||
end
|
end
|
||||||
|
|
||||||
# fnm
|
|
||||||
set FNM_PATH "/home/asif/.local/share/fnm"
|
|
||||||
if [ -d "$FNM_PATH" ]
|
|
||||||
set PATH "$FNM_PATH" $PATH
|
|
||||||
fnm env | source
|
|
||||||
end
|
|
||||||
|
|
||||||
# fnm
|
|
||||||
set FNM_PATH "/home/asif/.local/share/fnm"
|
|
||||||
if [ -d "$FNM_PATH" ]
|
|
||||||
set PATH "$FNM_PATH" $PATH
|
|
||||||
fnm env | source
|
|
||||||
end
|
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
|
set -x PATH $PATH:$HOME/.local/bin
|
||||||
set -x TMUX_CONF $HOME/.config/tmux/.tmux.conf
|
set -x TMUX_CONF $HOME/.config/tmux/.tmux.conf
|
||||||
|
set -x TNS_ADMIN /opt/instantclient/network/admin
|
||||||
|
|
||||||
# search and edit files
|
# search and edit files
|
||||||
function f
|
function f
|
||||||
@ -18,7 +20,7 @@ fzf --fish | source
|
|||||||
set -gx FZF_DEFAULT_COMMAND 'rg --files --hidden --follow --glob "!.git/*"'
|
set -gx FZF_DEFAULT_COMMAND 'rg --files --hidden --follow --glob "!.git/*"'
|
||||||
set -gx FZF_CTRL_T_COMMAND 'fd --type f --hidden --follow --exclude .git'
|
set -gx FZF_CTRL_T_COMMAND 'fd --type f --hidden --follow --exclude .git'
|
||||||
set -gx FZF_ALT_C_COMMAND 'fd --type d --hidden --follow --exclude .git'
|
set -gx FZF_ALT_C_COMMAND 'fd --type d --hidden --follow --exclude .git'
|
||||||
set -gx FZF_DEFAULT_OPTS '--tmux --layout=reverse --border --preview "bat --color=always --style=numbers {}"'
|
set -gx FZF_DEFAULT_OPTS '--layout=reverse --border --preview "bat --color=always --style=numbers {}"'
|
||||||
|
|
||||||
# color setting for fish prompt
|
# color setting for fish prompt
|
||||||
set -g fish_color_command green
|
set -g fish_color_command green
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
# This file contains fish universal variable definitions.
|
|
||||||
# VERSION: 3.0
|
|
||||||
SETUVAR Z_DATA_DIR:/home/asif/\x2elocal/share/z
|
|
||||||
SETUVAR __fish_initialized:3800
|
|
||||||
SETUVAR _fisher_upgraded_to_4_4:\x1d
|
|
||||||
SETUVAR fish_color_autosuggestion:brblack
|
|
||||||
SETUVAR fish_color_cancel:\x2dr
|
|
||||||
SETUVAR fish_color_command:normal
|
|
||||||
SETUVAR fish_color_comment:red
|
|
||||||
SETUVAR fish_color_cwd:green
|
|
||||||
SETUVAR fish_color_cwd_root:red
|
|
||||||
SETUVAR fish_color_end:green
|
|
||||||
SETUVAR fish_color_error:brred
|
|
||||||
SETUVAR fish_color_escape:brcyan
|
|
||||||
SETUVAR fish_color_history_current:\x2d\x2dbold
|
|
||||||
SETUVAR fish_color_host:normal
|
|
||||||
SETUVAR fish_color_host_remote:yellow
|
|
||||||
SETUVAR fish_color_normal:normal
|
|
||||||
SETUVAR fish_color_operator:brcyan
|
|
||||||
SETUVAR fish_color_param:cyan
|
|
||||||
SETUVAR fish_color_quote:yellow
|
|
||||||
SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
|
|
||||||
SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
|
|
||||||
SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
|
|
||||||
SETUVAR fish_color_status:red
|
|
||||||
SETUVAR fish_color_user:brgreen
|
|
||||||
SETUVAR fish_color_valid_path:\x2d\x2dunderline
|
|
||||||
SETUVAR fish_key_bindings:fish_default_key_bindings
|
|
||||||
SETUVAR fish_pager_color_completion:normal
|
|
||||||
SETUVAR fish_pager_color_description:yellow\x1e\x2di
|
|
||||||
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
|
|
||||||
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
|
|
||||||
SETUVAR fish_pager_color_selected_background:\x2dr
|
|
||||||
SETUVAR fish_user_paths:/home/asif/\x2esdkman/candidates/java/current/bin
|
|
4
nvim/.config/nvim/.luarc.json
Normal file
4
nvim/.config/nvim/.luarc.json
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://raw.githubusercontent.com/LuaLS/lua-language-server/master/schema/luarc.json",
|
||||||
|
"diagnostics.globals": ["vim"],
|
||||||
|
}
|
20
nvim/.config/nvim/after/plugin/autopairs.lua
Normal file
20
nvim/.config/nvim/after/plugin/autopairs.lua
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
local npairs = require("nvim-autopairs")
|
||||||
|
local Rule = require("nvim-autopairs.rule")
|
||||||
|
|
||||||
|
npairs.setup({
|
||||||
|
check_ts = true,
|
||||||
|
ts_config = {
|
||||||
|
python = { "string" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
npairs.add_rules({
|
||||||
|
Rule(" ", " "):with_pair(function(opts)
|
||||||
|
return vim.tbl_contains({ "()", "[]", "{}" }, opts.line:sub(opts.col - 1, opts.col))
|
||||||
|
end),
|
||||||
|
})
|
||||||
|
|
||||||
|
npairs.add_rules({
|
||||||
|
Rule("'''", "'''", "python"),
|
||||||
|
Rule('"""', '"""', "python"),
|
||||||
|
})
|
16
nvim/.config/nvim/after/plugin/comment.lua
Normal file
16
nvim/.config/nvim/after/plugin/comment.lua
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
require("Comment").setup({
|
||||||
|
-- pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(),
|
||||||
|
toggler = {
|
||||||
|
line = "<leader>cc", -- Line-comment toggle keymap
|
||||||
|
block = "<leader>bc",
|
||||||
|
},
|
||||||
|
opleader = {
|
||||||
|
line = "<leader>c",
|
||||||
|
block = "<leader>b",
|
||||||
|
},
|
||||||
|
extra = {
|
||||||
|
above = "<leader>cO",
|
||||||
|
below = "<leader>co",
|
||||||
|
eol = "<leader>cA",
|
||||||
|
},
|
||||||
|
})
|
0
nvim/.config/nvim/after/plugin/cursor.lua
Normal file
0
nvim/.config/nvim/after/plugin/cursor.lua
Normal file
24
nvim/.config/nvim/after/plugin/indent.lua
Normal file
24
nvim/.config/nvim/after/plugin/indent.lua
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
require("ibl").setup({
|
||||||
|
indent = {
|
||||||
|
char = "┊", --"│",
|
||||||
|
tab_char = "┊",
|
||||||
|
},
|
||||||
|
scope = {
|
||||||
|
show_start = false,
|
||||||
|
show_end = false,
|
||||||
|
},
|
||||||
|
exclude = {
|
||||||
|
filetypes = {
|
||||||
|
"help",
|
||||||
|
"alpha",
|
||||||
|
"dashboard",
|
||||||
|
"neo-tree",
|
||||||
|
"Trouble",
|
||||||
|
"lazy",
|
||||||
|
"mason",
|
||||||
|
"notify",
|
||||||
|
"togglerterm",
|
||||||
|
"lazyterm",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
11
nvim/.config/nvim/after/plugin/neoscroll.lua
Normal file
11
nvim/.config/nvim/after/plugin/neoscroll.lua
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
require("neoscroll").setup({
|
||||||
|
mappings = { "<C-u>", "<C-d>", "<C-b>", "<C-f>", "<C-y>", "zz", "zt", "zb" },
|
||||||
|
hide_cursor = true,
|
||||||
|
stop_eof = true,
|
||||||
|
respect_scrolloff = false,
|
||||||
|
cursor_scrolls_alone = true,
|
||||||
|
easing_function = "quadratic",
|
||||||
|
pre_hook = nil,
|
||||||
|
post_hook = nil,
|
||||||
|
performance_mode = false,
|
||||||
|
})
|
14
nvim/.config/nvim/after/plugin/surround.lua
Normal file
14
nvim/.config/nvim/after/plugin/surround.lua
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
require("nvim-surround").setup({
|
||||||
|
keymaps = {
|
||||||
|
insert = "<C-g>s",
|
||||||
|
insert_line = "<C-g>S",
|
||||||
|
normal = "ys",
|
||||||
|
normal_cur = "yss",
|
||||||
|
normal_line = "yS",
|
||||||
|
normal_cur_line = "ySS",
|
||||||
|
visual = "S",
|
||||||
|
visual_line = "gS",
|
||||||
|
delete = "ds",
|
||||||
|
change = "cs",
|
||||||
|
},
|
||||||
|
})
|
@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
|
|
||||||
"blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
|
|
||||||
"conform.nvim": { "branch": "master", "commit": "a4bb5d6c4ae6f32ab13114e62e70669fa67745b9" },
|
|
||||||
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
|
||||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
|
||||||
"gruvbox-material": { "branch": "master", "commit": "f5f912fbc7cf2d45da6928b792d554f85c7aa89a" },
|
|
||||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
|
||||||
"lspsaga.nvim": { "branch": "main", "commit": "920b1253e1a26732e53fac78412f6da7f674671d" },
|
|
||||||
"lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" },
|
|
||||||
"lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
|
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" },
|
|
||||||
"mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" },
|
|
||||||
"mason.nvim": { "branch": "main", "commit": "888d6ee499d8089a3a4be4309d239d6be1c1e6c0" },
|
|
||||||
"mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
|
|
||||||
"nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
|
|
||||||
"nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
|
|
||||||
"nvim-java": { "branch": "main", "commit": "f92cadf7bdd01f5cfe383c8e725a283ffcc3685d" },
|
|
||||||
"nvim-java-core": { "branch": "main", "commit": "401bf7683012a25929a359deec418f36beb876e2" },
|
|
||||||
"nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" },
|
|
||||||
"nvim-java-refactor": { "branch": "main", "commit": "b51a57d862338999059e1d1717df3bc80a3a15c0" },
|
|
||||||
"nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" },
|
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" },
|
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
|
|
||||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "b0debd5c424969b4baeabdc8f54db3036c691732" },
|
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
|
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
|
||||||
"oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" },
|
|
||||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
|
||||||
"spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" },
|
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
|
|
||||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
|
||||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }
|
|
||||||
}
|
|
@ -44,6 +44,14 @@ require("lazy").setup({
|
|||||||
"windwp/nvim-ts-autotag",
|
"windwp/nvim-ts-autotag",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"kylechui/nvim-surround",
|
||||||
|
version = "*",
|
||||||
|
event = "VeryLazy",
|
||||||
|
config = function()
|
||||||
|
require("nvim-surround").setup()
|
||||||
|
end,
|
||||||
|
},
|
||||||
-- LSP
|
-- LSP
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
@ -55,9 +63,6 @@ require("lazy").setup({
|
|||||||
"saghen/blink.cmp",
|
"saghen/blink.cmp",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"nvim-java/nvim-java",
|
|
||||||
},
|
|
||||||
{ -- Autoformat
|
{ -- Autoformat
|
||||||
"stevearc/conform.nvim",
|
"stevearc/conform.nvim",
|
||||||
event = { "BufWritePre" },
|
event = { "BufWritePre" },
|
||||||
@ -90,11 +95,9 @@ require("lazy").setup({
|
|||||||
end,
|
end,
|
||||||
formatters_by_ft = {
|
formatters_by_ft = {
|
||||||
lua = { "stylua" },
|
lua = { "stylua" },
|
||||||
-- Conform can also run multiple formatters sequentially
|
python = { "isort", "black" },
|
||||||
-- python = { "isort", "black" },
|
javascript = { "prettierd", "prettier", stop_after_first = true },
|
||||||
--
|
|
||||||
-- You can use 'stop_after_first' to run the first available formatter from the list
|
-- You can use 'stop_after_first' to run the first available formatter from the list
|
||||||
-- javascript = { "prettierd", "prettier", stop_after_first = true },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -109,9 +112,6 @@ require("lazy").setup({
|
|||||||
"L3MON4D3/LuaSnip",
|
"L3MON4D3/LuaSnip",
|
||||||
version = "2.*",
|
version = "2.*",
|
||||||
build = (function()
|
build = (function()
|
||||||
-- Build Step is needed for regex support in snippets.
|
|
||||||
-- This step is not supported in many windows environments.
|
|
||||||
-- Remove the below condition to re-enable on windows.
|
|
||||||
if vim.fn.has("win32") == 1 or vim.fn.executable("make") == 0 then
|
if vim.fn.has("win32") == 1 or vim.fn.executable("make") == 0 then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -133,42 +133,14 @@ require("lazy").setup({
|
|||||||
--- @type blink.cmp.Config
|
--- @type blink.cmp.Config
|
||||||
opts = {
|
opts = {
|
||||||
keymap = {
|
keymap = {
|
||||||
-- 'default' (recommended) for mappings similar to built-in completions
|
|
||||||
-- <c-y> to accept ([y]es) the completion.
|
|
||||||
-- This will auto-import if your LSP supports it.
|
|
||||||
-- This will expand snippets if the LSP sent a snippet.
|
|
||||||
-- 'super-tab' for tab to accept
|
|
||||||
-- 'enter' for enter to accept
|
|
||||||
-- 'none' for no mappings
|
|
||||||
--
|
|
||||||
-- For an understanding of why the 'default' preset is recommended,
|
|
||||||
-- you will need to read `:help ins-completion`
|
|
||||||
--
|
|
||||||
-- No, but seriously. Please read `:help ins-completion`, it is really good!
|
|
||||||
--
|
|
||||||
-- All presets have the following mappings:
|
|
||||||
-- <tab>/<s-tab>: move to right/left of your snippet expansion
|
|
||||||
-- <c-space>: Open menu or open docs if already open
|
|
||||||
-- <c-n>/<c-p> or <up>/<down>: Select next/previous item
|
|
||||||
-- <c-e>: Hide menu
|
|
||||||
-- <c-k>: Toggle signature help
|
|
||||||
--
|
|
||||||
-- See :h blink-cmp-config-keymap for defining your own keymap
|
|
||||||
preset = "default",
|
preset = "default",
|
||||||
|
|
||||||
-- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
|
|
||||||
-- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
|
|
||||||
},
|
},
|
||||||
|
|
||||||
appearance = {
|
appearance = {
|
||||||
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
|
|
||||||
-- Adjusts spacing to ensure icons are aligned
|
|
||||||
nerd_font_variant = "mono",
|
nerd_font_variant = "mono",
|
||||||
},
|
},
|
||||||
|
|
||||||
completion = {
|
completion = {
|
||||||
-- By default, you may press `<c-space>` to show the documentation.
|
|
||||||
-- Optionally, set `auto_show = true` to show the documentation after a delay.
|
|
||||||
documentation = { auto_show = false, auto_show_delay_ms = 500 },
|
documentation = { auto_show = false, auto_show_delay_ms = 500 },
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -180,17 +152,7 @@ require("lazy").setup({
|
|||||||
},
|
},
|
||||||
|
|
||||||
snippets = { preset = "luasnip" },
|
snippets = { preset = "luasnip" },
|
||||||
|
|
||||||
-- Blink.cmp includes an optional, recommended rust fuzzy matcher,
|
|
||||||
-- which automatically downloads a prebuilt binary when enabled.
|
|
||||||
--
|
|
||||||
-- By default, we use the Lua implementation instead, but you may enable
|
|
||||||
-- the rust implementation via `'prefer_rust_with_warning'`
|
|
||||||
--
|
|
||||||
-- See :h blink-cmp-config-fuzzy for more information
|
|
||||||
fuzzy = { implementation = "lua" },
|
fuzzy = { implementation = "lua" },
|
||||||
|
|
||||||
-- Shows a signature help window while you type arguments for a function
|
|
||||||
signature = { enabled = true },
|
signature = { enabled = true },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -208,8 +170,6 @@ require("lazy").setup({
|
|||||||
opts = {},
|
opts = {},
|
||||||
-- Optional dependencies
|
-- Optional dependencies
|
||||||
dependencies = { { "echasnovski/mini.icons", opts = {} } },
|
dependencies = { { "echasnovski/mini.icons", opts = {} } },
|
||||||
-- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons
|
|
||||||
-- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations.
|
|
||||||
lazy = false,
|
lazy = false,
|
||||||
config = function()
|
config = function()
|
||||||
require("oil").setup({
|
require("oil").setup({
|
||||||
@ -218,6 +178,23 @@ require("lazy").setup({
|
|||||||
vim.keymap.set("n", "-", "<cmd>Oil<CR>", { desc = "open parent directory" })
|
vim.keymap.set("n", "-", "<cmd>Oil<CR>", { desc = "open parent directory" })
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{ "numToStr/Comment.nvim", opts = {} },
|
||||||
|
{ "windwp/nvim-autopairs", event = "InsertEnter", opts = {} },
|
||||||
|
{ "lukas-reineke/indent-blankline.nvim", main = "ibl", opts = {} },
|
||||||
|
{
|
||||||
|
"karb94/neoscroll.nvim",
|
||||||
|
event = "VeryLazy",
|
||||||
|
config = function()
|
||||||
|
require("neoscroll").setup()
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"sphamba/smear-cursor.nvim",
|
||||||
|
event = "VeryLazy",
|
||||||
|
opts = {
|
||||||
|
smear_between_neighbour_lines = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
defaults = {
|
defaults = {
|
||||||
lazy = false,
|
lazy = false,
|
||||||
|
@ -21,16 +21,52 @@ local servers = {
|
|||||||
lua_ls = {
|
lua_ls = {
|
||||||
settings = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
|
runtime = {
|
||||||
|
version = "LuaJIT",
|
||||||
|
path = {
|
||||||
|
"?.lua",
|
||||||
|
"?/init.lua",
|
||||||
|
vim.fn.stdpath("data") .. "lazy/?.lua",
|
||||||
|
vim.fn.stdpath("data") .. "lazy/?/init.lua",
|
||||||
|
},
|
||||||
|
},
|
||||||
completion = {
|
completion = {
|
||||||
callSnippet = "Replace",
|
callSnippet = "Replace",
|
||||||
|
keywordSnippet = "Replace",
|
||||||
},
|
},
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
globals = { "vim" },
|
globals = { "vim" },
|
||||||
|
useLocalExclude = { "_*" },
|
||||||
|
},
|
||||||
|
workspace = {
|
||||||
|
library = {
|
||||||
|
vim.api.nvim_get_runtime_file("", true),
|
||||||
|
[vim.fn.expand("$VIMRUNTIME/lua")] = true,
|
||||||
|
[vim.fn.stdpath("config") .. "/lua"] = true,
|
||||||
|
},
|
||||||
|
maxPreload = 2000,
|
||||||
|
preloadFileSize = 50000,
|
||||||
|
checkThirdParty = false,
|
||||||
|
},
|
||||||
|
telemetry = { enable = false },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
pyright = {
|
||||||
|
settings = {
|
||||||
|
pyright = {
|
||||||
|
disableOrganizeImports = true,
|
||||||
|
},
|
||||||
|
python = {
|
||||||
|
analysis = {
|
||||||
|
autoSearchPaths = true,
|
||||||
|
diagnosticMode = "workspace",
|
||||||
|
useLibraryCodeForTypes = true,
|
||||||
|
typeCheckingMode = "basic",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
ts_ls = {},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local ensure_installed = vim.tbl_keys(servers or {})
|
local ensure_installed = vim.tbl_keys(servers or {})
|
||||||
|
@ -1,83 +1,68 @@
|
|||||||
format = """
|
# Inserts a blank line between shell prompts for better readability.
|
||||||
$username\
|
add_newline = true
|
||||||
$hostname\
|
# Timeout for starship to scan files in the current directory.
|
||||||
|
command_timeout = 1000
|
||||||
|
|
||||||
|
|
||||||
|
# --- Main prompt structure ---
|
||||||
|
# Defines the order of modules.
|
||||||
|
# Starship intelligently handles powerline separators:
|
||||||
|
# The foreground of the separator is the background of its own module.
|
||||||
|
# The background of the separator is the background of the *next* module.
|
||||||
|
format = """\
|
||||||
$directory\
|
$directory\
|
||||||
$git_branch\
|
$git_branch\
|
||||||
$git_state\
|
|
||||||
$git_status\
|
$git_status\
|
||||||
$git_metrics\
|
$cmd_duration\
|
||||||
$fill\
|
|
||||||
$cmd_duration $jobs\
|
|
||||||
$line_break\
|
$line_break\
|
||||||
|
$status\
|
||||||
$character\
|
$character\
|
||||||
"""
|
"""
|
||||||
add_newline = false
|
|
||||||
|
|
||||||
[fill]
|
# --- Module Configurations ---
|
||||||
symbol = " "
|
|
||||||
|
|
||||||
[directory]
|
[directory]
|
||||||
style = "blue"
|
# Style for directory path
|
||||||
read_only = " "
|
style = "#8EC07C"
|
||||||
truncation_length = 4
|
format = "[ $path ]($style)"
|
||||||
truncate_to_repo = false
|
truncation_length = 3 # Max number of parent directories to show
|
||||||
|
truncate_to_repo = true # If in a git repo, show path relative to repo root if shorter
|
||||||
[character]
|
home_symbol = " ~" # Icon for home directory (nf-fa-home)
|
||||||
success_symbol = "[~> ](bold yellow)"
|
read_only = " " # Icon for read-only directory (nf-fa-lock)
|
||||||
error_symbol = "[~> ](bold red)"
|
read_only_style = "red" # Make lock icon redon directory's aqua background
|
||||||
vicmd_symbol = "[~> ](bold green)"
|
|
||||||
|
|
||||||
[git_branch]
|
[git_branch]
|
||||||
symbol = " "
|
symbol = " " # Git branch icon (nf-fa-code_fork)
|
||||||
format = 'on [$symbol$branch(:$remote_branch)]($style) '
|
style = "bold #FE8019"
|
||||||
ignore_branches=[]
|
format = "[ $symbol$branch ]($style)"
|
||||||
style = "bold purple"
|
|
||||||
|
|
||||||
|
|
||||||
[git_status]
|
[git_status]
|
||||||
format = '([\[$all_status$ahead_behind\]]($style) )'
|
format='([\[$all_status$ahead_behind\]](green) )'
|
||||||
style = "cyan"
|
|
||||||
|
|
||||||
[git_state]
|
|
||||||
format = '\([$state( $progress_current/$progress_total)]($style)\) '
|
|
||||||
style = "bright-black"
|
|
||||||
|
|
||||||
[git_metrics]
|
|
||||||
disabled = false
|
|
||||||
|
|
||||||
[jobs]
|
|
||||||
symbol = ""
|
|
||||||
style = "bold red"
|
|
||||||
number_threshold = 1
|
|
||||||
format = "[$symbol]($style)"
|
|
||||||
|
|
||||||
[cmd_duration]
|
[cmd_duration]
|
||||||
format = "[$duration]($style)"
|
min_time = 1000 # Show if command took longer than 1 second
|
||||||
style = "yellow"
|
# Style for command duration (on default terminal background)
|
||||||
|
style = "fg:gruv_yellow"
|
||||||
|
format = "[took $duration]($style) " # <20><> nf-md-timer_sand_complete
|
||||||
|
|
||||||
[memory_usage]
|
[line_break]
|
||||||
symbol = " "
|
# Ensures the prompt character starts on a new line
|
||||||
|
disabled = false
|
||||||
|
|
||||||
|
[status]
|
||||||
|
# Shows exit status of the last command if it failed
|
||||||
|
style = "fg:gruv_red" # On default terminal background
|
||||||
|
symbol = "x " # nf-mdi-alert_circle_outline (error icon)
|
||||||
|
format = "[$symbol$status]($style) "
|
||||||
|
disabled = false # Show only on error
|
||||||
|
map_symbol = true # Use specific symbols for different error codes if available
|
||||||
|
|
||||||
|
[character]
|
||||||
|
success_symbol = "[ ~> ](bold green)" # Green ❯ for success
|
||||||
|
error_symbol = "[ ~> ](bold red)" # Red ❯ for error
|
||||||
|
# vicmd_symbol = "[❮](bold gruv_blue)" # Optional: for vi mode indicator
|
||||||
|
|
||||||
[python]
|
[python]
|
||||||
symbol=""
|
symbol=" "
|
||||||
|
pyenv_prefix = "venv "
|
||||||
[c]
|
|
||||||
symbol=""
|
|
||||||
|
|
||||||
[lua]
|
|
||||||
symbol=""
|
|
||||||
|
|
||||||
[rust]
|
|
||||||
symbol = ""
|
|
||||||
|
|
||||||
[time]
|
|
||||||
disabled = false
|
|
||||||
style = "bold yellow"
|
|
||||||
format = "[$time]($style)"
|
|
||||||
|
|
||||||
[custom.stunnel]
|
|
||||||
when = "ps aux | grep stunnel | grep -v grep"
|
|
||||||
command = "ps -o etime= -p $(ps aux | grep stunnel | grep -v grep | awk '{print $2}')"
|
|
||||||
style = "red"
|
|
||||||
format = "[TUNNEL OPEN for $output]($style)"
|
|
||||||
|
|
||||||
|
@ -1,85 +0,0 @@
|
|||||||
# ~/.config/starship.toml
|
|
||||||
|
|
||||||
add_newline = false
|
|
||||||
format = """
|
|
||||||
$username$directory$git_branch$git_status$nodejs$rust$java$python$time$character
|
|
||||||
"""
|
|
||||||
|
|
||||||
# PROMPT CHARACTER
|
|
||||||
[character]
|
|
||||||
success_symbol = "[ ~>](bold #b8bb26)"
|
|
||||||
error_symbol = "[ ~>](bold #fb4934)"
|
|
||||||
vicmd_symbol = "[ ~<](bold #83a598)"
|
|
||||||
|
|
||||||
# DIRECTORY
|
|
||||||
[directory]
|
|
||||||
style = "bold #83a598"
|
|
||||||
format = "[$path]($style) "
|
|
||||||
|
|
||||||
# GIT BRANCH
|
|
||||||
[git_branch]
|
|
||||||
symbol = " "
|
|
||||||
style = "bold #fe8019"
|
|
||||||
format = "[$symbol$branch]($style) "
|
|
||||||
|
|
||||||
# GIT STATUS
|
|
||||||
[git_status]
|
|
||||||
style = "#fabd2f"
|
|
||||||
format = '([$all_status]($style) )'
|
|
||||||
ahead = "⇡${count}"
|
|
||||||
behind = "⇣${count}"
|
|
||||||
diverged = "⇕⇡${ahead_count}⇣${behind_count}"
|
|
||||||
staged = "+${count}"
|
|
||||||
conflicted = "✖${count}"
|
|
||||||
deleted = "-${count}"
|
|
||||||
modified = "~${count}"
|
|
||||||
untracked = "?${count}"
|
|
||||||
stashed = "💾${count}"
|
|
||||||
|
|
||||||
# NODEJS
|
|
||||||
[nodejs]
|
|
||||||
symbol = " "
|
|
||||||
style = "#b8bb26"
|
|
||||||
format = "[$symbol($version)]($style) "
|
|
||||||
|
|
||||||
# RUST
|
|
||||||
[rust]
|
|
||||||
symbol = " "
|
|
||||||
style = "#d3869b"
|
|
||||||
format = "[$symbol($version)]($style) "
|
|
||||||
|
|
||||||
# JAVA
|
|
||||||
[java]
|
|
||||||
symbol = " "
|
|
||||||
style = "#fabd2f"
|
|
||||||
format = "[$symbol($version)]($style) "
|
|
||||||
|
|
||||||
# PYTHON
|
|
||||||
[python]
|
|
||||||
symbol = " "
|
|
||||||
style = "#8ec07c"
|
|
||||||
format = "[$symbol$virtualenv]($style) "
|
|
||||||
|
|
||||||
# TIME (24hr)
|
|
||||||
[time]
|
|
||||||
disabled = false
|
|
||||||
format = "[$time]($style) "
|
|
||||||
style = "#928374"
|
|
||||||
time_format = "%H:%M"
|
|
||||||
|
|
||||||
# CLEANUP
|
|
||||||
[aws]
|
|
||||||
disabled = true
|
|
||||||
[gcloud]
|
|
||||||
disabled = true
|
|
||||||
[azure]
|
|
||||||
disabled = true
|
|
||||||
[helm]
|
|
||||||
disabled = true
|
|
||||||
[kubernetes]
|
|
||||||
disabled = true
|
|
||||||
|
|
||||||
[username]
|
|
||||||
show_always = true
|
|
||||||
style_user = "bold #d3869b"
|
|
||||||
format = "[$user]($style) "
|
|
@ -1,6 +1,6 @@
|
|||||||
##### Enable true colors #####
|
##### Enable true colors #####
|
||||||
set -g default-terminal "tmux-256color"
|
set -g default-terminal "tmux-256color"
|
||||||
set -ga terminal-overrides ",*256col*:Tc"
|
set -ga terminal-overrides ",*256col*:RGB"
|
||||||
|
|
||||||
##### Leader Key #####
|
##### Leader Key #####
|
||||||
unbind C-b
|
unbind C-b
|
||||||
@ -21,12 +21,11 @@ set-option -g status on
|
|||||||
set-option -g status-position top
|
set-option -g status-position top
|
||||||
set -g status-style 'bg=#3C3836,fg=#DDC7A1'
|
set -g status-style 'bg=#3C3836,fg=#DDC7A1'
|
||||||
set-option -g status-left '#[fg=colour233,bg=#89B482] #S '
|
set-option -g status-left '#[fg=colour233,bg=#89B482] #S '
|
||||||
set -g status-left-length 50
|
set-option -g status-right '#[fg=colour256,bg=colour240,bold] %H:%M #[fg=#45403D,bg=colour214,bold] #h '
|
||||||
set-option -g status-right '#[fg=colour233,bg=colour241,bold] %H:%M #[fg=#45403D,bg=#FE8019,bold] #h'
|
set -g status-justify centre
|
||||||
set -g status-right-length 50
|
|
||||||
|
|
||||||
set -g window-status-format " #I:#W "
|
set -g window-status-format " #I:#W "
|
||||||
set -g window-status-current-format "#[fg=#3C3836, bg=#D8A657, italics, bold] #I:#W "
|
set -g window-status-current-format "#[fg=#3C3836, bg=colour179, italics, bold] #I:#W "
|
||||||
|
|
||||||
##### Pane Borders #####
|
##### Pane Borders #####
|
||||||
set -g pane-border-style fg=#DDC7A1
|
set -g pane-border-style fg=#DDC7A1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user