squid/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: squid:45d88af3c666a4dcb31f5f324321fd14b2ad23f4
Branches Tags
squid:main
..
compare: squid:2c1cb966723b8aac23297e8aee85c2a94722dd3b
Branches Tags
squid:main

No commits in common. "45d88af3c666a4dcb31f5f324321fd14b2ad23f4" and "2c1cb966723b8aac23297e8aee85c2a94722dd3b" have entirely different histories.
45d88af3c6 ... 2c1cb96672

16 changed files with 74 additions and 219 deletions
Show Stats Expand all files Collapse all files

3
nvim/.luarc.json
View File

@ -2,8 +2,5 @@
"diagnostics.globals": [
"vim",
"require"
],
"diagnostics.disable": [
"different-requires"
]
}

13
nvim/init.lua
View File

@ -1,14 +1,5 @@
require("config.vimrc")
require("config.lazy")
require("lazy").setup({
spec = {
{ import = "plugins" },
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "habamax" } },
-- automatically check for plugin updates
checker = { enabled = true },
})
---@diagnostic disable-next-line: different-requires
require("lazy").setup("plugins")

9
nvim/lazy-lock.json
View File

@ -1,12 +1,10 @@
{
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
"blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
"marks.nvim": { "branch": "master", "commit": "bb25ae3f65f504379e3d08c8a02560b76eaf91e8" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" },
"mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
"mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
@ -16,13 +14,10 @@
"nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
"nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
"nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" },
"nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
"nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" },
"nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" },
"nvim-web-devicons": { "branch": "master", "commit": "2c2b4eafce6cdd0cb165036faa17396eff18f847" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
"venv-selector.nvim": { "branch": "regexp", "commit": "c677caa1030808a9f90092e522de7cc20c1390dd" },
"window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }
"venv-selector.nvim": { "branch": "regexp", "commit": "c677caa1030808a9f90092e522de7cc20c1390dd" }
}

12
nvim/lua/config/lazy.lua
View File

@ -21,3 +21,15 @@ vim.opt.rtp:prepend(lazypath)
vim.g.mapleader = " "
vim.g.maplocalleader = "\\"
-- Setup lazy.nvim
require("lazy").setup({
spec = {
{ import = "plugins" },
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "habamax" } },
-- automatically check for plugin updates
checker = { enabled = true },
})

5
nvim/lua/config/vimrc.lua
View File

@ -7,10 +7,7 @@ vim.keymap.set("n", "K", "5k")
vim.keymap.set("n", "//", ":noh<CR>")
vim.keymap.set("n", "<Leader>w", ":w<CR>")
vim.keymap.set("n", "<Leader>q", ":q<CR>")
vim.keymap.set("n", "<C-j>", "<C-w>j")
vim.keymap.set("n", "<C-k>", "<C-w>k")
vim.keymap.set("n", "<C-h>", "<C-w>h")
vim.keymap.set("n", "<C-l>", "<C-w>l")
vim.keymap.set("n", "<Leader>t", ":tabnew<CR>")
vim.keymap.set("v", "J", "5j")
vim.keymap.set("v", "K", "5k")

11
nvim/lua/plugins/bufferline.lua
View File

@ -1,11 +0,0 @@
local function setup()
vim.opt.termguicolors = true
require("bufferline").setup({})
end
return {
"akinsho/bufferline.nvim",
version = "*",
dependencies = "nvim-tree/nvim-web-devicons",
config = setup,
}

9
nvim/lua/plugins/lsp.lua
View File

@ -3,14 +3,9 @@ local function mason_setup()
automatic_enable = true,
ensure_installed = {
"clangd",
"eslint",
"gradle_ls",
"html",
"kotlin_language_server",
"lua_ls",
"pyright",
"rust_analyzer",
"tailwindcss",
"ts_ls",
},
})
@ -19,13 +14,9 @@ end
local function nvim_lsp_setup()
vim.lsp.enable("clangd")
vim.lsp.enable("dartls")
vim.lsp.enable("gradle_ls")
vim.lsp.enable("html")
vim.lsp.enable("kotlin_language_server")
vim.lsp.enable("lua_ls")
vim.lsp.enable("pyright")
vim.lsp.enable("rust_analyzer")
vim.lsp.enable("tailwindcss")
vim.lsp.enable("ts_ls")
vim.keymap.set("n", "<Leader><Enter>", vim.lsp.buf.hover, {})

10
nvim/lua/plugins/lualine.lua
View File

@ -151,11 +151,11 @@ local function setup()
-- Insert mid section. You can make any number of sections in neovim :)
-- for lualine it's any number greater then 2
-- ins_left {
-- function()
-- return '%='
-- end,
-- }
ins_left {
function()
return '%='
end,
}
ins_left {
-- Lsp server name .

5
nvim/lua/plugins/marks.lua
View File

@ -1,5 +0,0 @@
return {
"chentoast/marks.nvim",
event = "VeryLazy",
opts = {},
}

47
nvim/lua/plugins/neotree.lua
View File

@ -1,38 +1,19 @@
local function setup()
require("neo-tree").setup({
close_if_last_window = true,
source_selector = {
winbar = false,
statusline = false,
},
window = {
position = "left",
width = 50,
},
filesystem = {
filtered_items = {
hide_dotfiles = false,
hide_by_name = {
".git",
"node_modules",
},
},
},
})
vim.keymap.set("n", "<Leader>j", ":Neotree filesystem reveal left<CR>")
-- vim.keymap.set("n", "<Leader>k", ":Neotree buffers reveal left<CR>")
-- vim.keymap.set("n", "<Leader>l", ":Neotree git_status reveal left<CR>")
vim.keymap.set("n", "<Leader>j", ":Neotree filesystem reveal left<CR>")
vim.keymap.set("n", "<Leader>b", ":Neotree buffers toggle bottom<CR>")
vim.keymap.set("n", "<Leader>J", ":Neotree filesystem close left<CR>")
vim.keymap.set("n", "<Leader>q", ":Neotree filesystem close left<CR>:q<CR>")
end
return {
"nvim-neo-tree/neo-tree.nvim",
branch = "v3.x",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
},
lazy = false,
config = setup,
"nvim-neo-tree/neo-tree.nvim",
branch = "v3.x",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
},
lazy = false,
config = setup,
}

