Compare commits

...

4 Commits

Author SHA1 Message Date
c36b8443f5 Updated some files
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2026-03-06 12:05:46 +01:00
175c839ea9 .zshrc: updated
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2026-03-06 12:04:26 +01:00
368f8b650c Update-pkg: updated version
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2026-03-06 12:01:52 +01:00
b5d5d4b28b .config/nvim: added AI into nvim
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
2026-03-06 12:00:01 +01:00
5 changed files with 544 additions and 447 deletions

View File

@@ -389,17 +389,43 @@
"product_id": 666,
"vendor_id": 76
},
"simple_modifications": [
{
"from": { "key_code": "right_command" },
"to": [{ "key_code": "right_option" }]
}
]
},
{
"identifiers": {
"is_keyboard": true,
"product_id": 666,
"vendor_id": 1452
},
"simple_modifications": [
{
"from": { "key_code": "right_command" },
"to": [{ "key_code": "right_option" }]
}
]
},
{
"identifiers": {
"is_keyboard": true,
"product_id": 34304,
"vendor_id": 1452
},
"ignore": true
}
],
"fn_function_keys": [
{
"from": { "key_code": "f5" },
"to": [{ "key_code": "f5" }]
"from": { "key_code": "f4" },
"to": [{ "apple_vendor_keyboard_key_code": "mission_control" }]
},
{
"from": { "key_code": "f6" },
"to": [{ "key_code": "f13" }]
"from": { "key_code": "f5" },
"to": [{ "key_code": "f5" }]
}
],
"name": "Default profile",

View File

