feat: some shit
This commit is contained in:
parent
3857fb86af
commit
d7f36e407c
@ -1,5 +1,6 @@
|
|||||||
set-option -g default-terminal "screen-256color"
|
set-option -g default-terminal "screen-256color"
|
||||||
set-option -ga terminal-overrides ",xterm-256color:Tc"
|
set-option -ga terminal-overrides ",xterm-256color:Tc"
|
||||||
|
set -g default-terminal "tmux-256color"
|
||||||
|
|
||||||
set-option -g focus-events on
|
set-option -g focus-events on
|
||||||
set-option -sg escape-time 10
|
set-option -sg escape-time 10
|
||||||
@ -30,7 +31,13 @@ bind -Tcopy-mode WheelDownPane send -N1 -X scroll-down
|
|||||||
set -g mode-keys vi
|
set -g mode-keys vi
|
||||||
|
|
||||||
# Enable mouse mode (tmux 2.1 and above)
|
# Enable mouse mode (tmux 2.1 and above)
|
||||||
set -g mouse off
|
bind-key M \
|
||||||
|
set-option -g mouse on \;\
|
||||||
|
display-message 'Mouse: ON'
|
||||||
|
# Toggle mouse off
|
||||||
|
bind-key m \
|
||||||
|
set-option -g mouse off \;\
|
||||||
|
display-message 'Mouse: OFF'
|
||||||
|
|
||||||
bind h select-pane -L
|
bind h select-pane -L
|
||||||
bind j select-pane -D
|
bind j select-pane -D
|
||||||
|
@ -84,6 +84,11 @@ if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
|
|||||||
export MOZ_ENABLE_WAYLAND=1
|
export MOZ_ENABLE_WAYLAND=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# If podman is installed load the autocompletion
|
||||||
|
if type podman &> /dev/null; then
|
||||||
|
source <(podman completion zsh)
|
||||||
|
fi
|
||||||
|
|
||||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@ require("configs.telescope")
|
|||||||
require("configs.tree")
|
require("configs.tree")
|
||||||
require("configs.treesitter")
|
require("configs.treesitter")
|
||||||
require("configs.autocomplete")
|
require("configs.autocomplete")
|
||||||
|
require("configs.neotest")
|
||||||
require("configs.snippets")
|
require("configs.snippets")
|
||||||
|
|
||||||
require("overlays")
|
require("overlays")
|
||||||
|
@ -3,7 +3,7 @@ local luasnip = require("luasnip")
|
|||||||
local lspkind = require("lspkind")
|
local lspkind = require("lspkind")
|
||||||
local cmp = require("cmp")
|
local cmp = require("cmp")
|
||||||
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
|
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
|
||||||
local tabnine = require("cmp_tabnine.config")
|
-- local tabnine = require("cmp_tabnine.config")
|
||||||
|
|
||||||
local source_mapping = {
|
local source_mapping = {
|
||||||
buffer = "[Buffer]",
|
buffer = "[Buffer]",
|
||||||
@ -13,18 +13,18 @@ local source_mapping = {
|
|||||||
path = "[Path]",
|
path = "[Path]",
|
||||||
}
|
}
|
||||||
|
|
||||||
tabnine:setup({
|
-- tabnine:setup({
|
||||||
max_lines = 1000,
|
-- max_lines = 1000,
|
||||||
max_num_results = 20,
|
-- max_num_results = 20,
|
||||||
sort = true,
|
-- sort = true,
|
||||||
run_on_every_keystroke = true,
|
-- run_on_every_keystroke = true,
|
||||||
snippet_placeholder = "..",
|
-- snippet_placeholder = "..",
|
||||||
ignored_file_types = { -- default is not to ignore
|
-- ignored_file_types = { -- default is not to ignore
|
||||||
-- uncomment to ignore in lua:
|
-- -- uncomment to ignore in lua:
|
||||||
-- lua = true
|
-- -- lua = true
|
||||||
},
|
-- },
|
||||||
show_prediction_strength = false,
|
-- show_prediction_strength = false,
|
||||||
})
|
-- })
|
||||||
|
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
window = {
|
window = {
|
||||||
@ -79,7 +79,7 @@ cmp.setup({
|
|||||||
sources = {
|
sources = {
|
||||||
{ name = "nvim_lua" },
|
{ name = "nvim_lua" },
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
{ name = "cmp_tabnine", max_item_count = 3 },
|
-- { name = "cmp_tabnine", max_item_count = 3 },
|
||||||
{ name = "luasnip" },
|
{ name = "luasnip" },
|
||||||
{ name = "path" },
|
{ name = "path" },
|
||||||
{ name = "buffer", max_item_count = 3 },
|
{ name = "buffer", max_item_count = 3 },
|
||||||
|
@ -6,7 +6,7 @@ require("null-ls").setup({
|
|||||||
sources = {
|
sources = {
|
||||||
require("null-ls").builtins.formatting.stylua,
|
require("null-ls").builtins.formatting.stylua,
|
||||||
require("null-ls").builtins.diagnostics.eslint,
|
require("null-ls").builtins.diagnostics.eslint,
|
||||||
require("null-ls").builtins.completion.spell,
|
-- require("null-ls").builtins.completion.spell,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -134,20 +134,45 @@ lsp.intelephense.setup({
|
|||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
})
|
})
|
||||||
|
|
||||||
lsp.cssls.setup({
|
lsp.cssls.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
})
|
})
|
||||||
|
|
||||||
lsp.zls.setup({
|
lsp.zls.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
})
|
})
|
||||||
|
|
||||||
lsp.bashls.setup({
|
lsp.bashls.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
filetypes = { "sh", "bash" },
|
filetypes = { "sh", "bash" },
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
lsp.rust_analyzer.setup({
|
||||||
|
on_attach = on_attach,
|
||||||
|
settings = {
|
||||||
|
["rust-analyzer"] = {
|
||||||
|
imports = {
|
||||||
|
granularity = {
|
||||||
|
group = "module",
|
||||||
|
},
|
||||||
|
prefix = "self",
|
||||||
|
},
|
||||||
|
cargo = {
|
||||||
|
buildScripts = {
|
||||||
|
enable = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
procMacro = {
|
||||||
|
enable = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
-- lsp.remark_ls.setup {
|
-- lsp.remark_ls.setup {
|
||||||
-- filetypes = { "markdown" },
|
-- filetypes = { "markdown" },
|
||||||
-- on_attach = on_attach
|
-- on_attach = on_attach
|
||||||
|
5
configs/nvim/lua/configs/neotest.lua
Normal file
5
configs/nvim/lua/configs/neotest.lua
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
require("neotest").setup({
|
||||||
|
adapters = {
|
||||||
|
require("neotest-vitest")({}),
|
||||||
|
},
|
||||||
|
})
|
@ -43,23 +43,33 @@ ls.add_snippets("all", {
|
|||||||
|
|
||||||
ls.add_snippets("svelte", {
|
ls.add_snippets("svelte", {
|
||||||
s("slt", {
|
s("slt", {
|
||||||
t('<script lang="ts">', "\t"),
|
t({ '<script lang="ts">', "" }),
|
||||||
i(0),
|
i(0),
|
||||||
t("</script>"),
|
t({ "", "</script>" }),
|
||||||
}),
|
}),
|
||||||
s("sc", {
|
s("sc", {
|
||||||
t('<script context="module" lang="ts">', "\t"),
|
t({ '<script context="module" lang="ts">', "" }),
|
||||||
i(0),
|
i(0),
|
||||||
t("</script>"),
|
t({ "", "</script>" }),
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
ls.add_snippets("typescript", {
|
ls.add_snippets("typescript", {
|
||||||
s("sget", {
|
s("sget", {
|
||||||
t("export async function get({"),
|
t('export const GET: import("./$types").RequestHandler = async function get({'),
|
||||||
i(1, "params"),
|
i(1, "params"),
|
||||||
t("}) {"),
|
t("}) {"),
|
||||||
i(2),
|
i(2),
|
||||||
t("}"),
|
t("}"),
|
||||||
}),
|
}),
|
||||||
|
s("spost", {
|
||||||
|
t('export const POST: import("./$types").RequestHandler = async function get({'),
|
||||||
|
i(1, "params"),
|
||||||
|
t("}) {"),
|
||||||
|
i(2),
|
||||||
|
t("}"),
|
||||||
|
}),
|
||||||
|
s("ssess", {
|
||||||
|
t({ "const {userId} = locals.session.data", "if(!userId) throw redirect(307, '/login')" }),
|
||||||
|
}),
|
||||||
})
|
})
|
||||||
|
@ -1,63 +1,60 @@
|
|||||||
local telescope = require("telescope")
|
local telescope = require("telescope")
|
||||||
local actions = require("telescope.actions")
|
|
||||||
local trouble = require("trouble.providers.telescope")
|
local trouble = require("trouble.providers.telescope")
|
||||||
|
|
||||||
telescope.setup({
|
telescope.setup({
|
||||||
defaults = {},
|
defaults = {},
|
||||||
})
|
})
|
||||||
local default = {
|
local default = {
|
||||||
defaults = {
|
defaults = {
|
||||||
vimgrep_arguments = {
|
vimgrep_arguments = {
|
||||||
"rg",
|
"rg",
|
||||||
"--color=never",
|
"--color=never",
|
||||||
"--no-heading",
|
"--no-heading",
|
||||||
"--with-filename",
|
"--with-filename",
|
||||||
"--line-number",
|
"--line-number",
|
||||||
"--column",
|
"--column",
|
||||||
"--smart-case",
|
"--smart-case",
|
||||||
"--ignore-file",
|
"--ignore-file",
|
||||||
"workerMain.js",
|
"workerMain.js",
|
||||||
},
|
},
|
||||||
prompt_prefix = " ",
|
prompt_prefix = " ",
|
||||||
selection_caret = " ",
|
selection_caret = " ",
|
||||||
entry_prefix = " ",
|
entry_prefix = " ",
|
||||||
initial_mode = "insert",
|
initial_mode = "insert",
|
||||||
selection_strategy = "reset",
|
selection_strategy = "reset",
|
||||||
sorting_strategy = "ascending",
|
sorting_strategy = "ascending",
|
||||||
layout_strategy = "horizontal",
|
layout_strategy = "horizontal",
|
||||||
layout_config = {
|
layout_config = {
|
||||||
horizontal = {
|
horizontal = {
|
||||||
prompt_position = "top",
|
prompt_position = "top",
|
||||||
preview_width = 0.55,
|
preview_width = 0.55,
|
||||||
results_width = 0.8,
|
results_width = 0.8,
|
||||||
},
|
},
|
||||||
vertical = {
|
vertical = {
|
||||||
mirror = false,
|
mirror = false,
|
||||||
},
|
},
|
||||||
width = 0.87,
|
width = 0.87,
|
||||||
height = 0.80,
|
height = 0.80,
|
||||||
preview_cutoff = 120,
|
preview_cutoff = 120,
|
||||||
},
|
},
|
||||||
file_sorter = require("telescope.sorters").get_fuzzy_file,
|
file_sorter = require("telescope.sorters").get_fuzzy_file,
|
||||||
file_ignore_patterns = { "node_modules" },
|
file_ignore_patterns = { "node_modules" },
|
||||||
generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter,
|
generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter,
|
||||||
path_display = { "truncate" },
|
path_display = { "truncate" },
|
||||||
winblend = 0,
|
winblend = 0,
|
||||||
border = {},
|
border = {},
|
||||||
mappings = {
|
mappings = {
|
||||||
i = { ["<c-t>"] = trouble.open_with_trouble },
|
i = { ["<c-t>"] = trouble.open_with_trouble },
|
||||||
n = { ["<c-t>"] = trouble.open_with_trouble },
|
n = { ["<c-t>"] = trouble.open_with_trouble },
|
||||||
},
|
},
|
||||||
borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
|
borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
|
||||||
color_devicons = true,
|
color_devicons = true,
|
||||||
use_less = true,
|
use_less = true,
|
||||||
set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil,
|
set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil,
|
||||||
file_previewer = require("telescope.previewers").vim_buffer_cat.new,
|
file_previewer = require("telescope.previewers").vim_buffer_cat.new,
|
||||||
grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new,
|
grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new,
|
||||||
qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new,
|
qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new,
|
||||||
-- Developer configurations: Not meant for general override
|
},
|
||||||
buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
telescope.setup(default)
|
telescope.setup(default)
|
||||||
|
@ -1,12 +1,16 @@
|
|||||||
local map = vim.api.nvim_set_keymap
|
-- local map = vim.api.nvim_set_keymap
|
||||||
|
local map = vim.keymap.set
|
||||||
local g = vim.g
|
local g = vim.g
|
||||||
|
|
||||||
|
local saga = require("lspsaga")
|
||||||
|
saga.init_lsp_saga()
|
||||||
|
|
||||||
local options = { noremap = true, silent = true }
|
local options = { noremap = true, silent = true }
|
||||||
local remap = { noremap = false }
|
local remap = { noremap = false }
|
||||||
|
|
||||||
g.mapleader = " "
|
g.mapleader = " "
|
||||||
|
|
||||||
map("n", "<C-o>", ":Telescope git_files<CR>", options)
|
map("n", "<C-o>", ":Telescope find_files<CR>", options)
|
||||||
map("n", "<C-f>", ":lua require'telescope.builtin'.live_grep{ cwd = vim.fn.getcwd() }<CR>", options)
|
map("n", "<C-f>", ":lua require'telescope.builtin'.live_grep{ cwd = vim.fn.getcwd() }<CR>", options)
|
||||||
map("n", "<C-p>", ":Telescope command_center<CR>", options)
|
map("n", "<C-p>", ":Telescope command_center<CR>", options)
|
||||||
map("n", "<Leader><Leader>", "za", remap)
|
map("n", "<Leader><Leader>", "za", remap)
|
||||||
@ -16,17 +20,24 @@ map("n", "<Leader>n", ":lua vim.diagnostic.goto_next()<CR>", options)
|
|||||||
map("n", "<Leader>p", ":lua vim.diagnostic.goto_prev()<CR>", options)
|
map("n", "<Leader>p", ":lua vim.diagnostic.goto_prev()<CR>", options)
|
||||||
map("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", options)
|
map("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", options)
|
||||||
map("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", options)
|
map("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", options)
|
||||||
map("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", options)
|
|
||||||
map("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", options)
|
map("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", options)
|
||||||
map("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", options)
|
|
||||||
map("n", "<Leader>e", "<cmd>lua vim.diagnostic.open_float()<CR>", options)
|
map("n", "K", "<cmd>Lspsaga hover_doc<CR>", { silent = true })
|
||||||
map("n", "<Leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", options)
|
map("n", "<leader>o", "<cmd>LSoutlineToggle<CR>", { silent = true })
|
||||||
map("n", "<Leader>c", "<cmd>lua vim.lsp.buf.code_action()<CR>", options)
|
map("n", "<leader>e", "<cmd>Lspsaga show_cursor_diagnostics<CR>", { silent = true })
|
||||||
|
map("n", "<Leader>rn", "<cmd>Lspsaga rename<CR>", options)
|
||||||
|
map({ "n", "v" }, "<leader>c", "<cmd>Lspsaga code_action<CR>", { silent = true })
|
||||||
|
map({ "n", "v" }, "gr", "Lspsaga lsp_finder<CR>", options)
|
||||||
|
|
||||||
map("n", "<leader>t", ":TroubleToggle<CR>", remap)
|
map("n", "<leader>t", ":TroubleToggle<CR>", remap)
|
||||||
|
|
||||||
-- DAP Functionality
|
-- DAP Functionality
|
||||||
map("n", "<Leader>b", ":lua require('dap').toggle_breakpoint()", options)
|
map("n", "<Leader>b", ":lua require('dap').toggle_breakpoint()", options)
|
||||||
|
|
||||||
|
-- Test Functionality
|
||||||
|
map("n", "tt", ":lua require('neotest').run.run()<CR>", options)
|
||||||
|
map("n", "to", ":lua require('neotest').summary.open()<CR>", options)
|
||||||
|
|
||||||
-- Navigate Buffers
|
-- Navigate Buffers
|
||||||
map("n", "<C-h>", "<C-w>h", options)
|
map("n", "<C-h>", "<C-w>h", options)
|
||||||
map("n", "<C-j>", "<C-w>j", options)
|
map("n", "<C-j>", "<C-w>j", options)
|
||||||
@ -39,7 +50,7 @@ map("n", "<Leader>3", "3gt", options)
|
|||||||
map("n", "<Leader>4", "4gt", options)
|
map("n", "<Leader>4", "4gt", options)
|
||||||
map("n", "<Leader>0", ":tablast<CR>", options)
|
map("n", "<Leader>0", ":tablast<CR>", options)
|
||||||
|
|
||||||
map("n", "<C-t>", ":lua require('harpoon.mark').add_file()<CR>", options)
|
map("n", "m", ":lua require('harpoon.mark').add_file()<CR>", options)
|
||||||
-- Navigate Files
|
-- Navigate Files
|
||||||
map("n", "<S-t>", ":Telescope harpoon marks<CR>", options)
|
map("n", "<S-t>", ":Telescope harpoon marks<CR>", options)
|
||||||
|
|
||||||
|
@ -50,13 +50,8 @@ return packer.startup(function(use)
|
|||||||
require("nvim_comment").setup()
|
require("nvim_comment").setup()
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
use({
|
|
||||||
"windwp/nvim-autopairs",
|
|
||||||
config = function()
|
|
||||||
require("nvim-autopairs").setup()
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
use("gfeiyou/command-center.nvim")
|
use("gfeiyou/command-center.nvim")
|
||||||
|
use("glepnir/lspsaga.nvim")
|
||||||
|
|
||||||
-- Code Navigation
|
-- Code Navigation
|
||||||
use("junegunn/fzf")
|
use("junegunn/fzf")
|
||||||
@ -84,8 +79,12 @@ return packer.startup(function(use)
|
|||||||
use("neovim/nvim-lspconfig")
|
use("neovim/nvim-lspconfig")
|
||||||
use("hrsh7th/nvim-cmp")
|
use("hrsh7th/nvim-cmp")
|
||||||
use("onsails/lspkind.nvim")
|
use("onsails/lspkind.nvim")
|
||||||
use({ "tzachar/cmp-tabnine", run = "./install.sh", requires = "hrsh7th/nvim-cmp" })
|
use({
|
||||||
-- use({ "hrsh7th/cmp-copilot", requires = "github/copilot.vim" })
|
"windwp/nvim-autopairs",
|
||||||
|
config = function()
|
||||||
|
require("nvim-autopairs").setup()
|
||||||
|
end,
|
||||||
|
})
|
||||||
use("hrsh7th/cmp-nvim-lsp")
|
use("hrsh7th/cmp-nvim-lsp")
|
||||||
use("hrsh7th/cmp-path")
|
use("hrsh7th/cmp-path")
|
||||||
use("hrsh7th/cmp-calc")
|
use("hrsh7th/cmp-calc")
|
||||||
@ -125,6 +124,8 @@ return packer.startup(function(use)
|
|||||||
use({
|
use({
|
||||||
"nvim-neotest/neotest",
|
"nvim-neotest/neotest",
|
||||||
requires = {
|
requires = {
|
||||||
|
"haydenmeade/neotest-jest",
|
||||||
|
"KaiSpencer/neotest-vitest",
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
"antoinemadec/FixCursorHold.nvim",
|
"antoinemadec/FixCursorHold.nvim",
|
||||||
|
@ -4,6 +4,9 @@ function conf(){
|
|||||||
|
|
||||||
if [ "$1" = "u" ]; then
|
if [ "$1" = "u" ]; then
|
||||||
source ~/.zshrc
|
source ~/.zshrc
|
||||||
|
elif [ "$1" = "ssh" ]; then
|
||||||
|
cd $HOME/.ssh/
|
||||||
|
nvim config
|
||||||
else
|
else
|
||||||
cd ~/.dotfiles/
|
cd ~/.dotfiles/
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user