diff --git a/.config/X11/runonce b/.config/X11/runonce
index da1241b..e553fae 100755
--- a/.config/X11/runonce
+++ b/.config/X11/runonce
@@ -1,3 +1,5 @@
 flameshot &
+xkb-listen &
+picom --config "$HOME/.config/picom.conf" &
 
 # vim: ft=sh
diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore
index 9bbbeea..d0369db 100644
--- a/.config/nvim/.gitignore
+++ b/.config/nvim/.gitignore
@@ -1 +1,3 @@
 .luarc.json
+lazy-lock.json
+
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
deleted file mode 100644
index d80f1e0..0000000
--- a/.config/nvim/lazy-lock.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" },
-  "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
-  "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "iptables": { "branch": "master", "commit": "0d18b1e468f547dd7e2c494d42bc134a1e0eac7e" },
-  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
-  "lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" },
-  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
-  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
-  "multilayout.nvim": { "branch": "main", "commit": "105f22f6329f19a1824f58774d1899f2a69a5e77" },
-  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
-  "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-dap": { "branch": "master", "commit": "4c0e3a98465fac963dfde898cc8b878094153a43" },
-  "nvim-java": { "branch": "main", "commit": "3d56b7461facb42f135e25b2636bf220a7f0ed42" },
-  "nvim-java-core": { "branch": "main", "commit": "229ebcdfa33c75cf746f97c46c2893b2de3626e5" },
-  "nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" },
-  "nvim-java-refactor": { "branch": "main", "commit": "b51a57d862338999059e1d1717df3bc80a3a15c0" },
-  "nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" },
-  "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
-  "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" },
-  "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
-  "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
-  "nvim-tree.lua": { "branch": "master", "commit": "68c67adfabfd1ce923839570507ef2e81ab8a408" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "660861b1849256398f70450afdf93908d28dc945" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
-  "nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" },
-  "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
-  "onedark.nvim": { "branch": "master", "commit": "918e89e6993b2901eea47b9f4eb666d53c2542a6" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
-  "quickfix-reflector.vim": { "branch": "master", "commit": "6a6a9e28e1713b9e9db99eec1e6672e5666c01b9" },
-  "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" },
-  "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
-  "vim-bbcode": { "branch": "master", "commit": "6fb28c6deae5844ee2bf0b97ef2fea04bd3d4eac" },
-  "vim-caddyfile": { "branch": "master", "commit": "6d60d5af0d73f20b88ec388a9d70188d55ed8223" },
-  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
-  "vim-nftables": { "branch": "master", "commit": "26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff" },
-  "vim-peekaboo": { "branch": "master", "commit": "2a8a3187ba6b15201b2563a3f0331fcdf49da36c" },
-  "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
-  "vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" }
-}
diff --git a/.config/nvim/lua/plugins/multilayout.lua b/.config/nvim/lua/plugins/multilayout.lua
index 6220119..cc25f9a 100644
--- a/.config/nvim/lua/plugins/multilayout.lua
+++ b/.config/nvim/lua/plugins/multilayout.lua
@@ -1,5 +1,6 @@
 return {
     'mrsobakin/multilayout.nvim',
+    cond = vim.env.DISPLAY ~= nil,
     opts = {
         layouts = {
             ru = {
diff --git a/.config/nvim/lua/plugins/theme.lua b/.config/nvim/lua/plugins/theme.lua
index e8b19e9..97dd2bb 100644
--- a/.config/nvim/lua/plugins/theme.lua
+++ b/.config/nvim/lua/plugins/theme.lua
@@ -1,5 +1,6 @@
 return {
     'navarasu/onedark.nvim',
+    version='v0.1.0',
     config = function()
         require('onedark').setup {
             style = 'darker',
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 77228fc..fcdfde5 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -9,6 +9,8 @@ eval "$(dircolors -b)"
 HISTSIZE=10000000
 SAVEHIST=10000000
 HISTFILE="${HOME}/.cache/zsh_history"
+alias history='history 1000000000000000'
+alias hist='history'
 
 setopt hist_expire_dups_first
 setopt hist_ignore_dups
@@ -95,7 +97,7 @@ alias xcp='perl -pe "chomp if eof" | 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 vimu='vim -n -u NONE -i NONE -N --noplugin'
 alias reswap="sudo bash -c 'echo Working...; swapoff /swapfile && sudo swapon /swapfile'"
 alias make="make -j$(nproc)"
 alias py='python3'
@@ -107,8 +109,10 @@ alias rs='stow -R .'
 alias sst='ssh -t'
 alias rdj='rmdir ./*'
 alias qr='qrencode -t ansiutf8'
+alias rgi='rg --no-ignore --hidden'
 
 # function aliases
+mkexe()  { touch "${1?}"; chmod +x "$1"; }; compdef _files mkexe;
 bl()     { brightnessctl set "$1"% > /dev/null; }
 nosw()   { alacritty --class 'noswallow' -e "$@"; }; compdef _command nosw
 vims()   { filepath="$(type "$1" | rev | cut -d ' ' -f 1 | rev)"; [ $? -eq 0 ] && vim "${filepath}"; }; compdef _command vims
diff --git a/.local/bin/scripts/lock b/.local/bin/scripts/lock
new file mode 100755
index 0000000..70eebd1
--- /dev/null
+++ b/.local/bin/scripts/lock
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+pkill -0 picom || {
+  picom --config "$HOME/.config/picom.conf" &
+  disown -h %%
+  export START_PICOM=1
+}
+
+blank='00000000'
+hl='23232340'
+hl_red='5c222240'
+fg='#a0a0a0'
+
+i3lock \
+  -F \
+  -i "$HOME/.local/share/wallpaper/wallpaper_blur.png" \
+  -c '00000000' \
+  --clock \
+  --date-color=$fg \
+  --time-color=$fg \
+  --verif-color=$fg \
+  --wrong-color=$fg \
+  --bshl-color=$hl \
+  --inside-color=$blank \
+  --insidever-color=$blank \
+  --insidewrong-color=$blank \
+  --keyhl-color=$hl \
+  --line-uses-ring \
+  --ring-color=$blank \
+  --ringver-color=$blank \
+  --ringwrong-color=$hl_red \
+  --separator-color=$blank \
+  --date-str='%A %m/%d' \
+  --time-str='%H:%M' \
+  --time-size=82 \
+  --date-size=18 \
+  --wrong-size=56 \
+  --date-pos 'tx:ty+36' \
+  --verif-text='' \
+  --noinput-text='' \
+  --wrong-text='' \
+  --time-font="Mononoki Nerd Font Propo" \
+  --date-font="Mononoki Nerd Font Propo" \
+  --layout-font="Mononoki Nerd Font Propo" \
+  --verif-font="Mononoki Nerd Font Propo" \
+  --wrong-font="Mononoki Nerd Font Propo" \
+  --bar-color $blank \
+  --bar-base-width 2080 \
+  --bar-max-height 2080 \
+  --bar-step 0 \
+  --bar-count 1 \
+  --bar-periodic-step 2080 \
+  --bar-indicator \
+
+[ -n "$START_PICOM" ] && {
+  echo 'start'
+  (
+    for pid in $(pidof i3lock); do
+      tail --pid "$pid" -f /dev/null &
+    done
+    wait
+    pkill -INT picom
+  ) &
+  disown -h %%
+}
diff --git a/.local/bin/scripts/lock-suspend b/.local/bin/scripts/lock-suspend
new file mode 100755
index 0000000..51a0b37
--- /dev/null
+++ b/.local/bin/scripts/lock-suspend
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+pkill -0 i3lock || \
+    DISPLAY=:0 lock
+xkb-switch -s us
+systemctl suspend
diff --git a/.local/bin/scripts/unplug b/.local/bin/scripts/unplug
index 3fdf038..b4dea79 100755
--- a/.local/bin/scripts/unplug
+++ b/.local/bin/scripts/unplug
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 xr internal
-systemctl suspend
+lock-suspend
diff --git a/.local/bin/scripts/xkb-listen b/.local/bin/scripts/xkb-listen
new file mode 100755
index 0000000..89f303f
--- /dev/null
+++ b/.local/bin/scripts/xkb-listen
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+PIPE="$XDG_RUNTIME_DIR/layout"
+
+update() {
+    xkb-switch > "$PIPE"
+    pkill -38 dwmblocks
+}
+
+update
+while :; do
+    xkb-switch -w
+    update
+done
diff --git a/.local/bin/statusbar/sb-layout b/.local/bin/statusbar/sb-layout
new file mode 100755
index 0000000..98b8932
--- /dev/null
+++ b/.local/bin/statusbar/sb-layout
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+PIPE="$XDG_RUNTIME_DIR/layout"
+[ -f "$PIPE" ] && case "$(cat "$PIPE")" in
+    us) echo '';;
+    ru) echo '';;
+esac
diff --git a/.local/share/wallpaper/wallpaper_blur.png b/.local/share/wallpaper/wallpaper_blur.png
new file mode 100644
index 0000000..db862b2
Binary files /dev/null and b/.local/share/wallpaper/wallpaper_blur.png differ
diff --git a/.ssh/config b/.ssh/config
index fb67fd0..2b2cf5b 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -14,7 +14,7 @@ Host *.zvray.ru mx*.wzray.com
     Port 8022
 
 Host phone
-    User u0_a230
+    User u0_a247
     Port 8022
 
 Host laptop laptop.*.wzray.com