@@ -172,11 +172,30 @@ call plug#begin('~/.config/nvim/plugged')
" Autopair
Plug 'windwp/nvim-autopairs'
" AI
Plug 'folke/snacks.nvim'
Plug 'coder/claudecode.nvim'
call plug#end()
" LUA
lua<<EOF
local opts = { noremap=true, silent=true }
vim.filetype.add({
-- Ansible
pattern = {
[".*playbooks/.*%.ya?ml"] = "yaml.ansible",
[".*tasks/.*%.ya?ml"] = "yaml.ansible",
[".*handlers/.*%.ya?ml"] = "yaml.ansible",
[".*roles/.*/.*%.ya?ml"] = "yaml.ansible",
},
-- Docker Compose + GitLab CI (merged into one filename table)
filename = {
["docker-compose.yml"] = "yaml.docker-compose",
["docker-compose.yaml"] = "yaml.docker-compose",
[".gitlab-ci.yml"] = "yaml.gitlab",
[".gitlab-ci.yaml"] = "yaml.gitlab",
},
})
-- capabilities for nvim-cmp
local capabilities = require('cmp_nvim_lsp').default_capabilities()
@@ -199,7 +218,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
end,
})
-- If you want borders, define one (your old code referenced `border` but never defined it)
local border = 'rounded'
vim.lsp.config('*', {
@@ -246,30 +264,66 @@ vim.lsp.config('gopls', {
},
})
vim.lsp.config('ruff', {}) -- keep as you had it
vim.lsp.config('ruff', {})
-- Finally, enable servers (this replaces the setup() loop)
-- Enable servers (remove 'solargraph' if not using Ruby)
vim.lsp.enable({
'clangd', 'bashls', 'yamlls', 'ansiblels', 'gopls', 'solargraph',
'terraformls', 'tflint', 'marksman', 'rust_analyzer', 'ruff',
})
-- nvim-cmp setup with Tab support
local cmp = require('cmp')
cmp.setup({
mapping = cmp.mapping.preset.insert({
['<C-Space>'] = cmp.mapping.complete(),
-- Tab: indent on empty/whitespace-only lines, trigger completion elsewhere
['<Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif vim.fn["copilot#GetDisplayedSuggestion"]().text ~= "" then
vim.fn.feedkeys(vim.fn["copilot#Accept"](""), "n")
elseif vim.api.nvim_get_current_line():match("^%s*$") then
fallback()
else
cmp.complete()
end
end, { 'i', 's' }),
-- Shift-Tab: go to previous completion item or fallback
['<S-Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
else
fallback()
end
end, { 'i', 's' }),
-- Enter to confirm selection
['<CR>'] = cmp.mapping.confirm({ select = true }),
}),
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
{ name = 'buffer' },
{ name = 'path' },
}),
sources = { { name = 'buffer' } },
})
vim.keymap.set("t", "<C-w>h", "<C-\\><C-n><C-w>h", { desc = "Move to left window" })
vim.keymap.set("t", "<C-w>l", "<C-\\><C-n><C-w>l", { desc = "Move to right window" })
vim.keymap.set("t", "<C-w>p", "<C-\\><C-n><C-w>p", { desc = "Focus previous window" })
require("claudecode").setup()
EOF
" Added popout window to see diagnostic
set updatetime=250
autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false, scope="cursor"})
" CoPilot
" imap <silent><script><expr> <F1> copilot#Accept("\<CR>")
" let g:copilot_no_tab_map = v:true
" Copilot
let g:copilot_no_tab_map = v:true
" Neoformat
let g:neoformat_try_formatprg = 1
@@ -294,7 +348,7 @@ function! s:check_back_space() abort
endfunction
" Enable show hidden in NerdTree
let NERDTreeShowHidden=1
let g:NERDTreeShowHidden=1
" latex
let g:tex_flavor = "latex"
@@ -306,13 +360,13 @@ let g:vimspector_install_gadgets = [ 'debugpy', 'vscode-go', 'CodeLLDB', 'vscode
""""""""""""""""""""""""""""""""
" Theme
""""""""""""""""""""""""""""""""
"colorscheme gruvbox
"colorscheme default
" colorscheme gruvbox
" colorscheme default
colorscheme dracula
let g:gruvbox_invert_selection='0'
let g:gruvbox_contrast_dark = 'hard'
set background=dark
"hi Normal ctermbg=NONE
" hi Normal ctermbg=NONE
hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE guifg=NONE guibg=#64666d gui=NONE
hi PmenuSel ctermfg=NONE ctermbg=246 cterm=NONE guifg=NONE guibg=#204a87 gui=NONE
hi CursorLine cterm=NONE term=NONE ctermbg=NONE guibg=NONE
@@ -326,7 +380,7 @@ set t_ZR="\e[23m"
highlight Comment cterm=italic gui=italic
highlight htmlArg gui=italic cterm=italic
" columne
" column
set textwidth=80
set colorcolumn=80
highlight ColorColumn ctermbg=236
@@ -381,7 +435,7 @@ nmap <C-_> <Plug>Commentary
omap <C-_> <Plug>Commentary
nmap <C-_> <Plug>CommentaryLine
" Better tab
" Better tab (visual mode only - insert mode Tab is handled by nvim-cmp above)
vnoremap <Tab> >
vnoremap <S-Tab> <
@@ -399,10 +453,10 @@ nmap <Leader>g <cmd>Telescope git_branches<cr>
nmap <Leader>a <cmd>Telescope diagnostics<cr>
" Resize window
nnoremap <C-L> :vertical resize +5<CR>
nnoremap <C-H> :vertical resize -5<CR>
nnoremap <C-J> :res -5<CR>
nnoremap <C-K> :res +5<CR>
nnoremap Ó :vertical resize -5<CR>
nnoremap Ô :res -5<CR>
nnoremap ū :res +5<CR>
nnoremap Ł :vertical resize +5<CR>
" Split window
nnoremap _ :vsp <CR>
@@ -438,7 +492,7 @@ vnoremap <A-k> :m '<-2<CR>gv=gv
nnoremap <Leader>s :%s//g<Left><Left>
vnoremap <Leader>s :s//g<Left><Left>
" Better adding into begging and ending line
" Better adding into beginning and ending line
vnoremap F <C-v>$A
vnoremap f <C-v>0I
@@ -460,6 +514,14 @@ nnoremap J }
nnoremap K {
vnoremap J }
vnoremap K {
nnoremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l
tnoremap <C-h> <C-\><C-n><C-w>h
tnoremap <C-j> <C-\><C-n><C-w>j
tnoremap <C-k> <C-\><C-n><C-w>k
tnoremap <C-l> <C-\><C-n><C-w>l
" Copy into system
noremap <Leader>y "*y
@@ -492,6 +554,7 @@ map <F4> :setlocal spell! spelllang=pl<CR>
:command! W w
:command! Q q
:command! Wq wq
:command! X x
""""""""""""""""""""""""""""""""
" Custom functions
@@ -512,7 +575,6 @@ lua <<EOF
end
EOF
""""""""""""""""""""""""""""""""
" Files
""""""""""""""""""""""""""""""""
@@ -550,7 +612,6 @@ autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>
" Yaml
autocmd BufRead,BufNewFile *.yaml,*.yml let g:indentLine_enabled = 1
autocmd BufRead,BufNewFile *.yaml,*.yml let g:indentLine_char = '⦙'
au BufRead,BufNewFile *.yaml,*.yml if search('hosts:\|tasks:', 'nw') | set ft=yaml.ansible | endif
autocmd BufWritePre *.yaml,*.yml silent! undojoin | Neoformat prettier
" JSON
@@ -576,7 +637,7 @@ au BufNewFile,BufRead,BufWritePre *.ebuild let g:shfmt_extra_args = '-ci -sr -s'
" TOML
autocmd BufWritePre *.toml silent! undojoin | Neoformat taplo
" Terrafrom
" Terraform
autocmd BufWritePre *.tf lua vim.lsp.buf.format()
autocmd BufWritePre *.tfvars lua vim.lsp.buf.format()
@@ -588,7 +649,6 @@ autocmd BufWritePre *.md silent! undojoin | Neoformat mdformat
autocmd BufWritePre * %s/\s\+$//e
autocmd BufWritepre * %s/\n\+\%$//e
" Source: https://vi.stackexchange.com/questions/20077/automatically-highlight-all-occurrences-of-the-selected-text-in-visual-mode
" highlight the visual selection after pressing enter.
xnoremap <silent> <cr> "*y:silent! let searchTerm = '\V'.substitute(escape(@*, '\/'), "\n", '\\n', "g") <bar> let @/ = searchTerm <bar> echo '/'.@/ <bar> call histadd("search", searchTerm) <bar> set hls<cr>

View File

@@ -1,4 +1,4 @@
ext jpg = feh --scale-down "$@"
ext jpg = open -a Preview "$@"
#ext doc = openoffice4 "$@"
#ext odt = openoffice4 "$@"

View File

@@ -17,7 +17,7 @@ NC='\033[0m'
TERRAFORM_VERSION="1.5.7"
# Python
if which python3 >/dev/null 2>&1; then
if which python3 > /dev/null 2>&1; then
python="python3"
pip="pip3"
else
@@ -72,7 +72,7 @@ function command_start() {
}
function command_exists() {
if command -v "$1" >/dev/null 2>&1; then
if command -v "$1" > /dev/null 2>&1; then
timestamp "Command $1 has been found"
else
err "Command $1 has been NOT found"
@@ -94,6 +94,13 @@ function update_pip() {
function install_neovim_module_for_python() {
# Python module in neovim
$pip install pynvim neovim imps $PIPEXTPRE
# Ruby module for neovim
gem install solargraph
# Node module for neovim
npm install @github/copilot-language-server -g --force
npm install tree-sitter-cli -g --force
}
function install_node() {
@@ -459,47 +466,42 @@ function install_brew_programs() {
while IFS='' read -r line; do LIST_OF_PROGRAMS_CASK+=("$line"); done < <(cat "$HOME"/.brew_programs_cask)
while IFS='' read -r line; do LIST_OF_PROGRAMS_DISABLE+=("$line"); done < <(cat "$HOME"/.brew_programs_disable)
timestamp "Installing brew programs"
for i in "${LIST_OF_PROGRAMS[@]}"; do
if [[ ! " ${INSTALLED_PROGRAMS[*]} " =~ ${i} ]] &&
[[ ! " ${LIST_OF_PROGRAMS_DISABLE[*]} " =~ ${i} ]]; then
timestamp "Installing the $i brew program"
brew install $i --force
if $? -ne 0; then
err "Failed to install the $i brew program"
fi
fi
done
timestamp "Installing brew cask programs"
for i in "${LIST_OF_PROGRAMS_CASK[@]}"; do
if [[ ! " ${INSTALLED_PROGRAMS[*]} " =~ ${i} ]] &&
[[ ! " ${LIST_OF_PROGRAMS_DISABLE[*]} " =~ ${i} ]]; then
timestamp "Installing the $i brew cask program"
brew install $i --cask --force
fi
done
xattr -r -d com.apple.quarantine /Applications/Spotify.app
xattr -r -d com.apple.quarantine /Applications/Stats.app
xattr -r -d com.apple.quarantine /opt/homebrew/bin/mpv /Applications/mpv.app
duti -s io.mpv avi all
duti -s io.mpv mkv all
duti -s io.mpv mp4 all
duti -s io.mpv ts all
xattr -r -d com.apple.quarantine /Applications/qView.app
duti -s com.interversehq.qView public.jpeg all
duti -s com.interversehq.qView public.png all
duti -s com.interversehq.qView com.compuserve.gif all
duti -s com.interversehq.qView public.tiff all
xattr -r -d com.apple.quarantine /Applications/chatterino.app
brew cleanup --prune=all
}
function install_winbox_old() {
curl -o /tmp/winbox64.exe \
"$(curl --silent https://mikrotik.com/download | grep -o 'https:\/\/download.*winbox64.exe')"
mv -v /tmp/winbox64.exe ~/Applications/winbox.exe
xattr -cr ~/Applications/winbox.exe
}
function install_prettier() {
$install prettier
$install prettierd
@@ -587,23 +589,27 @@ function install_font_terminess() {
fi
}
function update_zsh() {
omz update
}
function main() {
# command_start update_pip
# command_start install_neovim_module_for_python
# command_start install_node
# command_start install_go
# # command_start install_pyright
# command_start install_mdformat
# command_start install_ruff
# command_start install_lazy
# command_start install_dlv
# command_start install_bash-language-server
# command_start install_yaml-language-server
# command_start install_marksman
# command_start install_shfmt
# command_start install_shellcheck
# command_start install_gopls
# # command_start install_terraform
command_start update_pip
command_start install_neovim_module_for_python
command_start install_node
command_start install_go
# command_start install_pyright
command_start install_mdformat
command_start install_ruff
command_start install_lazy
command_start install_dlv
command_start install_bash-language-server
command_start install_yaml-language-server
command_start install_marksman
command_start install_shfmt
command_start install_shellcheck
command_start install_gopls
# command_start install_terraform
command_start install_terraform_stable
command_start install_terragrunt
command_start install_azure_cli
@@ -623,13 +629,13 @@ function main() {
command_start install_precommit
command_start install_streamlink
command_start install_fzf
command_start install_winbox_old
command_start install_prettier
command_start install_google_cloud_sdk
command_start install_bgpreader
command_start install_font_terminess
command_start install_zsh_addons
command_start install_brew_programs
command_start update_zsh
}
main

7
.zshrc
View File

@@ -16,6 +16,10 @@ gbranch() {
echo -e "$(git branch "$@")"
}
dt() {
date +"%Y%m%d%H%M%S"
}
[ -f /etc/gentoo-release ] && export ZSH="/usr/share/zsh/site-contrib/oh-my-zsh"
[ -f /etc/centos-release ] && export ZSH="$HOME/.oh-my-zsh"
[ -f /etc/debian_version ] && export ZSH="$HOME/.oh-my-zsh"
@@ -168,6 +172,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
alias sleep-lid-on="sudo pmset -b sleep 5; sudo pmset -b disablesleep 0"
alias restart-network-share="sudo pkill -i netauthsysagent"
alias streamlink="streamlink --config $HOME/.config/streamlink/config"
alias powershell="pwsh"
# Terraform
export TFENV_ARCH=amd64
@@ -229,7 +234,7 @@ alias neofetch=fastfetch
[ -f $(which zoxide) ] && {eval "$(zoxide init zsh)"; alias cd='z'}
# GoLang
alias go-mod="go mod edit -go=$(go version | grep -oE 'go[0-9]*\.[0-9]*\.[0-9]*' | sed 's/go//g'); go get -u; go mod verify; go get -x -v; go mod verify; go mod tidy"
alias go-mod="go mod edit -go=$(go version | grep -oE 'go[0-9]*\.[0-9]*\.[0-9]*' | sed 's/go//g'); go get -u ./... ; go mod verify; go get -x -v; go mod verify; go mod tidy"
# Resolve problem with - zsh: no matches found
setopt +o nomatch