Compare commits
No commits in common. "df4a38e3c16d14a168ce58312c13cb5e2eca9756" and "6926ff56e98b09e50269e23031b5ff1b2fed3e15" have entirely different histories.
df4a38e3c1
...
6926ff56e9
|
|
@ -1,9 +1,3 @@
|
||||||
# dotfiles
|
# dotfiles
|
||||||
|
|
||||||
Dotfiles and default setup
|
Dotfiles and default setup
|
||||||
|
|
||||||
clone the repo cd into it and run
|
|
||||||
|
|
||||||
```
|
|
||||||
stow --target=$HOME --verbose=2 */
|
|
||||||
```
|
|
||||||
|
|
@ -8,7 +8,6 @@ alias ls='eza'
|
||||||
alias ll='eza -bgla'
|
alias ll='eza -bgla'
|
||||||
alias la='eza -bgla'
|
alias la='eza -bgla'
|
||||||
alias docker-compose-update 'docker compose down && docker compose pull && docker compose up -d'
|
alias docker-compose-update 'docker compose down && docker compose pull && docker compose up -d'
|
||||||
alias vim='nvim'
|
|
||||||
#alias clear='command clear; task limit:5 next; echo ""; echo ""'
|
#alias clear='command clear; task limit:5 next; echo ""; echo ""'
|
||||||
|
|
||||||
function seconds
|
function seconds
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
require("joe.core")
|
|
||||||
require("joe.lazy")
|
|
||||||
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
{
|
|
||||||
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
|
|
||||||
"LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
|
|
||||||
"alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
|
|
||||||
"bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" },
|
|
||||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
|
||||||
"conform.nvim": { "branch": "master", "commit": "bf109f061fc3cd75394b7823923187ae045cbf22" },
|
|
||||||
"dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
|
|
||||||
"friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
|
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" },
|
|
||||||
"lazy.nvim": { "branch": "main", "commit": "3132d7d27d56d6bb4bdd0a09623d162b3cf1c588" },
|
|
||||||
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
|
|
||||||
"lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" },
|
|
||||||
"monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" },
|
|
||||||
"nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" },
|
|
||||||
"nvim-cmp": { "branch": "main", "commit": "630cdf7d547c4461ef6d7362c3794a08abfad4fb" },
|
|
||||||
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
|
|
||||||
"nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" },
|
|
||||||
"nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" },
|
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "6e7b41106e9b15a5b47d149378d53482c9d9c7a3" },
|
|
||||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" },
|
|
||||||
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
|
|
||||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
|
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" },
|
|
||||||
"plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
|
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
|
|
||||||
"telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
|
|
||||||
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
|
|
||||||
}
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
require("joe.core.keymaps")
|
|
||||||
require("joe.core.options")
|
|
||||||
|
|
||||||
-- automatically open nvim-tree. In file without focus, in dir with focus
|
|
||||||
local function open_nvim_tree(data)
|
|
||||||
-- buffer is a directory
|
|
||||||
local dir = string.find(data.file, "NvimTree")
|
|
||||||
|
|
||||||
print(vim.inspect(dir))
|
|
||||||
|
|
||||||
if dir then
|
|
||||||
-- open
|
|
||||||
require("nvim-tree.api").tree.open()
|
|
||||||
else
|
|
||||||
-- open the tree without focus
|
|
||||||
require("nvim-tree.api").tree.toggle({
|
|
||||||
focus = false,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
-- set leader key to space
|
|
||||||
vim.g.mapleader = " "
|
|
||||||
|
|
||||||
local keymap = vim.keymap -- for conciseness
|
|
||||||
|
|
||||||
---------------------
|
|
||||||
-- General Keymaps -------------------
|
|
||||||
|
|
||||||
-- use jk to exit insert mode
|
|
||||||
keymap.set("i", "jk", "<ESC>", { desc = "Exit insert mode with jk" })
|
|
||||||
|
|
||||||
-- delete single character without copying into register
|
|
||||||
keymap.set("n", "x", '"_x')
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
local opt = vim.opt -- for conciseness
|
|
||||||
|
|
||||||
-- line numbers
|
|
||||||
opt.relativenumber = true -- show relative line numbers
|
|
||||||
opt.number = true -- shows absolute line number on cursor line (when relative number is on)
|
|
||||||
|
|
||||||
-- tabs & indentation
|
|
||||||
opt.tabstop = 2 -- 2 spaces for tabs (prettier default)
|
|
||||||
opt.shiftwidth = 2 -- 2 spaces for indent width
|
|
||||||
opt.expandtab = true -- expand tab to spaces
|
|
||||||
opt.autoindent = true -- copy indent from current line when starting new one
|
|
||||||
|
|
||||||
-- line wrapping
|
|
||||||
--opt.wrap = false -- disable line wrapping
|
|
||||||
|
|
||||||
-- search settings
|
|
||||||
opt.ignorecase = true -- ignore case when searching
|
|
||||||
opt.smartcase = true -- if you include mixed case in your search, assumes you want case-sensitive
|
|
||||||
|
|
||||||
-- cursor line
|
|
||||||
opt.cursorline = true -- highlight the current cursor line
|
|
||||||
|
|
||||||
-- appearance
|
|
||||||
|
|
||||||
-- turn on termguicolors for nightfly colorscheme to work
|
|
||||||
-- (have to use iterm2 or any other true color terminal)
|
|
||||||
opt.termguicolors = true
|
|
||||||
opt.background = "dark" -- colorschemes that can be light or dark will be made dark
|
|
||||||
opt.signcolumn = "yes" -- show sign column so that text doesn't shift
|
|
||||||
|
|
||||||
-- backspace
|
|
||||||
opt.backspace = "indent,eol,start" -- allow backspace on indent, end of line or insert mode start position
|
|
||||||
|
|
||||||
-- clipboard
|
|
||||||
opt.clipboard:append("unnamedplus") -- use system clipboard as default register
|
|
||||||
|
|
||||||
-- split windows
|
|
||||||
opt.splitright = true -- split vertical window to the right
|
|
||||||
opt.splitbelow = true -- split horizontal window to the bottom
|
|
||||||
|
|
||||||
-- turn off swapfile
|
|
||||||
opt.swapfile = false
|
|
||||||
|
|
||||||
-- turn of mouse
|
|
||||||
opt.mouse=""
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
|
||||||
if not vim.loop.fs_stat(lazypath) then
|
|
||||||
vim.fn.system({
|
|
||||||
"git",
|
|
||||||
"clone",
|
|
||||||
"--filter=blob:none",
|
|
||||||
"https://github.com/folke/lazy.nvim.git",
|
|
||||||
"--branch=stable", -- latest stable release
|
|
||||||
lazypath,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
vim.opt.rtp:prepend(lazypath)
|
|
||||||
|
|
||||||
require("lazy").setup('joe.plugins')
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
return {
|
|
||||||
"goolord/alpha-nvim",
|
|
||||||
event = "VimEnter",
|
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
|
||||||
config = function()
|
|
||||||
local alpha = require("alpha")
|
|
||||||
local dashboard = require("alpha.themes.dashboard")
|
|
||||||
|
|
||||||
-- Set header
|
|
||||||
dashboard.section.header.val = {
|
|
||||||
" ",
|
|
||||||
" ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ",
|
|
||||||
" ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ",
|
|
||||||
" ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ",
|
|
||||||
" ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ",
|
|
||||||
" ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ",
|
|
||||||
" ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ",
|
|
||||||
" ",
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Set menu
|
|
||||||
dashboard.section.buttons.val = {
|
|
||||||
dashboard.button("e", " > New File", "<cmd>ene<CR>"),
|
|
||||||
dashboard.button("SPC ee", " > Toggle file explorer", "<cmd>NvimTreeToggle<CR>"),
|
|
||||||
dashboard.button("SPC ff", " > Find File", "<cmd>Telescope find_files<CR>"),
|
|
||||||
dashboard.button("SPC fs", " > Find Word", "<cmd>Telescope live_grep<CR>"),
|
|
||||||
dashboard.button("SPC wr", " > Restore Session For Current Directory", "<cmd>SessionRestore<CR>"),
|
|
||||||
dashboard.button("q", " > Quit NVIM", "<cmd>qa<CR>"),
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Send config to alpha
|
|
||||||
alpha.setup(dashboard.opts)
|
|
||||||
|
|
||||||
-- Disable folding on alpha buffer
|
|
||||||
vim.cmd([[autocmd FileType alpha setlocal nofoldenable]])
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
return {
|
|
||||||
"windwp/nvim-autopairs",
|
|
||||||
event = { "InsertEnter" },
|
|
||||||
dependencies = {
|
|
||||||
"hrsh7th/nvim-cmp",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
-- import nvim-autopairs
|
|
||||||
local autopairs = require("nvim-autopairs")
|
|
||||||
|
|
||||||
-- configure autopairs
|
|
||||||
autopairs.setup({
|
|
||||||
check_ts = true, -- enable treesitter
|
|
||||||
ts_config = {
|
|
||||||
lua = { "string" }, -- don't add pairs in lua string treesitter nodes
|
|
||||||
javascript = { "template_string" }, -- don't add pairs in javscript template_string treesitter nodes
|
|
||||||
java = false, -- don't check treesitter on java
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
-- import nvim-autopairs completion functionality
|
|
||||||
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
|
|
||||||
|
|
||||||
-- import nvim-cmp plugin (completions plugin)
|
|
||||||
local cmp = require("cmp")
|
|
||||||
|
|
||||||
-- make autopairs and completion work together
|
|
||||||
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
return {
|
|
||||||
"akinsho/bufferline.nvim",
|
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
|
||||||
version = "*",
|
|
||||||
opts = {
|
|
||||||
options = {
|
|
||||||
mode = "tabs",
|
|
||||||
separator_style = "slant",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
return {
|
|
||||||
"NvChad/nvim-colorizer.lua",
|
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
|
||||||
config = true,
|
|
||||||
}
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
return {
|
|
||||||
"tanvirtin/monokai.nvim",
|
|
||||||
priority = 1000,
|
|
||||||
config = function()
|
|
||||||
vim.cmd([[colorscheme monokai]])
|
|
||||||
-- vim.cmd([[colorscheme monokai_pro]])
|
|
||||||
-- vim.cmd([[colorscheme monokai_soda]])
|
|
||||||
-- vim.cmd([[colorscheme monokai_ristretto]])
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
||||||
--require('monokai').setup {}
|
|
||||||
--require('monokai').setup { palette = require('monokai').pro }
|
|
||||||
--require('monokai').setup { palette = require('monokai').soda }
|
|
||||||
--require('monokai').setup { palette = require('monokai').ristretto }
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
return {
|
|
||||||
"numToStr/Comment.nvim",
|
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
|
||||||
dependencies = {
|
|
||||||
"JoosepAlviste/nvim-ts-context-commentstring",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
-- import comment plugin safely
|
|
||||||
local comment = require("Comment")
|
|
||||||
|
|
||||||
local ts_context_commentstring = require("ts_context_commentstring.integrations.comment_nvim")
|
|
||||||
|
|
||||||
-- enable comment
|
|
||||||
comment.setup({
|
|
||||||
-- for commenting tsx and jsx files
|
|
||||||
pre_hook = ts_context_commentstring.create_pre_hook(),
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
return {
|
|
||||||
"stevearc/dressing.nvim",
|
|
||||||
event = "VeryLazy",
|
|
||||||
-- config = function()
|
|
||||||
-- local d = require("dressing")
|
|
||||||
-- end
|
|
||||||
}
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
return {
|
|
||||||
"stevearc/conform.nvim",
|
|
||||||
lazy = true,
|
|
||||||
event = { "BufReadPre", "BufNewFile" }, -- to disable, comment this out
|
|
||||||
config = function()
|
|
||||||
local conform = require("conform")
|
|
||||||
|
|
||||||
conform.setup({
|
|
||||||
formatters_by_ft = {
|
|
||||||
javascript = { "prettier" },
|
|
||||||
typescript = { "prettier" },
|
|
||||||
javascriptreact = { "prettier" },
|
|
||||||
typescriptreact = { "prettier" },
|
|
||||||
svelte = { "prettier" },
|
|
||||||
css = { "prettier" },
|
|
||||||
html = { "prettier" },
|
|
||||||
json = { "prettier" },
|
|
||||||
yaml = { "prettier" },
|
|
||||||
markdown = { "prettier" },
|
|
||||||
graphql = { "prettier" },
|
|
||||||
lua = { "stylua" },
|
|
||||||
python = { "isort", "black" },
|
|
||||||
},
|
|
||||||
format_on_save = {
|
|
||||||
lsp_fallback = true,
|
|
||||||
async = false,
|
|
||||||
timeout_ms = 1000,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.keymap.set({ "n", "v" }, "<leader>mp", function()
|
|
||||||
conform.format({
|
|
||||||
lsp_fallback = true,
|
|
||||||
async = false,
|
|
||||||
timeout_ms = 1000,
|
|
||||||
})
|
|
||||||
end, { desc = "Format file or range (in visual mode)" })
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
return {
|
|
||||||
"lewis6991/gitsigns.nvim",
|
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
|
||||||
config = true,
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
-- addons without configuration
|
|
||||||
return {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,56 +0,0 @@
|
||||||
return {
|
|
||||||
"hrsh7th/nvim-cmp",
|
|
||||||
event = "InsertEnter",
|
|
||||||
dependencies = {
|
|
||||||
"hrsh7th/cmp-buffer", -- source for text in buffer
|
|
||||||
"hrsh7th/cmp-path", -- source for file system paths
|
|
||||||
"L3MON4D3/LuaSnip", -- snippet engine
|
|
||||||
"saadparwaiz1/cmp_luasnip", -- for autocompletion
|
|
||||||
"rafamadriz/friendly-snippets", -- useful snippets
|
|
||||||
"onsails/lspkind.nvim", -- vs-code like pictograms
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
local cmp = require("cmp")
|
|
||||||
|
|
||||||
local luasnip = require("luasnip")
|
|
||||||
|
|
||||||
local lspkind = require("lspkind")
|
|
||||||
|
|
||||||
-- loads vscode style snippets from installed plugins (e.g. friendly-snippets)
|
|
||||||
require("luasnip.loaders.from_vscode").lazy_load()
|
|
||||||
|
|
||||||
cmp.setup({
|
|
||||||
completion = {
|
|
||||||
completeopt = "menu,menuone,preview,noselect",
|
|
||||||
},
|
|
||||||
snippet = { -- configure how nvim-cmp interacts with snippet engine
|
|
||||||
expand = function(args)
|
|
||||||
luasnip.lsp_expand(args.body)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
|
||||||
["<C-k>"] = cmp.mapping.select_prev_item(), -- previous suggestion
|
|
||||||
["<C-j>"] = cmp.mapping.select_next_item(), -- next suggestion
|
|
||||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
|
||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
|
||||||
["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions
|
|
||||||
["<C-e>"] = cmp.mapping.abort(), -- close completion window
|
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
|
||||||
}),
|
|
||||||
-- sources for autocompletion
|
|
||||||
sources = cmp.config.sources({
|
|
||||||
{ name = "nvim_lsp" },
|
|
||||||
{ name = "luasnip" }, -- snippets
|
|
||||||
{ name = "buffer" }, -- text within current buffer
|
|
||||||
{ name = "path" }, -- file system paths
|
|
||||||
}),
|
|
||||||
-- configure lspkind for vs-code like pictograms in completion menu
|
|
||||||
formatting = {
|
|
||||||
format = lspkind.cmp_format({
|
|
||||||
maxwidth = 50,
|
|
||||||
ellipsis_char = "...",
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
return {
|
|
||||||
"nvim-tree/nvim-tree.lua",
|
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
|
||||||
config = function ()
|
|
||||||
local nvimtree = require("nvim-tree")
|
|
||||||
|
|
||||||
-- recommended settings from nvim-tree documentation
|
|
||||||
vim.g.loaded_netrw = 1
|
|
||||||
vim.g.loaded_netrwPlugin = 1
|
|
||||||
|
|
||||||
-- change color for arrows in tree to light blue
|
|
||||||
vim.cmd([[ highlight NvimTreeFolderArrowClosed guifg=#3FC5FF ]])
|
|
||||||
vim.cmd([[ highlight NvimTreeFolderArrowOpen guifg=#3FC5FF ]])
|
|
||||||
|
|
||||||
-- configure nvim-tree
|
|
||||||
nvimtree.setup({
|
|
||||||
view = {
|
|
||||||
width = 35,
|
|
||||||
relativenumber = true,
|
|
||||||
},
|
|
||||||
-- change folder arrow icons
|
|
||||||
renderer = {
|
|
||||||
indent_markers = {
|
|
||||||
enable = true,
|
|
||||||
},
|
|
||||||
icons = {
|
|
||||||
glyphs = {
|
|
||||||
folder = {
|
|
||||||
arrow_closed = "", -- arrow when folder is closed
|
|
||||||
arrow_open = "", -- arrow when folder is open
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- disable window_picker for
|
|
||||||
-- explorer to work well with
|
|
||||||
-- window splits
|
|
||||||
actions = {
|
|
||||||
open_file = {
|
|
||||||
window_picker = {
|
|
||||||
enable = false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
filters = {
|
|
||||||
custom = { ".DS_Store" },
|
|
||||||
},
|
|
||||||
git = {
|
|
||||||
ignore = false,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- set keymaps
|
|
||||||
local keymap = vim.keymap -- for conciseness
|
|
||||||
|
|
||||||
keymap.set("n", "<leader>ee", "<cmd>NvimTreeToggle<CR>", { desc = "Toggle file explorer" }) -- toggle file explorer
|
|
||||||
keymap.set("n", "<leader>ef", "<cmd>NvimTreeFindFileToggle<CR>", { desc = "Toggle file explorer on current file" }) -- toggle file explorer on current file
|
|
||||||
keymap.set("n", "<leader>ec", "<cmd>NvimTreeCollapse<CR>", { desc = "Collapse file explorer" }) -- collapse file explorer
|
|
||||||
keymap.set("n", "<leader>er", "<cmd>NvimTreeRefresh<CR>", { desc = "Refresh file explorer" }) -- refresh file explorer
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,60 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"nvim-treesitter/nvim-treesitter",
|
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
|
||||||
build = ":TSUpdate",
|
|
||||||
dependencies = {
|
|
||||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
|
||||||
"windwp/nvim-ts-autotag",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
-- import nvim-treesitter plugin
|
|
||||||
local treesitter = require("nvim-treesitter.configs")
|
|
||||||
|
|
||||||
-- configure treesitter
|
|
||||||
treesitter.setup({ -- enable syntax highlighting
|
|
||||||
highlight = {
|
|
||||||
enable = true,
|
|
||||||
},
|
|
||||||
-- enable indentation
|
|
||||||
indent = { enable = true },
|
|
||||||
-- enable autotagging (w/ nvim-ts-autotag plugin)
|
|
||||||
autotag = {
|
|
||||||
enable = true,
|
|
||||||
},
|
|
||||||
-- ensure these language parsers are installed
|
|
||||||
ensure_installed = {
|
|
||||||
"json",
|
|
||||||
"javascript",
|
|
||||||
"typescript",
|
|
||||||
"tsx",
|
|
||||||
"yaml",
|
|
||||||
"html",
|
|
||||||
"css",
|
|
||||||
"markdown",
|
|
||||||
"markdown_inline",
|
|
||||||
"svelte",
|
|
||||||
"graphql",
|
|
||||||
"bash",
|
|
||||||
"lua",
|
|
||||||
"vim",
|
|
||||||
"dockerfile",
|
|
||||||
"gitignore",
|
|
||||||
"query",
|
|
||||||
},
|
|
||||||
incremental_selection = {
|
|
||||||
enable = true,
|
|
||||||
keymaps = {
|
|
||||||
init_selection = "<C-space>",
|
|
||||||
node_incremental = "<C-space>",
|
|
||||||
scope_incremental = false,
|
|
||||||
node_decremental = "<bs>",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- enable nvim-ts-context-commentstring plugin for commenting tsx and jsx
|
|
||||||
require('ts_context_commentstring').setup {}
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,71 +0,0 @@
|
||||||
return {
|
|
||||||
"nvim-lualine/lualine.nvim",
|
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
|
||||||
config = function()
|
|
||||||
local lualine = require("lualine")
|
|
||||||
local lazy_status = require("lazy.status") -- to configure lazy pending updates count
|
|
||||||
|
|
||||||
local colors = {
|
|
||||||
blue = "#65D1FF",
|
|
||||||
green = "#3EFFDC",
|
|
||||||
violet = "#FF61EF",
|
|
||||||
yellow = "#FFDA7B",
|
|
||||||
red = "#FF4A4A",
|
|
||||||
fg = "#c3ccdc",
|
|
||||||
bg = "#112638",
|
|
||||||
inactive_bg = "#2c3043",
|
|
||||||
}
|
|
||||||
|
|
||||||
local my_lualine_theme = {
|
|
||||||
normal = {
|
|
||||||
a = { bg = colors.blue, fg = colors.bg, gui = "bold" },
|
|
||||||
b = { bg = colors.bg, fg = colors.fg },
|
|
||||||
c = { bg = colors.bg, fg = colors.fg },
|
|
||||||
},
|
|
||||||
insert = {
|
|
||||||
a = { bg = colors.green, fg = colors.bg, gui = "bold" },
|
|
||||||
b = { bg = colors.bg, fg = colors.fg },
|
|
||||||
c = { bg = colors.bg, fg = colors.fg },
|
|
||||||
},
|
|
||||||
visual = {
|
|
||||||
a = { bg = colors.violet, fg = colors.bg, gui = "bold" },
|
|
||||||
b = { bg = colors.bg, fg = colors.fg },
|
|
||||||
c = { bg = colors.bg, fg = colors.fg },
|
|
||||||
},
|
|
||||||
command = {
|
|
||||||
a = { bg = colors.yellow, fg = colors.bg, gui = "bold" },
|
|
||||||
b = { bg = colors.bg, fg = colors.fg },
|
|
||||||
c = { bg = colors.bg, fg = colors.fg },
|
|
||||||
},
|
|
||||||
replace = {
|
|
||||||
a = { bg = colors.red, fg = colors.bg, gui = "bold" },
|
|
||||||
b = { bg = colors.bg, fg = colors.fg },
|
|
||||||
c = { bg = colors.bg, fg = colors.fg },
|
|
||||||
},
|
|
||||||
inactive = {
|
|
||||||
a = { bg = colors.inactive_bg, fg = colors.semilightgray, gui = "bold" },
|
|
||||||
b = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
|
||||||
c = { bg = colors.inactive_bg, fg = colors.semilightgray },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
-- configure lualine with modified theme
|
|
||||||
lualine.setup({
|
|
||||||
options = {
|
|
||||||
theme = my_lualine_theme,
|
|
||||||
},
|
|
||||||
sections = {
|
|
||||||
lualine_x = {
|
|
||||||
{
|
|
||||||
lazy_status.updates,
|
|
||||||
cond = lazy_status.has_updates,
|
|
||||||
color = { fg = "#ff9e64" },
|
|
||||||
},
|
|
||||||
{ "encoding" },
|
|
||||||
{ "fileformat" },
|
|
||||||
{ "filetype" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
return {
|
|
||||||
"kylechui/nvim-surround",
|
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
|
||||||
version = "*", -- Use for stability; omit to use `main` branch for the latest features
|
|
||||||
config = true,
|
|
||||||
}
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
return {
|
|
||||||
"nvim-telescope/telescope.nvim",
|
|
||||||
branch = "0.1.x",
|
|
||||||
dependencies = {
|
|
||||||
"nvim-lua/plenary.nvim",
|
|
||||||
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
|
|
||||||
"nvim-tree/nvim-web-devicons",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
local telescope = require("telescope")
|
|
||||||
local actions = require("telescope.actions")
|
|
||||||
|
|
||||||
telescope.setup({
|
|
||||||
defaults = {
|
|
||||||
path_display = { "truncate " },
|
|
||||||
mappings = {
|
|
||||||
i = {
|
|
||||||
["<C-k>"] = actions.move_selection_previous, -- move to prev result
|
|
||||||
["<C-j>"] = actions.move_selection_next, -- move to next result
|
|
||||||
["<C-q>"] = actions.send_selected_to_qflist + actions.open_qflist,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
telescope.load_extension("fzf")
|
|
||||||
|
|
||||||
-- set keymaps
|
|
||||||
local keymap = vim.keymap -- for conciseness
|
|
||||||
|
|
||||||
keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>", { desc = "Fuzzy find files in cwd" })
|
|
||||||
keymap.set("n", "<leader>fr", "<cmd>Telescope oldfiles<cr>", { desc = "Fuzzy find recent files" })
|
|
||||||
keymap.set("n", "<leader>fs", "<cmd>Telescope live_grep<cr>", { desc = "Find string in cwd" })
|
|
||||||
keymap.set("n", "<leader>fc", "<cmd>Telescope grep_string<cr>", { desc = "Find string under cursor in cwd" })
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
return {
|
|
||||||
"folke/which-key.nvim",
|
|
||||||
event = "VeryLazy",
|
|
||||||
init = function()
|
|
||||||
vim.o.timeout = true
|
|
||||||
vim.o.timeoutlen = 500
|
|
||||||
end,
|
|
||||||
opts = {
|
|
||||||
-- your configuration comes here
|
|
||||||
-- or leave it empty to use the default settings
|
|
||||||
-- refer to the configuration section below
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -3,10 +3,6 @@
|
||||||
set-option -g default-terminal "screen-256color"
|
set-option -g default-terminal "screen-256color"
|
||||||
set -g pane-border-status
|
set -g pane-border-status
|
||||||
|
|
||||||
# required for neovim
|
|
||||||
set-option -sg escape-time 10
|
|
||||||
set-option -g focus-events on
|
|
||||||
|
|
||||||
# reorder window numbers when a window is deleted
|
# reorder window numbers when a window is deleted
|
||||||
# [0 1 2] -- [delete 1] --> [0 1] instead of [0 2]
|
# [0 1 2] -- [delete 1] --> [0 1] instead of [0 2]
|
||||||
set-option -g renumber-windows on
|
set-option -g renumber-windows on
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue