.config/X11/runonce

@@ -1,5 +1,4 @@
 clipmenud &
 flameshot &
-easyeffects --gapplication-service &
 
 # vim: ft=sh

.config/alacritty/alacritty.toml

@@ -56,7 +56,8 @@ bindings = [
     {key = "Slash", mods = "Control", chars = "\u001f"},
     {key = "Space", mods = "Control", chars = "\u0000"},
     {key = "Back",  mods = "Control", chars = "\u001b\u007f"},
-    {key = "M",     mods = "Control", chars = "\u0100"}
+    {key = "M",     mods = "Control", chars = "\u0100"},
+    {key = "х",     mods = "Control", chars = "\u001b"},
 ]
 
 [general]

.config/nvim/lazy-lock.json

@@ -1,41 +1,43 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
+  "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" },
   "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
-  "bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "iptables": { "branch": "master", "commit": "0d18b1e468f547dd7e2c494d42bc134a1e0eac7e" },
-  "lazy.nvim": { "branch": "main", "commit": "656cf4309396b7b8b62984e923bf8d8a0013f7d7" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
+  "multilayout.nvim": { "branch": "main", "commit": "613ec4ace9097a4464a558777aaf6a15b3d8bd78" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
-  "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" },
+  "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
   "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
-  "nvim-lspconfig": { "branch": "master", "commit": "47f236c058f0511702286a21ba53bbf42abbd8a8" },
-  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
-  "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
-  "nvim-tree.lua": { "branch": "master", "commit": "375e38673b5c61debd8074ced01cfd4f3b7ce1e9" },
-  "nvim-treesitter": { "branch": "master", "commit": "894cb3cebbad0535fb4e319ada5d875dbc48d8b9" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "b9e30333ece125297cfc5d652465cbc9a23b4916" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
-  "nvim-web-devicons": { "branch": "master", "commit": "87c34abe5d1dc7c1c0a95aaaf888059c614c68ac" },
-  "onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" },
+  "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
+  "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" },
+  "nvim-tree.lua": { "branch": "master", "commit": "e7d1b7dadc62fe2eccc17d814354b0a5688621ce" },
+  "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "5c48b8ba1b0b7b25feb6e34e7eb293ea893aedc4" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e3be38005e9673d044e994b1e4b123adb040179" },
+  "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" },
+  "onedark.nvim": { "branch": "master", "commit": "11de4da47f3e69cb70c3ae9816bd8af166cbe121" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "quickfix-reflector.vim": { "branch": "master", "commit": "6a6a9e28e1713b9e9db99eec1e6672e5666c01b9" },
   "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "vim-bbcode": { "branch": "master", "commit": "6fb28c6deae5844ee2bf0b97ef2fea04bd3d4eac" },
   "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" },
-  "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" },
+  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
+  "vim-nftables": { "branch": "master", "commit": "26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff" },
   "vim-peekaboo": { "branch": "master", "commit": "cc4469c204099c73dd7534531fa8ba271f704831" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }
 }

.config/nvim/lua/config/options.lua

@@ -34,3 +34,5 @@ vim.o.timeoutlen = 300
 
 vim.o.splitbelow = true
 vim.o.splitright = true
+
+vim.diagnostic.config({ virtual_text = true })

.config/nvim/lua/lsp/init.lua

@@ -1,23 +1,24 @@
 local servers = {
+    ansiblels = {},
     bashls = {},
-    cmake = {},
     clangd = {},
+    cmake = {},
     eslint = {},
     gopls = {},
     hls = {},
     jdtls = {},
+    jsonls = {},
     kotlin_language_server = {},
     lua_ls = require('lsp.lua_ls'),
     pyright = {},
     ruby_lsp = {},
     rust_analyzer = {},
+    svls = {},
     ts_ls = {},
     yamlls = require('lsp.yamlls'),
-    jsonls = {},
-    svls = {}
 }
 
-vim.lsp.set_log_level("debug")
+vim.lsp.set_log_level('info')
 
 local on_attach = function(_, bufnr)
     local nmap = function(keys, func)

.config/nvim/lua/plugins/init.lua

