Compare commits
30 Commits
76dc3678d0
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| a9c8716302 | |||
| 3ebebadc9f | |||
| 5773a89ab5 | |||
| 6473a0db0c | |||
| 82b1f6a192 | |||
| b9b5efebd0 | |||
| 170ce0f13d | |||
| 15ea96be2f | |||
| 4455e55762 | |||
| 8e131ade05 | |||
| 2f6ffacce3 | |||
| b9df0a4072 | |||
| f6ef92c771 | |||
| ffce03e4ef | |||
| 9b86e7fb7f | |||
| 26743308de | |||
| 8b953a8ffb | |||
| acded6c018 | |||
| f05a64f1eb | |||
| 678ab4af8b | |||
| 00ca1afcad | |||
| 963d10a58c | |||
| 346478017f | |||
| 4127ab9259 | |||
| 78dd207beb | |||
| 25ee38ab07 | |||
| 357a7ab1bb | |||
| 0aca32f1f1 | |||
| b3cfc0a0b8 | |||
| 31ef1b6103 |
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
zsh/.local/
|
||||||
6
.luarc.json
Normal file
6
.luarc.json
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"workspace.library": [
|
||||||
|
"/home/linuxbrew/.linuxbrew/Cellar/neovim/HEAD-c374d78_1/share/nvim/runtime",
|
||||||
|
"${3rd}/luv/library"
|
||||||
|
]
|
||||||
|
}
|
||||||
18
git/.config/git/config
Normal file
18
git/.config/git/config
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
[user]
|
||||||
|
name = vx-clutch
|
||||||
|
email = owestness@gmail.com
|
||||||
|
|
||||||
|
[core]
|
||||||
|
editor = nvim
|
||||||
|
excludesFile = ~/.gitignore
|
||||||
|
|
||||||
|
[pull]
|
||||||
|
rebase = true
|
||||||
|
|
||||||
|
[rebase]
|
||||||
|
autoStash = true
|
||||||
|
|
||||||
|
[push]
|
||||||
|
default = current
|
||||||
|
[credential]
|
||||||
|
helper = store
|
||||||
@@ -4,6 +4,8 @@ font pango:monospace 8
|
|||||||
exec --no-startup-id dex-autostart --autostart --environment i3
|
exec --no-startup-id dex-autostart --autostart --environment i3
|
||||||
exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
|
exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
|
||||||
exec --no-startup-id nm-applet
|
exec --no-startup-id nm-applet
|
||||||
|
exec_always --no-startup-id feh --bg-center $HOME/.config/vxclutch/background.jpg
|
||||||
|
exec_always --no-startup-id fastcompmgr
|
||||||
|
|
||||||
# Use pactl to adjust volume in PulseAudio.
|
# Use pactl to adjust volume in PulseAudio.
|
||||||
set $refresh_i3status killall -SIGUSR1 i3status
|
set $refresh_i3status killall -SIGUSR1 i3status
|
||||||
@@ -12,12 +14,15 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT
|
|||||||
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
|
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
|
||||||
bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
|
bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
|
||||||
|
|
||||||
|
bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set +10%
|
||||||
|
bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 10%-
|
||||||
|
|
||||||
# Use Mouse+$mod to drag floating windows to their wanted position
|
# Use Mouse+$mod to drag floating windows to their wanted position
|
||||||
floating_modifier $mod
|
floating_modifier $mod
|
||||||
|
|
||||||
# move tiling windows via drag & drop by left-clicking into the title bar,
|
# move tiling windows via drag & drop by left-clicking into the title bar,
|
||||||
# or left-clicking anywhere into the window while holding the floating modifier.
|
# or left-clicking anywhere into the window while holding the floating modifier.
|
||||||
tiling_drag modifier titlebar
|
floating_modifier $mod
|
||||||
|
|
||||||
# start a terminal
|
# start a terminal
|
||||||
bindsym $mod+Return exec wezterm
|
bindsym $mod+Return exec wezterm
|
||||||
@@ -45,6 +50,9 @@ bindsym $mod+f fullscreen toggle
|
|||||||
|
|
||||||
bindsym $mod+v floating toggle
|
bindsym $mod+v floating toggle
|
||||||
|
|
||||||
|
bindsym $mod+t layout tabbed
|
||||||
|
bindsym $mod+e layout toggle split
|
||||||
|
|
||||||
# Define names for default workspaces for which we configure key bindings later on.
|
# Define names for default workspaces for which we configure key bindings later on.
|
||||||
# We use variables to avoid repeating the names in multiple places.
|
# We use variables to avoid repeating the names in multiple places.
|
||||||
set $ws1 "1"
|
set $ws1 "1"
|
||||||
@@ -95,10 +103,10 @@ mode "resize" {
|
|||||||
# Pressing right will grow the window’s width.
|
# Pressing right will grow the window’s width.
|
||||||
# Pressing up will shrink the window’s height.
|
# Pressing up will shrink the window’s height.
|
||||||
# Pressing down will grow the window’s height.
|
# Pressing down will grow the window’s height.
|
||||||
bindsym h resize shrink width 10 px or 10 ppt
|
bindsym h resize grow width 10 px or 10 ppt
|
||||||
bindsym j resize grow height 10 px or 10 ppt
|
bindsym j resize grow height 10 px or 10 ppt
|
||||||
bindsym k resize shrink height 10 px or 10 ppt
|
bindsym k resize shrink height 10 px or 10 ppt
|
||||||
bindsym l resize grow width 10 px or 10 ppt
|
bindsym l resize shrink width 10 px or 10 ppt
|
||||||
|
|
||||||
# back to normal: Enter or Escape or $mod+r
|
# back to normal: Enter or Escape or $mod+r
|
||||||
bindsym Return mode "default"
|
bindsym Return mode "default"
|
||||||
@@ -114,12 +122,16 @@ bar {
|
|||||||
status_command i3status
|
status_command i3status
|
||||||
}
|
}
|
||||||
|
|
||||||
|
set $px 20
|
||||||
|
gaps inner $px
|
||||||
|
gaps outer $px
|
||||||
|
|
||||||
# external programs
|
# external programs
|
||||||
bindsym $mod+d exec flatpak run dev.vencord.Vesktop
|
bindsym $mod+d exec vesktop
|
||||||
bindsym $mod+b exec firefox
|
bindsym $mod+b exec librewolf
|
||||||
bindsym $mod+s exec flatpak run org.vinegarhq.Sober
|
bindsym $mod+s exec flatpak run org.vinegarhq.Sober
|
||||||
bindsym $mod+g exec steam
|
bindsym $mod+g exec steam
|
||||||
bindsym $mod+m exec flatpak run org.prismlauncher.PrismLauncher
|
bindsym $mod+m exec atlauncher
|
||||||
|
|
||||||
bindsym $mod+Shift+f exec nautilus
|
bindsym $mod+Shift+f exec nautilus
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ order += "cpu_temperature 0"
|
|||||||
order += "disk /"
|
order += "disk /"
|
||||||
order += "wireless _first_"
|
order += "wireless _first_"
|
||||||
order += "ethernet _first_"
|
order += "ethernet _first_"
|
||||||
# order += "battery all"
|
order += "battery all"
|
||||||
order += "load"
|
order += "load"
|
||||||
order += "tztime local"
|
order += "tztime local"
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ battery all {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tztime local {
|
tztime local {
|
||||||
format = "%d %H:%M:%S"
|
format = "%Y-%d-%m %I:%M:%S"
|
||||||
}
|
}
|
||||||
|
|
||||||
load {
|
load {
|
||||||
|
|||||||
1
nvim/.config/nvim/ftplugin/text.lua
Normal file
1
nvim/.config/nvim/ftplugin/text.lua
Normal file
@@ -0,0 +1 @@
|
|||||||
|
vim.opt.wrap = true
|
||||||
@@ -1,167 +1,4 @@
|
|||||||
vim.g.mapleader = " "
|
require 'plugins'
|
||||||
|
require 'configs'
|
||||||
vim.opt.number = true
|
require 'lsp'
|
||||||
vim.opt.relativenumber = true
|
require 'keymaps'
|
||||||
vim.opt.swapfile = false
|
|
||||||
vim.opt.wrap = false
|
|
||||||
vim.opt.splitright = true
|
|
||||||
vim.opt.splitbelow = true
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<Esc>", ":nohlsearch<CR>")
|
|
||||||
vim.keymap.set("n", "<leader>en", ":edit $MYVIMRC<CR>")
|
|
||||||
vim.keymap.set("n", "<leader>ez", ":edit ~/.zshrc<CR>")
|
|
||||||
|
|
||||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
|
|
||||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
|
|
||||||
|
|
||||||
for _, k in ipairs({ "h", "j", "k", "l" }) do
|
|
||||||
vim.keymap.set({ "n", "i", "v" }, "<C-" .. k .. ">", "<C-w><C-" .. k .. ">")
|
|
||||||
end
|
|
||||||
|
|
||||||
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",
|
|
||||||
lazypath,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
vim.opt.rtp:prepend(lazypath)
|
|
||||||
|
|
||||||
require("lazy").setup({
|
|
||||||
{
|
|
||||||
"blazkowolf/gruber-darker.nvim",
|
|
||||||
priority = 1000,
|
|
||||||
config = function()
|
|
||||||
vim.cmd.colorscheme("gruber-darker")
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"williamboman/mason.nvim",
|
|
||||||
build = ":MasonUpdate",
|
|
||||||
config = function()
|
|
||||||
require("mason").setup()
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"williamboman/mason-lspconfig.nvim",
|
|
||||||
dependencies = { "williamboman/mason.nvim", "neovim/nvim-lspconfig" },
|
|
||||||
config = function()
|
|
||||||
local ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
|
|
||||||
local capabilities = ok and cmp_nvim_lsp.default_capabilities() or
|
|
||||||
vim.lsp.protocol.make_client_capabilities()
|
|
||||||
|
|
||||||
local servers = { "lua_ls", "clangd" }
|
|
||||||
|
|
||||||
require("mason").setup()
|
|
||||||
require("mason-lspconfig").setup({
|
|
||||||
ensure_installed = servers,
|
|
||||||
})
|
|
||||||
|
|
||||||
for _, name in ipairs(servers) do
|
|
||||||
local cfg = { capabilities = capabilities }
|
|
||||||
|
|
||||||
if name == "lua_ls" then
|
|
||||||
cfg.settings = {
|
|
||||||
Lua = {
|
|
||||||
diagnostics = { globals = { "vim" } },
|
|
||||||
workspace = { library = vim.api.nvim_get_runtime_file("", true) },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
local server_cfg = vim.lsp.config[name]
|
|
||||||
if not server_cfg then
|
|
||||||
vim.notify("LSP server config not found: " .. name, vim.log.levels.WARN)
|
|
||||||
else
|
|
||||||
local cmd = server_cfg.cmd or { name }
|
|
||||||
vim.lsp.start(vim.tbl_extend("force", cfg, {
|
|
||||||
name = name,
|
|
||||||
cmd = cmd,
|
|
||||||
root_dir = vim.fs.root(0, { ".git", "Makefile", "main.c", "go.mod" }),
|
|
||||||
settings = cfg.settings,
|
|
||||||
}))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hrsh7th/nvim-cmp",
|
|
||||||
dependencies = {
|
|
||||||
"hrsh7th/cmp-nvim-lsp",
|
|
||||||
"hrsh7th/cmp-path",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
local cmp = require("cmp")
|
|
||||||
cmp.setup({
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
|
||||||
["<C-y>"] = cmp.mapping.confirm({ select = true }),
|
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
|
||||||
["<C-n>"] = cmp.mapping.select_next_item(),
|
|
||||||
["<C-p>"] = cmp.mapping.select_prev_item(),
|
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
|
||||||
}),
|
|
||||||
sources = cmp.config.sources({
|
|
||||||
{ name = "nvim_lsp" },
|
|
||||||
{ name = "path" },
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folke/snacks.nvim",
|
|
||||||
priority = 1000,
|
|
||||||
lazy = false,
|
|
||||||
opts = {
|
|
||||||
bigfile = { enabled = true },
|
|
||||||
picker = { enabled = true },
|
|
||||||
quickfile = { enabled = true },
|
|
||||||
terminal = {
|
|
||||||
enabled = true,
|
|
||||||
float = {
|
|
||||||
border = "rounded",
|
|
||||||
width = 0.8,
|
|
||||||
height = 0.8,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
config = function(_, opts)
|
|
||||||
require("snacks").setup(opts)
|
|
||||||
vim.keymap.set("n", "<C-_>", function()
|
|
||||||
require("snacks.terminal").toggle(nil, { float = true })
|
|
||||||
end)
|
|
||||||
vim.keymap.set("t", "<C-_>", function()
|
|
||||||
require("snacks.terminal").toggle(nil, { float = true })
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'nvim-telescope/telescope.nvim',
|
|
||||||
tag = '0.1.8',
|
|
||||||
dependencies = { 'nvim-lua/plenary.nvim' },
|
|
||||||
config = function()
|
|
||||||
local builtin = require("telescope.builtin")
|
|
||||||
require("telescope").setup {}
|
|
||||||
vim.keymap.set("n", "<leader>g", builtin.live_grep)
|
|
||||||
vim.keymap.set("n", "<leader>f", builtin.find_files)
|
|
||||||
end
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"https://github.com/tpope/vim-fugitive"
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd('FileType', {
|
|
||||||
pattern = 'python',
|
|
||||||
callback = function()
|
|
||||||
vim.bo.expandtab = false
|
|
||||||
vim.bo.shiftwidth = 4
|
|
||||||
vim.bo.tabstop = 4
|
|
||||||
vim.bo.softtabstop = 4
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.diagnostic.config { virtual_text = true, underline = true, signs = false }
|
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
|
|
||||||
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
|
|
||||||
"gruber-darker.nvim": { "branch": "main", "commit": "98a2e141981cbd5a194a97eae024bf55af854579" },
|
|
||||||
"lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
|
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "f760507df8c49a4bf46a4d12e1fc616797508979" },
|
|
||||||
"mason.nvim": { "branch": "main", "commit": "b3689a41dd77e5294498dba9757fb22cc80cbebd" },
|
|
||||||
"nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" },
|
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "336b388c272555d2ae94627a50df4c2f89a5e257" },
|
|
||||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
|
||||||
"snacks.nvim": { "branch": "main", "commit": "5e0e8698526f350f1280ad1ef7a8670f857c9445" },
|
|
||||||
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
|
||||||
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }
|
|
||||||
}
|
|
||||||
11
nvim/.config/nvim/lsp/bashls.lua
Normal file
11
nvim/.config/nvim/lsp/bashls.lua
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
---@type vim.lsp.Config
|
||||||
|
return {
|
||||||
|
cmd = { 'bash-language-server', 'start' },
|
||||||
|
settings = {
|
||||||
|
bashIde = {
|
||||||
|
globPattern = vim.env.GLOB_PATTERN or '*@(.sh|.inc|.bash|.command)',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
filetypes = { 'bash', 'sh', 'zsh' },
|
||||||
|
root_markers = { '.git' },
|
||||||
|
}
|
||||||
6
nvim/.config/nvim/lsp/clangd.lua
Normal file
6
nvim/.config/nvim/lsp/clangd.lua
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
---@type vim.lsp.Config
|
||||||
|
return {
|
||||||
|
cmd = { 'clangd' },
|
||||||
|
filetypes = { 'c', 'h', 'cpp' },
|
||||||
|
root_markers = { 'Makefile', '.git' },
|
||||||
|
}
|
||||||
6
nvim/.config/nvim/lsp/gopls.lua
Normal file
6
nvim/.config/nvim/lsp/gopls.lua
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
---@type vim.lsp.Config
|
||||||
|
return {
|
||||||
|
cmd = { 'gopls' },
|
||||||
|
filetypes = { 'go', 'gomod', 'gosum' },
|
||||||
|
root_markers = { 'go.mod', 'go.sum' },
|
||||||
|
}
|
||||||
37
nvim/.config/nvim/lsp/lua_ls.lua
Normal file
37
nvim/.config/nvim/lsp/lua_ls.lua
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
---@type vim.lsp.Config
|
||||||
|
return {
|
||||||
|
cmd = { 'lua-language-server' },
|
||||||
|
filetypes = { 'lua' },
|
||||||
|
root_markers = {
|
||||||
|
'.luarc.json',
|
||||||
|
'.luarc.jsonc',
|
||||||
|
'.luacheckrc',
|
||||||
|
'.stylua.toml',
|
||||||
|
'stylua.toml',
|
||||||
|
'selene.toml',
|
||||||
|
'selene.yml',
|
||||||
|
'.git',
|
||||||
|
},
|
||||||
|
settings = {
|
||||||
|
Lua = {
|
||||||
|
runtime = {
|
||||||
|
version = "Lua 5.4",
|
||||||
|
},
|
||||||
|
completion = {
|
||||||
|
enable = true,
|
||||||
|
},
|
||||||
|
diagnostics = {
|
||||||
|
enable = true,
|
||||||
|
globals = { "vim" },
|
||||||
|
},
|
||||||
|
workspace = {
|
||||||
|
library = {
|
||||||
|
vim.env.VIMRUNTIME,
|
||||||
|
"${3rd}/luv/library"
|
||||||
|
},
|
||||||
|
checkThirdParty = "Apply",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
15
nvim/.config/nvim/lsp/pyright.lua
Normal file
15
nvim/.config/nvim/lsp/pyright.lua
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
---@type vim.lsp.Config
|
||||||
|
return {
|
||||||
|
cmd = { 'pyright-langserver', '--stdio' },
|
||||||
|
settings = {
|
||||||
|
python = {
|
||||||
|
analysis = {
|
||||||
|
typeCheckingMode = 'basic',
|
||||||
|
autoSearchPaths = true,
|
||||||
|
useLibraryCodeForTypes = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
filetypes = { 'python' },
|
||||||
|
root_markers = { 'pyproject.toml', 'setup.py', 'requirements.txt', '.git' },
|
||||||
|
}
|
||||||
15
nvim/.config/nvim/lua/configs.lua
Normal file
15
nvim/.config/nvim/lua/configs.lua
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
local opt = vim.opt
|
||||||
|
|
||||||
|
opt.number = true
|
||||||
|
opt.relativenumber = true
|
||||||
|
opt.swapfile = false
|
||||||
|
opt.wrap = false
|
||||||
|
opt.splitright = true
|
||||||
|
opt.splitbelow = true
|
||||||
|
|
||||||
|
vim.cmd("colorscheme vim")
|
||||||
|
|
||||||
|
-- mini.pick colors
|
||||||
|
vim.api.nvim_set_hl(0, "MiniPickNormal", { bg = "#000000" })
|
||||||
|
vim.api.nvim_set_hl(0, "MiniPickBorder", { bg = "#000000", fg = "#000000" })
|
||||||
|
vim.api.nvim_set_hl(0, "MiniPickMatchCurrent", { bg = "#1e1e2e" })
|
||||||
17
nvim/.config/nvim/lua/keymaps.lua
Normal file
17
nvim/.config/nvim/lua/keymaps.lua
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
local keymap = vim.keymap.set
|
||||||
|
|
||||||
|
keymap("n", "<Esc>", ":nohlsearch<CR>")
|
||||||
|
|
||||||
|
keymap("n", "<leader>en", ":edit $MYVIMRC<CR>")
|
||||||
|
keymap("n", "<leader>ez", ":edit ~/.zshrc<CR>")
|
||||||
|
|
||||||
|
keymap("v", "J", ":m '>+1<CR>gv=gv")
|
||||||
|
keymap("v", "K", ":m '<-2<CR>gv=gv")
|
||||||
|
|
||||||
|
for _, k in ipairs({ "h", "j", "k", "l" }) do
|
||||||
|
keymap({ "n", "i", "v" }, "<C-" .. k .. ">", "<C-w><C-" .. k .. ">")
|
||||||
|
end
|
||||||
|
|
||||||
|
keymap("n", "<leader>f", ":Pick files<CR>")
|
||||||
|
|
||||||
|
keymap("n", "<leader>lf", vim.lsp.buf.format)
|
||||||
8
nvim/.config/nvim/lua/lsp.lua
Normal file
8
nvim/.config/nvim/lua/lsp.lua
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
vim.lsp.enable {
|
||||||
|
"bashls",
|
||||||
|
"gopls",
|
||||||
|
"lua_ls",
|
||||||
|
"clangd",
|
||||||
|
}
|
||||||
|
|
||||||
|
vim.diagnostic.config { virtual_text = true, underline = true, signs = false }
|
||||||
55
nvim/.config/nvim/lua/plugins.lua
Normal file
55
nvim/.config/nvim/lua/plugins.lua
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
|
vim.pack.add {
|
||||||
|
{ src = "https://github.com/mason-org/mason.nvim" },
|
||||||
|
{ src = "https://github.com/nvim-mini/mini.pick" },
|
||||||
|
{ src = "https://github.com/rafamadriz/friendly-snippets" },
|
||||||
|
{
|
||||||
|
src = "https://github.com/saghen/blink.cmp",
|
||||||
|
version = "1.*",
|
||||||
|
},
|
||||||
|
{ src = "https://github.com/tpope/vim-fugitive" },
|
||||||
|
}
|
||||||
|
|
||||||
|
require("mason").setup {}
|
||||||
|
require("mini.pick").setup {}
|
||||||
|
|
||||||
|
require('blink.cmp').setup {
|
||||||
|
fuzzy = { implementation = 'prefer_rust_with_warning' },
|
||||||
|
signature = { enabled = true },
|
||||||
|
keymap = {
|
||||||
|
preset = "default",
|
||||||
|
["<C-y>"] = { "select_and_accept" },
|
||||||
|
["<C-p>"] = { "select_prev", "fallback" },
|
||||||
|
["<C-n>"] = { "select_next", "fallback" },
|
||||||
|
["<C-b>"] = { "scroll_documentation_down", "fallback" },
|
||||||
|
["<C-f>"] = { "scroll_documentation_up", "fallback" },
|
||||||
|
-- ["<C-e>"] = { "hide" },
|
||||||
|
},
|
||||||
|
|
||||||
|
appearance = {
|
||||||
|
use_nvim_cmp_as_default = true,
|
||||||
|
nerd_font_variant = "normal",
|
||||||
|
},
|
||||||
|
|
||||||
|
completion = {
|
||||||
|
documentation = {
|
||||||
|
auto_show = true,
|
||||||
|
auto_show_delay_ms = 200,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
cmdline = {
|
||||||
|
keymap = {
|
||||||
|
preset = 'inherit',
|
||||||
|
['<CR>'] = { 'accept_and_enter', 'fallback' },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
sources = {
|
||||||
|
default = { "lsp", "snippets" },
|
||||||
|
providers = {
|
||||||
|
snippets = { opts = { friendly_snippets = true, } }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
53
nvim/.config/nvim/nvim-pack-lock.json
Normal file
53
nvim/.config/nvim/nvim-pack-lock.json
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
{
|
||||||
|
"plugins": {
|
||||||
|
"alpha-nvim": {
|
||||||
|
"rev": "3979b01cb05734331c7873049001d3f2bb8477f4",
|
||||||
|
"src": "https://github.com/goolord/alpha-nvim"
|
||||||
|
},
|
||||||
|
"blink.cmp": {
|
||||||
|
"rev": "d0c5196dae32c53cde1208161554906f5b982de8",
|
||||||
|
"src": "https://github.com/saghen/blink.cmp",
|
||||||
|
"version": "'1.*'"
|
||||||
|
},
|
||||||
|
"cyberdream.nvim": {
|
||||||
|
"rev": "a43b45423e8494898c353c0604e0b2e4e99bd056",
|
||||||
|
"src": "https://github.com/scottmckendry/cyberdream.nvim"
|
||||||
|
},
|
||||||
|
"friendly-snippets": {
|
||||||
|
"rev": "572f5660cf05f8cd8834e096d7b4c921ba18e175",
|
||||||
|
"src": "https://github.com/rafamadriz/friendly-snippets"
|
||||||
|
},
|
||||||
|
"mason.nvim": {
|
||||||
|
"rev": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800",
|
||||||
|
"src": "https://github.com/mason-org/mason.nvim"
|
||||||
|
},
|
||||||
|
"mini.pick": {
|
||||||
|
"rev": "0c56dc3ef9b15e9659ce09331fdc82449349701b",
|
||||||
|
"src": "https://github.com/nvim-mini/mini.pick"
|
||||||
|
},
|
||||||
|
"nvim-web-devicons": {
|
||||||
|
"rev": "6788013bb9cb784e606ada44206b0e755e4323d7",
|
||||||
|
"src": "https://github.com/nvim-tree/nvim-web-devicons"
|
||||||
|
},
|
||||||
|
"orgmode": {
|
||||||
|
"rev": "cf75da1a91071c6c041075eae4ca2326f9d1f52a",
|
||||||
|
"src": "https://github.com/nvim-orgmode/orgmode"
|
||||||
|
},
|
||||||
|
"rainbow-delimiters.nvim": {
|
||||||
|
"rev": "d6b802552cbe7d643a3b6b31f419c248d1f1e220",
|
||||||
|
"src": "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"
|
||||||
|
},
|
||||||
|
"simplyfile.nvim": {
|
||||||
|
"rev": "c4dfc0f3431898c3abbef267b226f6cdd2a67b38",
|
||||||
|
"src": "https://github.com/Rizwanelansyah/simplyfile.nvim"
|
||||||
|
},
|
||||||
|
"vim-fugitive": {
|
||||||
|
"rev": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4",
|
||||||
|
"src": "https://github.com/tpope/vim-fugitive"
|
||||||
|
},
|
||||||
|
"zen-mode.nvim": {
|
||||||
|
"rev": "8564ce6d29ec7554eb9df578efa882d33b3c23a7",
|
||||||
|
"src": "https://github.com/folke/zen-mode.nvim"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
add_newline = false
|
|
||||||
|
|
||||||
format = "$git_status$custom$directory"
|
|
||||||
|
|
||||||
[custom.todo]
|
|
||||||
command = "awk '/^TODAY/{getline; if (NF) {print; exit}}' ~/do"
|
|
||||||
when = "grep -A1 '^TODAY' ~/do | tail -n1 | grep -q '.'"
|
|
||||||
style = "bold white"
|
|
||||||
format = "\"[$output]($style)\" "
|
|
||||||
@@ -6,13 +6,11 @@ if wezterm.config_builder then
|
|||||||
config = wezterm.config_builder()
|
config = wezterm.config_builder()
|
||||||
end
|
end
|
||||||
|
|
||||||
config.color_scheme = 'Gruber (base16)'
|
|
||||||
|
|
||||||
config.font = wezterm.font_with_fallback {
|
config.font = wezterm.font_with_fallback {
|
||||||
'ComicShannsMono Nerd Font',
|
'ComicShannsMono Nerd Font',
|
||||||
'Iosevka Term'
|
'Iosevka Term'
|
||||||
}
|
}
|
||||||
config.font_size = 20.0
|
config.font_size = 24.0
|
||||||
|
|
||||||
config.enable_scroll_bar = false
|
config.enable_scroll_bar = false
|
||||||
config.window_padding = {
|
config.window_padding = {
|
||||||
@@ -23,6 +21,7 @@ config.window_padding = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
config.tab_bar_at_bottom = true
|
config.tab_bar_at_bottom = true
|
||||||
config.freetype_load_target = "HorizontalLcd"
|
|
||||||
|
config.window_background_opacity = .75
|
||||||
|
|
||||||
return config
|
return config
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
alias ls='ls --color=auto'
|
|
||||||
alias ll='ls -lah'
|
|
||||||
alias gg='lazygit'
|
|
||||||
alias v='nvim'
|
|
||||||
alias rr='russ read'
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export EDITOR=nvim
|
|
||||||
export SUDO_EDITOR="$EDITOR"
|
|
||||||
export TERM=xterm-256color
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
take() {
|
|
||||||
mkdir $1;
|
|
||||||
cd $1
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
if command -v starship &> /dev/null; then
|
|
||||||
eval "$(starship init zsh)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
bindkey -e
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
[ -f "${XDG_DATA_HOME:-$HOME/.local/share}/zap/zap.zsh" ] && source "${XDG_DATA_HOME:-$HOME/.local/share}/zap/zap.zsh"
|
|
||||||
plug "zsh-users/zsh-autosuggestions"
|
|
||||||
plug "zsh-users/zsh-syntax-highlighting"
|
|
||||||
plug "zap-zsh/sudo"
|
|
||||||
plug "Aloxaf/fzf-tab"
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
autoload -Uz compinit
|
|
||||||
compinit
|
|
||||||
|
|
||||||
autoload -U bashcompinit
|
|
||||||
bashcompinit
|
|
||||||
eval "$(register-python-argcomplete fp)"
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
export PATH=$HOME/.local/bin:$PATH
|
|
||||||
export PATH=$HOME/opt/bin:$PATH
|
|
||||||
export PATH=$HOME/go/bin:$PATH
|
|
||||||
|
|
||||||
export LD_LIBRARY_PATH=$HOME/opt/lib:$LD_LIBRARY_PATH
|
|
||||||
64
zsh/.zshrc
64
zsh/.zshrc
@@ -1,9 +1,57 @@
|
|||||||
source ~/.local/share/vxclutch/zsh/aliases
|
export TERM=xterm-256color
|
||||||
source ~/.local/share/vxclutch/zsh/envs
|
|
||||||
source ~/.local/share/vxclutch/zsh/functions
|
|
||||||
source ~/.local/share/vxclutch/zsh/init
|
|
||||||
source ~/.local/share/vxclutch/zsh/shell
|
|
||||||
source ~/.local/share/vxclutch/zsh/plugins
|
|
||||||
source ~/.local/share/vxclutch/zsh/inputrc
|
|
||||||
|
|
||||||
source ~/.local/share/vxclutch/zsh/rc
|
export EDITOR=nvim
|
||||||
|
export SUDO_EDITOR=nvim
|
||||||
|
|
||||||
|
export GOPATH="$HOME/.local/go"
|
||||||
|
|
||||||
|
export HISTSIZE=10000
|
||||||
|
export SAVEHIST=10000
|
||||||
|
export HISTFILE="$HOME/.cache/zsh/history"
|
||||||
|
|
||||||
|
setopt inc_append_history
|
||||||
|
setopt interactive_comments
|
||||||
|
|
||||||
|
export PATH="$HOME/.local/bin:$HOME/.local/go/bin:$HOME/opt/bin:$PATH"
|
||||||
|
export LD_LIBRARY_PATH="$HOME/opt/lib:${LD_LIBRARY_PATH:-}"
|
||||||
|
|
||||||
|
alias ls='ls --color=auto'
|
||||||
|
alias ll='ls -lah'
|
||||||
|
alias gg='lazygit'
|
||||||
|
alias v='nvim'
|
||||||
|
alias rr='russ read'
|
||||||
|
alias cp='cp -v'
|
||||||
|
|
||||||
|
take() {
|
||||||
|
mkdir -p -- "$1" && cd -- "$1"
|
||||||
|
}
|
||||||
|
|
||||||
|
bindkey -e
|
||||||
|
|
||||||
|
autoload -Uz compinit colors
|
||||||
|
autoload -U bashcompinit
|
||||||
|
|
||||||
|
colors
|
||||||
|
compinit
|
||||||
|
bashcompinit
|
||||||
|
|
||||||
|
PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
|
||||||
|
|
||||||
|
if [ -f "$HOME/.zprofile" ]; then
|
||||||
|
source "$HOME/.zprofile"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then
|
||||||
|
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
ZAP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zap"
|
||||||
|
|
||||||
|
if [ -f "$ZAP_DIR/zap.zsh" ]; then
|
||||||
|
source "$ZAP_DIR/zap.zsh"
|
||||||
|
fi
|
||||||
|
|
||||||
|
plug "zsh-users/zsh-autosuggestions"
|
||||||
|
plug "zsh-users/zsh-syntax-highlighting"
|
||||||
|
plug "zap-zsh/sudo"
|
||||||
|
plug "Aloxaf/fzf-tab"
|
||||||
|
|||||||
Reference in New Issue
Block a user