feature: nvim plugins updates and some more fixes
This commit is contained in:
+3
-1
@@ -4,7 +4,6 @@ export HISTCONTROL=ignoreboth
|
|||||||
export HISTFILESIZE=-1
|
export HISTFILESIZE=-1
|
||||||
export HISTSIZE=-1
|
export HISTSIZE=-1
|
||||||
|
|
||||||
|
|
||||||
# GCM
|
# GCM
|
||||||
export GCM_CREDENTIAL_STORE=cache
|
export GCM_CREDENTIAL_STORE=cache
|
||||||
|
|
||||||
@@ -24,3 +23,6 @@ fi
|
|||||||
export ANDROID_SDK_ROOT=/opt/android-sdk
|
export ANDROID_SDK_ROOT=/opt/android-sdk
|
||||||
export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin
|
export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin
|
||||||
export PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools
|
export PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools
|
||||||
|
|
||||||
|
# mimo code
|
||||||
|
export MIMOCODE_ENABLE_ANALYSIS=false
|
||||||
|
|||||||
+11
-11
@@ -11,17 +11,17 @@ fi
|
|||||||
if [ -n "$SSH_CONNECTION" ]; then
|
if [ -n "$SSH_CONNECTION" ]; then
|
||||||
echo -e "\e[33m*\e[30m⛧ \e[31m Domain expansion.."
|
echo -e "\e[33m*\e[30m⛧ \e[31m Domain expansion.."
|
||||||
case $(uname -s) in
|
case $(uname -s) in
|
||||||
Darwin) os="macOS $(sw_vers -productversion 2>/dev/null)" ;;
|
Darwin) os="macOS $(sw_vers -productversion 2>/dev/null)" ;;
|
||||||
Linux)
|
Linux)
|
||||||
if [ -f "$HOME/.os-release" ]; then
|
if [ -f "$HOME/.os-release" ]; then
|
||||||
. "$HOME/.os-release" 2>/dev/null && os="$PRETTY_NAME"
|
. "$HOME/.os-release" 2>/dev/null && os="$PRETTY_NAME"
|
||||||
else
|
else
|
||||||
. /etc/os-release 2>/dev/null && os="$PRETTY_NAME"
|
. /etc/os-release 2>/dev/null && os="$PRETTY_NAME"
|
||||||
fi
|
fi
|
||||||
[ -z "$os" ] && os="Linux $(uname -r)"
|
[ -z "$os" ] && os="Linux $(uname -r)"
|
||||||
;;
|
;;
|
||||||
Haiku) os="Haiku $(uname -r)" ;;
|
Haiku) os="Haiku $(uname -r)" ;;
|
||||||
*) os="$(uname -s) $(uname -r)" ;;
|
*) os="$(uname -s) $(uname -r)" ;;
|
||||||
esac
|
esac
|
||||||
echo -e "\e[30m⛧ \e[33m*\e[31m Driver: $os\e[0m"
|
echo -e "\e[30m⛧ \e[33m*\e[31m Driver: $os\e[0m"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ kitty_copy_line() {
|
|||||||
}
|
}
|
||||||
bind -x '"\C-y": kitty_copy_line'
|
bind -x '"\C-y": kitty_copy_line'
|
||||||
|
|
||||||
|
|
||||||
# Aliases
|
# Aliases
|
||||||
# aliases aliases
|
# aliases aliases
|
||||||
alias aliasm='alias |comm -13 <(grep -h ^alias ~/.bashrc ~/.bash_private | sort) -'
|
alias aliasm='alias |comm -13 <(grep -h ^alias ~/.bashrc ~/.bash_private | sort) -'
|
||||||
@@ -71,6 +70,7 @@ alias cfgfastfetch='(cd ~/.config/fastfetch && nvim .)'
|
|||||||
alias cfgbash='(cd ~/.config/bash && nvim .)'
|
alias cfgbash='(cd ~/.config/bash && nvim .)'
|
||||||
alias cfgtmux='(cd ~/.config/tmux && nvim .)'
|
alias cfgtmux='(cd ~/.config/tmux && nvim .)'
|
||||||
alias cfgopencode='(cd ~/.config/opencode && nvim .)'
|
alias cfgopencode='(cd ~/.config/opencode && nvim .)'
|
||||||
|
alias cfgmimocode='(cd ~/.config/mimocode && nvim .)'
|
||||||
alias cfgscripts='(cd ~/config-scripts && nvim .)'
|
alias cfgscripts='(cd ~/config-scripts && nvim .)'
|
||||||
alias cfgxfce='(cd ~/.config/xfce4 && nvim .)'
|
alias cfgxfce='(cd ~/.config/xfce4 && nvim .)'
|
||||||
alias script='(cd ~/scripts && nvim .)'
|
alias script='(cd ~/scripts && nvim .)'
|
||||||
@@ -149,11 +149,14 @@ alias gsh='git show'
|
|||||||
alias x='sudo chmod +x'
|
alias x='sudo chmod +x'
|
||||||
alias y='yazi'
|
alias y='yazi'
|
||||||
alias n='nvim .'
|
alias n='nvim .'
|
||||||
|
alias nv='nvim'
|
||||||
alias t='tmux'
|
alias t='tmux'
|
||||||
alias a='abduco'
|
alias a='abduco'
|
||||||
alias al='if [ -n "$A_SESSION_NAME" ]; then abduco -l | sed "s/.*$A_SESSION_NAME.*/\x1b[32m&\x1b[0m/"; else abduco -l; fi'
|
alias al='if [ -n "$A_SESSION_NAME" ]; then abduco -l | sed "s/.*$A_SESSION_NAME.*/\x1b[32m&\x1b[0m/"; else abduco -l; fi'
|
||||||
alias py='python'
|
alias py='python'
|
||||||
alias pyv='python --version'
|
alias pyv='python --version'
|
||||||
|
alias ad='drill -Q'
|
||||||
|
alias a6='drill -Q AAAA'
|
||||||
alias clipclear='cliphist wipe'
|
alias clipclear='cliphist wipe'
|
||||||
alias download='aria2c -x16 -s16'
|
alias download='aria2c -x16 -s16'
|
||||||
alias scrcpy-def='scrcpy -S --no-audio -K'
|
alias scrcpy-def='scrcpy -S --no-audio -K'
|
||||||
@@ -161,7 +164,8 @@ alias share='python3 -m http.server'
|
|||||||
alias globalshare='(cd ~/Share && python3 -m http.server)'
|
alias globalshare='(cd ~/Share && python3 -m http.server)'
|
||||||
alias clearlock='faillock --user YOUR_USERNAME --reset'
|
alias clearlock='faillock --user YOUR_USERNAME --reset'
|
||||||
alias opencode-resume='opencode-restore'
|
alias opencode-resume='opencode-restore'
|
||||||
|
alias mimocode-resume='mimocode-restore'
|
||||||
|
alias mimocode='mimo'
|
||||||
|
|
||||||
# fun aliases
|
# fun aliases
|
||||||
alias please='sudo '
|
alias please='sudo '
|
||||||
@@ -172,7 +176,6 @@ alias mmsnow='unimatrix -u ❄❆❅᪥𑁍⭒*❄❆❅᪥* -c white -a'
|
|||||||
alias mute-light-disable='sudo sh -c "echo 0 > /sys/class/leds/platform::micmute/brightness"'
|
alias mute-light-disable='sudo sh -c "echo 0 > /sys/class/leds/platform::micmute/brightness"'
|
||||||
alias quick-info='echo "Cores: $(lscpu | awk "/Core\(s\) per socket:/ {print \$4}") | Threads: $(nproc) | RAM: $(free -h | awk "/Mem:/ {print \$2}")"'
|
alias quick-info='echo "Cores: $(lscpu | awk "/Core\(s\) per socket:/ {print \$4}") | Threads: $(nproc) | RAM: $(free -h | awk "/Mem:/ {print \$2}")"'
|
||||||
|
|
||||||
|
|
||||||
# Functions
|
# Functions
|
||||||
scannet() {
|
scannet() {
|
||||||
for net in "$@"; do
|
for net in "$@"; do
|
||||||
@@ -181,12 +184,12 @@ scannet() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setos() {
|
setos() {
|
||||||
if [ -z "$1" ]; then
|
if [ -z "$1" ]; then
|
||||||
echo "Error: Please provide a source file path."
|
echo "Error: Please provide a source file path."
|
||||||
echo "Usage: setos <source_file>"
|
echo "Usage: setos <source_file>"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
cp "$1" "$HOME/.os-release"
|
cp "$1" "$HOME/.os-release"
|
||||||
}
|
}
|
||||||
|
|
||||||
aa() {
|
aa() {
|
||||||
@@ -204,24 +207,44 @@ look-into-kitty() {
|
|||||||
opencode-save() {
|
opencode-save() {
|
||||||
uuid="$1"
|
uuid="$1"
|
||||||
echo "opencode -s $uuid" >.opencode-session
|
echo "opencode -s $uuid" >.opencode-session
|
||||||
echo 'Saved the command to continue opencode session to ".opencode-session"'
|
echo 'Saved the command to continue Opencode session to ".opencode-session"'
|
||||||
}
|
}
|
||||||
|
|
||||||
opencode-restore() {
|
opencode-restore() {
|
||||||
FILE_PATH=".opencode-session"
|
FILE_PATH=".opencode-session"
|
||||||
if [ ! -f "$FILE_PATH" ]; then
|
if [ ! -f "$FILE_PATH" ]; then
|
||||||
echo "Error: no such file '$FILE_PATH'"
|
echo "Error: no such file '$FILE_PATH'"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
uuid=$(awk '/opencode -s/ {print $3}' "$FILE_PATH")
|
uuid=$(awk '/opencode -s/ {print $3}' "$FILE_PATH")
|
||||||
if [ -z "$uuid" ]; then
|
if [ -z "$uuid" ]; then
|
||||||
echo "Error: no sessionn saved"
|
echo "Error: no sessionn saved"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
echo "Resuming Opencode session with ID: $uuid"
|
echo "Resuming Opencode session with ID: $uuid"
|
||||||
opencode -s "$uuid"
|
opencode -s "$uuid"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mimocode-save() {
|
||||||
|
uuid="$1"
|
||||||
|
echo "mimo -s $uuid" >.mimocode-session
|
||||||
|
echo 'Saved the command to continue Mimocode session to ".mimocode-session"'
|
||||||
|
}
|
||||||
|
|
||||||
|
mimocode-restore() {
|
||||||
|
FILE_PATH=".mimocode-session"
|
||||||
|
if [ ! -f "$FILE_PATH" ]; then
|
||||||
|
echo "Error: no such file - $FILE_PATH"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
uuid=$(awk '/mimo -s/ {print $3}' "$FILE_PATH")
|
||||||
|
if [ -z "$uuid" ]; then
|
||||||
|
echo "Error: no sessionn saved"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
echo "Resuming Mimocode session with ID: $uuid..."
|
||||||
|
mimo -s "$uuid"
|
||||||
|
}
|
||||||
|
|
||||||
# Imports
|
# Imports
|
||||||
if [ -f "$HOME/.bash_tools" ]; then
|
if [ -f "$HOME/.bash_tools" ]; then
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ mouse_map b5 press grabbed,ungrabbed send_key ctrl+shift+i
|
|||||||
# Keyboard bindings
|
# Keyboard bindings
|
||||||
map kitty_mod+t new_tab_with_cwd
|
map kitty_mod+t new_tab_with_cwd
|
||||||
map ctrl+v paste_from_clipboard
|
map ctrl+v paste_from_clipboard
|
||||||
|
map ctrl+м paste_from_clipboard
|
||||||
map ctrl+; send_text all \x1b[24;5~
|
map ctrl+; send_text all \x1b[24;5~
|
||||||
|
|
||||||
# Scroll up and down by line
|
# Scroll up and down by line
|
||||||
|
|||||||
@@ -19,11 +19,11 @@
|
|||||||
"nvim-cmp": { "branch": "main", "commit": "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3" },
|
"nvim-cmp": { "branch": "main", "commit": "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" },
|
"nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" },
|
||||||
"nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
|
"nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
|
"nvim-dap-ui": { "branch": "master", "commit": "cc9dd33aade7f20bae414d0cba163bc60d4d4b43" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "d5b6e3db4c17b0146f63a2fc47e2027a754b2cb1" },
|
"nvim-lspconfig": { "branch": "master", "commit": "e7ca2c95ba316a8b846d3f3546d407908c5c4ccb" },
|
||||||
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
|
"nvim-nio": { "branch": "master", "commit": "edcc181a875301dd21840189aa2f2f9ad69fc172" },
|
||||||
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
|
"nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "09d1324e264c6950262dbe02a9bce2933a6800db" },
|
"nvim-web-devicons": { "branch": "master", "commit": "0ca28b61a04fe7426cefbdd52c2647ef0e335b5f" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
|
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "427b576c16792edad01a92b89721d923c19ad60f" },
|
"telescope.nvim": { "branch": "master", "commit": "427b576c16792edad01a92b89721d923c19ad60f" },
|
||||||
"vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
|
"vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ vim.opt.listchars = {
|
|||||||
trail = "·",
|
trail = "·",
|
||||||
tab = " ",
|
tab = " ",
|
||||||
}
|
}
|
||||||
|
vim.opt.undofile = true
|
||||||
|
|
||||||
-- Additional commands for typos
|
-- Additional commands for typos
|
||||||
vim.api.nvim_create_user_command("Qa", "qa", {})
|
vim.api.nvim_create_user_command("Qa", "qa", {})
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ return {
|
|||||||
javascript = { "prettierd", "prettier", stop_after_first = true },
|
javascript = { "prettierd", "prettier", stop_after_first = true },
|
||||||
typescript = { "prettierd", "prettier", stop_after_first = true },
|
typescript = { "prettierd", "prettier", stop_after_first = true },
|
||||||
|
|
||||||
json = { "prettierd", "prettier_f", stop_after_first = true },
|
json = { "prettierd", "prettier", stop_after_first = true },
|
||||||
jsonc = { "prettierd_f", "prettier_f", stop_after_first = true },
|
jsonc = { "prettierd", "prettier", stop_after_first = true },
|
||||||
|
|
||||||
-- markdown = { "prettierd", "prettier", stop_after_first = true },
|
-- markdown = { "prettierd", "prettier", stop_after_first = true },
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -6,6 +6,10 @@ return {
|
|||||||
ru = "ru",
|
ru = "ru",
|
||||||
},
|
},
|
||||||
use_libukb = false,
|
use_libukb = false,
|
||||||
|
aliases = {
|
||||||
|
max_length = 3,
|
||||||
|
extra = { "sort", "term" },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,51 +1,52 @@
|
|||||||
return {
|
return {
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
event = { "BufReadPost", "BufNewFile" },
|
||||||
config = function()
|
config = function()
|
||||||
ts = require("nvim-treesitter")
|
local ts = require("nvim-treesitter")
|
||||||
ts.setup()
|
|
||||||
ts.install({
|
|
||||||
"python",
|
|
||||||
"go",
|
|
||||||
"kotlin",
|
|
||||||
"dart",
|
|
||||||
"lua",
|
|
||||||
"bash",
|
|
||||||
"json",
|
|
||||||
"yaml",
|
|
||||||
"markdown",
|
|
||||||
"vim",
|
|
||||||
"vimdoc",
|
|
||||||
"html",
|
|
||||||
"css",
|
|
||||||
"javascript",
|
|
||||||
})
|
|
||||||
vim.treesitter.language.register("html", "gotmpl")
|
|
||||||
vim.api.nvim_create_autocmd("FileType", {
|
|
||||||
callback = function(args)
|
|
||||||
local lang = vim.treesitter.language.get_lang(args.match)
|
|
||||||
if vim.list_contains(ts.get_available(), lang) then
|
|
||||||
if not vim.list_contains(ts.get_installed(), lang) then
|
|
||||||
ts.install(lang):wait()
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.treesitter.start(args.buf)
|
ts.setup({
|
||||||
end
|
ensure_installed = {
|
||||||
end,
|
"python",
|
||||||
desc = "enable nvim-treesitter and install parser if not installed",
|
"go",
|
||||||
})
|
"kotlin",
|
||||||
|
"dart",
|
||||||
|
"lua",
|
||||||
|
"bash",
|
||||||
|
"json",
|
||||||
|
"yaml",
|
||||||
|
"markdown",
|
||||||
|
"vim",
|
||||||
|
"vimdoc",
|
||||||
|
},
|
||||||
|
sync_install = false,
|
||||||
|
auto_install = true,
|
||||||
|
highlight = {
|
||||||
|
enable = true,
|
||||||
|
additional_vim_regex_highlighting = false,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
-- require("nvim-treesitter").setup()
|
pcall(vim.treesitter.language.register, "html", "gotmpl")
|
||||||
-- {
|
|
||||||
-- ensure_installed = {
|
vim.api.nvim_create_autocmd("FileType", {
|
||||||
-- },
|
group = vim.api.nvim_create_augroup("TreesitterOnDemand", { clear = true }),
|
||||||
--
|
callback = function(args)
|
||||||
-- sync_install = false,
|
local ft = args.match
|
||||||
-- auto_install = true,
|
local lang = vim.treesitter.language.get_lang(ft) or ft
|
||||||
--
|
|
||||||
-- highlight = {
|
local installed = ts.get_installed and ts.get_installed() or {}
|
||||||
-- enable = true,
|
if not vim.list_contains(installed, lang) then
|
||||||
-- additional_vim_regex_highlighting = false,
|
pcall(function()
|
||||||
-- },
|
local ok = ts.install(lang)
|
||||||
-- })
|
if ok and ok.wait then
|
||||||
|
ok:wait()
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
pcall(vim.treesitter.start, args.buf, lang)
|
||||||
|
end,
|
||||||
|
desc = "enable nvim-treesitter and install parser if not installed",
|
||||||
|
})
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -108,3 +108,8 @@ desc = "Jump to char"
|
|||||||
on = "p"
|
on = "p"
|
||||||
run = "plugin smart-paste"
|
run = "plugin smart-paste"
|
||||||
desc = "Paste into the hovered directory or CWD"
|
desc = "Paste into the hovered directory or CWD"
|
||||||
|
|
||||||
|
[[mgr.prepend_keymap]]
|
||||||
|
on = "<C-Enter>"
|
||||||
|
run = 'shell "xdg-open %s" --confirm'
|
||||||
|
desc = "Open with system default (xdg-open)"
|
||||||
|
|||||||
@@ -26,4 +26,3 @@
|
|||||||
#
|
#
|
||||||
# exec tmux new -s "$T_SESSION_NAME"
|
# exec tmux new -s "$T_SESSION_NAME"
|
||||||
# fi
|
# fi
|
||||||
|
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ echo
|
|||||||
# Installing extra packages
|
# Installing extra packages
|
||||||
echo -e "${YELLOW}Installing extra packages....${NC}"
|
echo -e "${YELLOW}Installing extra packages....${NC}"
|
||||||
sudo pacman -S --needed --noconfirm \
|
sudo pacman -S --needed --noconfirm \
|
||||||
ethtool bash bash-completion zoxide yadm hyprland uwsm \
|
ethtool ldns bash bash-completion zoxide yadm hyprland uwsm \
|
||||||
wl-clipboard brightnessctl ttf-jetbrains-mono-nerd \
|
wl-clipboard brightnessctl ttf-jetbrains-mono-nerd \
|
||||||
xdg-desktop-portal-hyprland xdg-desktop-portal \
|
xdg-desktop-portal-hyprland xdg-desktop-portal \
|
||||||
xdg-desktop-portal-gtk xdg-desktop-portal-wlr archlinux-xdg-menu \
|
xdg-desktop-portal-gtk xdg-desktop-portal-wlr archlinux-xdg-menu \
|
||||||
|
|||||||
Reference in New Issue
Block a user