@@ -2,6 +2,7 @@ return {
     'isobit/vim-caddyfile',
     'rcarriga/nvim-notify',
     'stefandtw/quickfix-reflector.vim',
+    'nfnty/vim-nftables',
     'tpope/vim-fugitive',
     'junegunn/vim-peekaboo',
     'tpope/vim-sleuth',
@@ -15,4 +16,33 @@ return {
     -- { 'wakatime/vim-wakatime', event = 'VeryLazy' },
     { 'williamboman/mason.nvim', opts = {} },
     'Winseven4lyf/vim-bbcode',
+
+
+    { 'mrsobakin/multilayout.nvim' , opts = {
+        layouts = {
+            ru = {
+                -- Names of this layout, as `libukb` reports.
+                names = { "Russian" },
+                from  = [[ёйцукенгшщзхъфывапролджэячсмитьбю.Ё"№;:?ЙЦУКЕНГШЩЗХЪ/ФЫВАПРОЛДЖЭЯЧСМИТЬБЮ,]],
+                to    = [[`qwertyuiop[]asdfghjkl;'zxcvbnm,./~@#$^&QWERTYUIOP{}|ASDFGHJKL:"ZXCVBNM<>?]],
+            }
+        },
+        aliases = {
+            -- Maximum length of default commands aliases.
+            -- Increasing this value leads to longer startup times.
+            max_length = 2,
+            -- Extra commands that you want to alias.
+            -- They are aliased regardless of `max_length`.
+            extra = { "sort" },
+        },
+        -- Whether to use `libukb`. If this is set to false, `langmap`
+        -- won't automatically switch when your layout does.
+        use_libukb = true,
+        -- Path to the `libukb.so`. If `nil`, ukb will be automatically
+        -- downloaded, builded and installed in the neovim data directory.
+        libukb_path = nil,
+        -- Function of type `callback(layout: string)`. Called whenever
+        -- current keyboard layout changes.
+        callback = nil,
+    }}
 }

.config/zsh/.zshenv

@@ -43,12 +43,15 @@ GNUPGHOME='~/.local/share/gnupg'
 GOPATH="${HOME}/.local/share/go"
 GPG_TTY="$(tty)"
 JAVA_HOME="/usr/lib/jvm/java-23-openjdk"
-LESS="--wheel-lines 3 --mouse"
+LESS="-x4 --wheel-lines 3 --mouse"
 MANPAGER="sh -c 'col -bx | bat -l man -p --theme Monokai\ Extended'"
 MANROFFOPT="-c"
 MTR_OPTIONS="-t"
 SSH_ASKPASS="${HOME}/.local/bin/scripts/pinentry-askpass"
 SUDO_ASKPASS="${HOME}/.local/bin/scripts/dmenu-askpass"
 GRADLE_USER_HOME="${HOME}/.local/share/gradle"
+DOCKER_CONFIG="${HOME}/.local/share/docker"
+COMPOSE_BAKE=true
+GIT_DISCOVERY_ACROSS_FILESYSTEM=1
 
 set +a

.config/zsh/.zshrc

@@ -1,5 +1,7 @@
 . ~/.config/zsh/modes.sh
 
+fpath=($HOME/.local/share/completions $fpath)
+
 # ls colors
 eval "$(dircolors -b)"
 
@@ -51,7 +53,8 @@ PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magent
 
 
 # ls aliases
-alias ls="lsd --color=auto"
+alias ls="/usr/bin/lsd --color=always --icon=always"
+alias lsd='/usr/bin/ls'
 alias l="ls -lh"
 alias la="ls -lah"
 alias ll="ls -lh"
@@ -77,25 +80,28 @@ alias ..............="cd ../../../../../../../../../../../../../"
 alias ...............="cd ../../../../../../../../../../../../../../"
 
 # aliases
-alias rz="exec zsh"
-alias venv="source src_venv"
-alias ex="source src_example"
-alias ap="source src_add_path"
-alias info="pinfo "
-alias bat="bat "
-alias img="nsxiv "
-alias xclip="xclip -selection clipboard"
-alias d="diff --color -u "
-alias rgf="rg --files | rg "
-alias 7z="7zz" # for whatever reason 7z provides 7zz binary in debian
-alias wt="watch --color -d -cn 0.1 "
-alias .e="set -a && source .env && set +a"
-alias vimu="vim -u /dev/null"
+alias sudo='sudo ' # allow aliases with sudo
+alias rz='exec zsh'
+alias venv='source src_venv'
+alias ex='source src_example'
+alias ap='source src_add_path'
+alias info='pinfo'
+alias bat='bat '
+alias img='nsxiv'
+alias xclip='xclip -selection clipboard'
+alias xxclip='head -c-1 | xclip -selection clipboard'
+alias rgf='rg --files | rg'
+alias wt='watch --color -d -cn 0.1 '
+alias .e='set -a && source .env && set +a'
+alias vimu='vim -u /dev/null'
 alias reswap="sudo bash -c 'echo Working...; swapoff /swapfile && sudo swapon /swapfile'"
 alias make="make -j$(nproc)"
-alias py="python3"
-alias neofetch="fastfetch"
-alias open="xdg-open"
+alias py='python3'
+alias neofetch='fastfetch'
+alias open='xdg-open'
+alias m.='if mount | grep -q "$(pwd)"; then umount -l .; cd .; else mount .; cd .; fi'
+alias rs='stow -R .'
+alias sst='ssh -t'
 
 # function aliases
 bl()     { brightnessctl set "$1"% > /dev/null; }
@@ -103,15 +109,17 @@ nosw()   { alacritty --class 'noswallow' -e "$@"; }; compdef _command nosw
 t()      { taskell "${1:-${HOME}/.taskell.md}"; }
 vims()   { filepath="$(type "$1" | rev | cut -d ' ' -f 1 | rev)"; [ $? -eq 0 ] && vim "${filepath}"; }; compdef _command vims
 tl()     { tree -C "$@" | bat }; compdef _tree tl
+diff()   { /usr/bin/diff --color -u "$@" | delta; }; compdef _files di
 
 # compdef
 compdef -a '_git; _git-commit' gdc # todo
 compdef '_files -g "*.md"' md
+compdef _ollama ollama
 
 # git aliases
 gl() { git log --decorate "$@" | bat }; compdef '_git; _git-log' gl
 gus() { git branch --set-upstream-to="${1:?}/${2:?}" "${2:?}"}; compdef '_git; _git-push' gus
-gpo() { git push --set-upstream origin ${1:-$(git rev-parse --abbrev-ref HEAD)}}
+gpo() { git push --set-upstream origin "$(git rev-parse --abbrev-ref HEAD)" "$@"}
 alias ga="git add"
 alias gb="git branch"
 alias gc="git commit"
@@ -120,6 +128,8 @@ alias gck="git checkout"
 alias gcl="git clone"
 alias gcls="git clone --depth=1"
 alias gcm="git commit --allow-empty-message -m ''"
+alias gcd='git commit --no-gpg-sign'
+alias gcmd="git commit --allow-empty-message -m '' --no-gpg-sign"
 alias gcn="git clean"
 alias gcp="git cherry-pick"
 alias gd="git diff"
@@ -137,6 +147,8 @@ alias grjs="git rebase --cancel"
 alias grm="git remote"
 alias grs="git restore --staged"
 alias grt="git reset"
+alias gsm='git submodule'
+alias grc='git rm --cached'
 alias gs="git status"
 alias gsc="git switch -c"
 alias gsh="git show"
@@ -146,9 +158,18 @@ alias gt="git tag"
 alias gus="git fetch --unshallow"
 
 # docker aliases
-alias dc="docker compose"
-alias docker!="DOCKER_HOST=ssh://docker /usr/bin/docker"
-alias dc!="docker! compose"
+alias d='docker'
+alias dc='docker compose'
+alias d!='/usr/bin/docker'
+alias dc!='d! compose'
+
+alias dj='dc up -d --force-recreate'
+alias djl='dc up -d --force-recreate && dl'
+alias dl='dc logs -f'
+alias dk='dc down'
+alias dv='d volume'
+alias di='d image'
+alias dr='d run --rm -it'
 
 # tmux stuff
 tn() { tmux new-session -s "${1-"$(basename "$(pwd)")"}" }
@@ -158,4 +179,6 @@ alias ta="tmux a -t"
 stty -ixon
 
 # print tasks on startup
-cat ~/.taskell.md | grep -v '>.*'
+_ZSH_TODO_FILE="${HOME}/todo.md"
+[ -f "$_ZSH_TODO_FILE" ] && { bat --color=always -p "$_ZSH_TODO_FILE" | grep -v '>.*'; }
+unset _ZSH_TODO_FILE

.config/zsh/modes/cpp.sh

@@ -10,9 +10,9 @@ cpp_mode::find_exec() {
 }
 
 ct() {
-    eval "$(cpp_mode::find_exec "tests")"
+    "$(cpp_mode::find_exec "tests")"
 }
 
 cr() {
-    eval "$(cpp_mode::find_exec)"
+    "$(cpp_mode::find_exec)"
 }