1
nvim/lua/plugins/none-ls.lua
View File

@ -6,6 +6,7 @@ local function setup()
null_ls.builtins.formatting.prettier,
null_ls.builtins.formatting.black,
null_ls.builtins.formatting.isort,
null_ls.builtins.diagnostics.eslint,
null_ls.builtins.completion.spell,
},
})

12
nvim/lua/plugins/notify.lua
View File

@ -1,12 +0,0 @@
local function setup()
local notify = require("notify")
notify.setup({
background_colour = "#282828",
})
vim.notify = notify
end
return {
"rcarriga/nvim-notify",
config = setup,
}

16
nvim/lua/plugins/toggleterm.lua
View File

@ -1,16 +0,0 @@
local function setup()
require("toggleterm").setup({})
vim.keymap.set("n", "<Leader>t", ":ToggleTerm<CR>")
vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
vim.keymap.set("t", "jk", "<C-\\><C-n>")
end
return {
"akinsho/toggleterm.nvim",
version = "*",
config = setup,
-- or
-- {'akinsho/toggleterm.nvim', version = "*", opts = {--[[ things you want to change go here]]}}
}

12
nvim/lua/plugins/window-picker.lua
View File

@ -1,12 +0,0 @@
local function setup()
require("window-picker").setup({
})
end
return {
"s1n7ax/nvim-window-picker",
name = "window-picker",
event = "VeryLazy",
version = "2.*",
config = setup,
}

8
vscode/keybindings.json
View File

@ -77,7 +77,7 @@
},
{
"key": "escape",
"command": "workbench.action.focusFirstEditorGroup",
"command": "workbench.action.toggleSidebarVisibility",
"when": "explorerViewletFocus"
},
// Terminal management
@ -86,7 +86,7 @@
"command": "workbench.action.terminal.toggleTerminal"
},
{
"key": "ctrl+shift+t",
"key": "ctrl+shift+n",
"command": "workbench.action.terminal.new",
"when": "terminalFocus"
},
@ -96,12 +96,12 @@
"when": "terminalFocus"
},
{
"key": "ctrl+tab",
"key": "ctrl+shift+j",
"command": "workbench.action.terminal.focusNext",
"when": "terminalFocus"
},
{
"key": "ctrl+shift+tab",
"key": "ctrl+shift+k",
"command": "workbench.action.terminal.focusPrevious",
"when": "terminalFocus"
},

120
vscode/settings.json
View File

@ -27,6 +27,7 @@
"vim.hlsearch": true,
"vim.easymotion": true,
"vim.useSystemClipboard": true,
"vim.smartRelativeLine": true,
"vim.statusBarColorControl": false,
"vim.ignorecase": true,
"vim.normalModeKeyBindings": [
@ -57,22 +58,6 @@
":noh"
]
},
{
"before": [
"u"
],
"commands": [
"undo"
]
},
{
"before": [
"<C-r>"
],
"commands": [
"redo"
]
},
{
"before": [
"<Leader>",
@ -205,7 +190,7 @@
"g"
],
"commands": [
"workbench.action.showAllSymbols"
"workbench.action.quickOpen"
]
},
{
@ -214,16 +199,7 @@
"f"
],
"commands": [
"workbench.action.quickOpen"
]
},
{
"before": [
"<Leader>",
"t"
],
"commands": [
"breadcrumbs.focus"
"workbench.files.action.showActiveFileInExplorer"
]
},
{
@ -235,6 +211,33 @@
"editor.action.showHover"
]
},
{
"before": [
"<Leader>",
"<Enter>"
],
"commands": [
"editor.action.revealDefinition"
]
},
{
"before": [
"<Tab>"
],
"after": [
">",
">"
]
},
{
"before": [
"<S-Tab>"
],
"after": [
"<",
"<"
]
}
],
"vim.insertModeKeyBindings": [
{
@ -245,67 +248,9 @@
"after": [
"<Esc>"
]
},
{
"before": [
"<C-j>"
],
"after": [
"<ESC>",
"j",
"a",
]
},
{
"before": [
"<C-k>"
],
"after": [
"<ESC>",
"k",
"a",
]
},
{
"before": [
"<C-h>"
],
"after": [
"<ESC>",
"h",
"a",
]
},
{
"before": [
"<C-l>"
],
"after": [
"<ESC>",
"l",
"a",
]
},
}
],
"vim.visualModeKeyBindings": [
{
"before": [
"J"
],
"after": [
"5",
"j"
]
},
{
"before": [
"K"
],
"after": [
"5",
"k"
]
},
{
"before": [
"<Tab>"
@ -331,4 +276,5 @@
"extension.vim_escape"
]
}
],
]
}