From ad8858050c502f91aaaa677c2acbae77caa8dc91 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 24 Dec 2023 09:15:41 +0300 Subject: [PATCH 01/16] Change keybinds, bar opacity, cursor accel, wrong theme, profile and zshrc Signed-off-by: Ivan Bushchik --- configs/.profile | 1 - configs/.zshrc | 1 - configs/sway/config | 10 ++++++---- configs/sway/themes/catppuccin-macchiato | 2 +- configs/waybar/style.css | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/.profile b/configs/.profile index 99b83e1..e18c38f 100644 --- a/configs/.profile +++ b/configs/.profile @@ -7,4 +7,3 @@ export MOZ_DBUS_REMOTE=1 export QT_QPA_PLATFORMTHEME=qt5ct export XDG_CURRENT_DESKTOP=Unity export HOMEBREW_NO_ENV_HINTS=false -. "$HOME/.cargo/env" diff --git a/configs/.zshrc b/configs/.zshrc index 2e2a084..55d9f98 100644 --- a/configs/.zshrc +++ b/configs/.zshrc @@ -52,7 +52,6 @@ alias ltcp="cp ~/.dotfiles/latex_template/{macros,preamble,template,letterfonts} alias jekyll_export="jekyll b -d ./_archive && cd _archive && tar cf ../site.tar ./ && cd .. && gzip -9 -f site.tar && rm -rf _archive" alias rebuild="sudo nixos-rebuild switch --flake path:/etc/nixos --impure" alias drebuild="darwin-rebuild switch --flake path:$HOME/my/nixos" -alias activate_brew_x86_64="eval \"$(/usr/local/bin/brew shellenv)\"" alias flushdnsx="sudo killall -HUP mDNSResponder" alias rsync_music="rsync Music/Music/Media.localized/Music server.local:~/Music/Media.localized/ -av" diff --git a/configs/sway/config b/configs/sway/config index 85c6d84..40b3995 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -17,13 +17,15 @@ input type:keyboard { } input type:touchpad { - tap enabled + tap disabled dwt disabled natural_scroll enabled } input "1452:849:Apple_MTP_multi-touch" { scroll_factor 0.25 + accel_profile adaptive + pointer_accel 0.1 } exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK @@ -59,12 +61,12 @@ bindsym $mod+Shift+BackSpace exec killall -s SIGINT wf-recorder # Symbols bind bindsym $mod+Return exec $term -bindsym $mod+Shift+f exec $filemgr +bindsym $mod+Shift+e exec $filemgr bindsym $mod+Shift+q kill bindsym $mod+d exec $menu floating_modifier $mod normal bindsym $mod+Shift+c reload -bindsym $mod+Shift+e exec swaynag -f 'JetBrains Mono 9' -e bottom -t warning -m "What would you like to do?" -B 'Exit sway' 'swaymsg exit' -B 'Power off' 'systemctl poweroff' -B 'Reboot' 'systemctl reboot' -B 'Lock screen' '$HOME/.config/sway/lock.sh' +bindsym $mod+Shift+Escape exec swaynag -f 'JetBrains Mono 9' -e bottom -t warning -m "What would you like to do?" -B 'Exit sway' 'swaymsg exit' -B 'Power off' 'systemctl poweroff' -B 'Reboot' 'systemctl reboot' -B 'Lock screen' '$HOME/.config/sway/lock.sh' bindsym $mod+$left focus left bindsym $mod+$down focus down bindsym $mod+$up focus up @@ -109,7 +111,7 @@ bindsym $mod+s layout stacking bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split bindsym $mod+f fullscreen -bindsym $mod+Shift+space floating toggle +bindsym $mod+Shift+f floating toggle bindsym $mod+space focus mode_toggle bindsym $mod+a focus parent bindsym $mod+Shift+minus move scratchpad diff --git a/configs/sway/themes/catppuccin-macchiato b/configs/sway/themes/catppuccin-macchiato index 44b4672..9fde705 100644 --- a/configs/sway/themes/catppuccin-macchiato +++ b/configs/sway/themes/catppuccin-macchiato @@ -2,7 +2,7 @@ seat seat0 xcursor_theme "Catppuccin-Macchiato-Dark-Cursors" set $gnome-schema org.gnome.desktop.interface exec_always { - gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato-Standard-Blue-dark' + gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato-Standard-Blue-Dark' gsettings set $gnome-schema icon-theme 'Mint-Y-Blue' gsettings set $gnome-schema cursor-theme 'Catppuccin-Macchiato-Dark-Cursors' gsettings set $gnome-schema font-name 'Ubuntu 9' diff --git a/configs/waybar/style.css b/configs/waybar/style.css index 966dbe5..a8ef260 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -10,7 +10,7 @@ window#waybar { color: transparent; background: @base; - opacity: 0.75; + opacity: 0.85; padding-top: 0; padding-bottom: 0; margin-top: 8px; From f5cf58967771e310e7cb29804b99554384ded610 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Mon, 1 Jan 2024 16:58:33 +0300 Subject: [PATCH 02/16] Change sizes Signed-off-by: Ivan Bushchik --- configs/sway/config | 4 ++-- configs/waybar/config | 2 +- configs/waybar/style.css | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/sway/config b/configs/sway/config index 40b3995..c38c123 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -34,9 +34,9 @@ xwayland enable default_border pixel 1 gaps inner 8 -font "JetBrains Mono" 9 +font "JetBrains Mono" 11 -#output * scale 2 +output * scale 1.666 include ~/.config/sway/themes/catppuccin-macchiato diff --git a/configs/waybar/config b/configs/waybar/config index 2ed24e2..8309c87 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -1,5 +1,5 @@ { - "height": 32, + "height": 38, "position": "top", "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": [], diff --git a/configs/waybar/style.css b/configs/waybar/style.css index a8ef260..191f99b 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,7 +1,7 @@ @import "macchiato.css"; * { font-family: "JetBrains Mono", "Noto Sans"; - font-size: 7pt; + font-size: 8pt; border: none; font-weight: 400; padding: 1px 1px; @@ -10,7 +10,7 @@ window#waybar { color: transparent; background: @base; - opacity: 0.85; + opacity: 0.90; padding-top: 0; padding-bottom: 0; margin-top: 8px; @@ -39,7 +39,7 @@ button:hover { } .modules-left { - padding-left: 4px; + padding-left: 8px; border-radius: 8px; color: @text; } @@ -47,7 +47,7 @@ button:hover { transition: none; background: @base; color: @text; - padding-right: 4px; + padding-right: 8px; } #workspaces { @@ -58,7 +58,7 @@ button:hover { } #language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd, #custom-loadavg, #custom-uptime, #wireplumber { - padding: 0 4px; + padding: 0 8px; margin: 2 1px; background-color: @mantle; border-radius: 8px; @@ -82,5 +82,5 @@ label:focus { #language { padding: 0 4px; - min-width: 16px; + min-width: 24px; } From 4d868f534578b99dcbf3187263e868e4b72d2fcf Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Mon, 1 Jan 2024 17:10:43 +0300 Subject: [PATCH 03/16] sway/lock.sh: blur screen instead of plain color Signed-off-by: Ivan Bushchik --- configs/sway/lock.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/sway/lock.sh b/configs/sway/lock.sh index 323e27f..e75e3cd 100755 --- a/configs/sway/lock.sh +++ b/configs/sway/lock.sh @@ -1,10 +1,12 @@ #!/bin/sh # Times the screen off and puts it to background +grim /tmp/lockscreen.png && convert -filter Gaussian -resize 20% -blur 0x2.5 -resize 500% /tmp/lockscreen.png /tmp/lockscreen.png swayidle \ timeout 10 'swaymsg "output * dpms off" && brightnessctl -d kbd_backlight set 0%' \ resume 'swaymsg "output * dpms on"' \ - before-sleep 'swaylock -c 181924 --font JetBrains\ Mono' & + before-sleep 'swaylock -i /tmp/lockscreen --font JetBrains\ Mono' & # Locks the screen immediately -swaylock -c 181924 -s stretch --font JetBrains\ Mono +swaylock -i /tmp/lockscreen.png -s stretch --font JetBrains\ Mono # Kills last background task so idle timer doesn't keep running kill %% +rm /tmp/lockscreen.png From d706ad3a3bd9b871f1caff40c51f61265f72ece7 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Tue, 2 Jan 2024 16:05:01 +0300 Subject: [PATCH 04/16] Change waybar font size to 9pt Signed-off-by: Ivan Bushchik --- configs/waybar/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/waybar/style.css b/configs/waybar/style.css index 191f99b..2361109 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,7 +1,7 @@ @import "macchiato.css"; * { font-family: "JetBrains Mono", "Noto Sans"; - font-size: 8pt; + font-size: 9pt; border: none; font-weight: 400; padding: 1px 1px; From a13b0d425230661e1942484fcdfb5646abb4fddb Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Tue, 2 Jan 2024 17:05:24 +0300 Subject: [PATCH 05/16] Move zsh plugins and themes to .config/zsh for better home-manager dotfiles installation Signed-off-by: Ivan Bushchik --- configs/.zshrc | 2 +- tools/install.sh | 8 ++++---- tools/install_nix.sh | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/.zshrc b/configs/.zshrc index 55d9f98..90d933d 100644 --- a/configs/.zshrc +++ b/configs/.zshrc @@ -7,7 +7,7 @@ function reset_broken_terminal () { printf '%b' '\e[0m\e(B\e)0\017\e[?5l\e7\e[0;0r\e8' } -export ZSH="$HOME/.dotfiles/zsh" +export ZSH="$HOME/.config/zsh" # Setup history diff --git a/tools/install.sh b/tools/install.sh index 6196b3e..18a2077 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -15,11 +15,11 @@ then echo "Aborting." exit 255 fi -mkdir -p $HOME/.dotfiles/zsh/{plugins,themes} -ZSH="$HOME/.dotfiles/zsh" +mkdir -p $HOME/.config/zsh/{plugins,themes} +ZSH="$HOME/.config/zsh" echo "Installing zsh theme and plugins" -curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.dotfiles/zsh/themes/ivabus.zsh-theme > /dev/null 2>&1 -git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.dotfiles/zsh/plugins/zsh-syntax-highlighting > /dev/null 2>&1 +curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.config/zsh/themes/ivabus.zsh-theme > /dev/null 2>&1 +git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.config/zsh/plugins/zsh-syntax-highlighting > /dev/null 2>&1 # installing vimplug curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim diff --git a/tools/install_nix.sh b/tools/install_nix.sh index fd39497..7466e0a 100755 --- a/tools/install_nix.sh +++ b/tools/install_nix.sh @@ -6,8 +6,8 @@ if [ ! -d $HOME/.config ]; then fi chmod +x $HOME/.dotfiles/tools/* $HOME/.dotfiles/tools/relink.sh -mkdir -p $HOME/.dotfiles/zsh/{plugins,themes} -curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.dotfiles/zsh/themes/ivabus.zsh-theme -git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.dotfiles/zsh/plugins/zsh-syntax-highlighting +mkdir -p $HOME/.config/zsh/{plugins,themes} +curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.config/zsh/themes/ivabus.zsh-theme +git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.config/zsh/plugins/zsh-syntax-highlighting curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim nvim -c :PlugInstall -c :q -c :q From 2dd19c5476c93dfd238964c1247dc2bc7500fdda Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Tue, 2 Jan 2024 17:32:14 +0300 Subject: [PATCH 06/16] Remove unwanted .profile Signed-off-by: Ivan Bushchik --- configs/sway/.profile | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 configs/sway/.profile diff --git a/configs/sway/.profile b/configs/sway/.profile deleted file mode 100644 index bfa8c02..0000000 --- a/configs/sway/.profile +++ /dev/null @@ -1,13 +0,0 @@ -. "$HOME/.cargo/env" -export QT_QPA_PLATFORMTHEME=qt5ct -export GPG_TTY=$(tty) - -export XDG_CURRENT_DESKTOP=sway -export BROWSER=firefox -export QT_QPA_PLATFORMTHEME=qt5ct -export ECORE_EVAS_ENGINE="wayland_egl" -export ELM_ACCEL="gl" -export MOZ_ENABLE_WAYLAND=1 -export MOZ_DBUS_REMOTE=1 -export GTK_CSD=0 - From 44e2576ecaed9e57879832a9e2025713dceb3df1 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Tue, 2 Jan 2024 17:35:31 +0300 Subject: [PATCH 07/16] Add home-manager example Signed-off-by: Ivan Bushchik --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf8ccd6..f315401 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,13 @@ curl iva.bz/d | sh Just run `upgrade_dotfiles` in your shell. Script will `git pull`, then relink old dotfiles, link new if needed and upgrade oh-my-zsh. +### Home-manager example + +See [ivabus/nixos/common/dotfiles.nix](https://github.com/ivabus/nixos/blob/master/common/dotfiles.nix) for example + # screenshot #![screenshot-2022-12-08_18-08-29](https://user-images.githubusercontent.com/71599788/206481983-5dac2d62-5aea-4ccf-990a-b9ee6d53422f.png) -[Repo Packages](https://ivabus.dev/pkgs), [AUR packages](https://ivabus.dev/aur). - ## Environment TODO: description From 325c752dba65f199348e41ad207c691aae77643e Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Tue, 2 Jan 2024 20:03:10 +0300 Subject: [PATCH 08/16] waybar: 'Bat' instead of 'Battery' Signed-off-by: Ivan Bushchik --- configs/waybar/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/waybar/config b/configs/waybar/config index 8309c87..d38d8a2 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -58,9 +58,9 @@ "interval": 1 }, "battery": { - "format": "Battery: {capacity}%", - "format-charging": "Battery: {capacity}% (charging)", - "format-plugged": "Battery: {capacity}% (plugged)", + "format": "Bat: {capacity}%", + "format-charging": "Bat: {capacity}% (charging)", + "format-plugged": "Bat: {capacity}% (plugged)", "interval": 10 }, "network": { From 95e9b384952a7933787a2882eef34c974fa21c75 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sat, 6 Jan 2024 10:40:23 +0300 Subject: [PATCH 09/16] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f315401..a23cbcd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ivabus-dotfiles +# My dotfiles Features: @@ -30,7 +30,8 @@ Just run `upgrade_dotfiles` in your shell. Script will `git pull`, then relink o See [ivabus/nixos/common/dotfiles.nix](https://github.com/ivabus/nixos/blob/master/common/dotfiles.nix) for example # screenshot -#![screenshot-2022-12-08_18-08-29](https://user-images.githubusercontent.com/71599788/206481983-5dac2d62-5aea-4ccf-990a-b9ee6d53422f.png) + +![screenshot-2024-01-06_10-36-35](https://github.com/ivabus/dotfiles/assets/71599788/07d6864e-6982-4137-b51e-e126235c0710) ## Environment From 193009cfa9a4cbc5c02f6b045a78bfcd403e5640 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sat, 6 Jan 2024 13:26:33 +0300 Subject: [PATCH 10/16] configs/.zshrc: add restart_audio and start_airplay alias Signed-off-by: Ivan Bushchik --- configs/.zshrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/.zshrc b/configs/.zshrc index 90d933d..eaf4d40 100644 --- a/configs/.zshrc +++ b/configs/.zshrc @@ -53,7 +53,9 @@ alias jekyll_export="jekyll b -d ./_archive && cd _archive && tar cf ../site.tar alias rebuild="sudo nixos-rebuild switch --flake path:/etc/nixos --impure" alias drebuild="darwin-rebuild switch --flake path:$HOME/my/nixos" alias flushdnsx="sudo killall -HUP mDNSResponder" -alias rsync_music="rsync Music/Music/Media.localized/Music server.local:~/Music/Media.localized/ -av" +alias restart_audio="systemctl --user restart pipewire.service pipewire-pulse.service wireplumber.service" +# 2340x2340 - max res for iPhone 13 mini +alias start_airplay="uxplay -p -vs waylandsink -n $(hostname) -nh -fps 60 -s 2340x2340@60" # ffmpeg section From 52d265e77d37811b9b067187b6a91ee8a22dbff5 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sat, 6 Jan 2024 16:12:12 +0300 Subject: [PATCH 11/16] configs/sway: remove keymap.xkb (unnecessary) Signed-off-by: Ivan Bushchik --- configs/sway/keymap.xkb | 1685 --------------------------------------- 1 file changed, 1685 deletions(-) delete mode 100644 configs/sway/keymap.xkb diff --git a/configs/sway/keymap.xkb b/configs/sway/keymap.xkb deleted file mode 100644 index 5cc7d8a..0000000 --- a/configs/sway/keymap.xkb +++ /dev/null @@ -1,1685 +0,0 @@ -xkb_keymap { -xkb_keycodes "(unnamed)" { - minimum = 8; - maximum = 255; - = 9; - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 18; - = 19; - = 20; - = 21; - = 22; - = 23; - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - = 33; - = 34; - = 35; - = 36; - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 49; - = 50; - = 51; - = 52; - = 53; - = 54; - = 55; - = 56; - = 57; - = 58; - = 59; - = 60; - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - = 74; - = 75; - = 76; - = 77; - = 78; - = 79; - = 80; - = 81; - = 82; - = 83; - = 84; - = 85; - = 86; - = 87; - = 88; - = 89; - = 90; - = 91; - = 92; - = 94; - = 95; - = 96; - = 97; - = 98; - = 99; - = 100; - = 101; - = 102; - = 103; - = 104; - = 105; - = 106; - = 107; - = 108; - = 109; - = 110; - = 111; - = 112; - = 113; - = 114; - = 115; - = 116; - = 117; - = 118; - = 119; - = 120; - = 121; - = 122; - = 123; - = 124; - = 125; - = 126; - = 127; - = 128; - = 129; - = 130; - = 131; - = 132; - = 133; - = 134; - = 135; - = 136; - = 137; - = 138; - = 139; - = 140; - = 141; - = 142; - = 143; - = 144; - = 145; - = 146; - = 147; - = 148; - = 149; - = 150; - = 151; - = 152; - = 153; - = 154; - = 155; - = 156; - = 157; - = 158; - = 159; - = 160; - = 161; - = 162; - = 163; - = 164; - = 165; - = 166; - = 167; - = 168; - = 169; - = 170; - = 171; - = 172; - = 173; - = 174; - = 175; - = 176; - = 177; - = 178; - = 179; - = 180; - = 181; - = 182; - = 183; - = 184; - = 185; - = 186; - = 187; - = 188; - = 189; - = 190; - = 191; - = 192; - = 193; - = 194; - = 195; - = 196; - = 197; - = 198; - = 199; - = 200; - = 201; - = 202; - = 203; - = 204; - = 205; - = 206; - = 207; - = 208; - = 209; - = 210; - = 211; - = 212; - = 213; - = 214; - = 215; - = 216; - = 217; - = 218; - = 219; - = 220; - = 221; - = 222; - = 223; - = 224; - = 225; - = 226; - = 227; - = 228; - = 229; - = 230; - = 231; - = 232; - = 233; - = 234; - = 235; - = 236; - = 237; - = 238; - = 239; - = 240; - = 241; - = 242; - = 243; - = 244; - = 245; - = 246; - = 247; - = 248; - = 249; - = 250; - = 251; - = 252; - = 253; - = 254; - = 255; - indicator 1 = "Caps Lock"; - indicator 2 = "Num Lock"; - indicator 3 = "Scroll Lock"; - indicator 4 = "Compose"; - indicator 5 = "Kana"; - indicator 6 = "Sleep"; - indicator 7 = "Suspend"; - indicator 8 = "Mute"; - indicator 9 = "Misc"; - indicator 10 = "Mail"; - indicator 11 = "Charging"; - indicator 12 = "Shift Lock"; - indicator 13 = "Group 2"; - indicator 14 = "Mouse Keys"; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; -}; - -xkb_types "(unnamed)" { - - virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper; - - type "ONE_LEVEL" { - modifiers= none; - level_name[Level1]= "Any"; - }; - type "TWO_LEVEL" { - modifiers= Shift; - map[Shift]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - }; - type "ALPHABETIC" { - modifiers= Shift+Lock; - map[Shift]= Level2; - map[Lock]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Caps"; - }; - type "KEYPAD" { - modifiers= Shift+NumLock; - map[NumLock]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Number"; - }; - type "SHIFT+ALT" { - modifiers= Shift+Alt; - map[Shift+Alt]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift+Alt"; - }; - type "PC_SUPER_LEVEL2" { - modifiers= Mod4; - map[Mod4]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Super"; - }; - type "PC_CONTROL_LEVEL2" { - modifiers= Control; - map[Control]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Control"; - }; - type "PC_LCONTROL_LEVEL2" { - modifiers= LControl; - map[LControl]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "LControl"; - }; - type "PC_RCONTROL_LEVEL2" { - modifiers= RControl; - map[RControl]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "RControl"; - }; - type "PC_ALT_LEVEL2" { - modifiers= Alt; - map[Alt]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Alt"; - }; - type "PC_LALT_LEVEL2" { - modifiers= LAlt; - map[LAlt]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "LAlt"; - }; - type "PC_RALT_LEVEL2" { - modifiers= RAlt; - map[RAlt]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "RAlt"; - }; - type "CTRL+ALT" { - modifiers= Shift+Control+Alt+LevelThree; - map[Shift]= Level2; - preserve[Shift]= Shift; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - preserve[Shift+LevelThree]= Shift; - map[Control+Alt]= Level5; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "Ctrl+Alt"; - }; - type "LOCAL_EIGHT_LEVEL" { - modifiers= Shift+Lock+Control+LevelThree; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+Lock+LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level4; - map[Control]= Level5; - map[Shift+Lock+Control]= Level5; - map[Shift+Control]= Level6; - map[Lock+Control]= Level6; - map[Control+LevelThree]= Level7; - map[Shift+Lock+Control+LevelThree]= Level7; - map[Shift+Control+LevelThree]= Level8; - map[Lock+Control+LevelThree]= Level8; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Level3"; - level_name[Level4]= "Shift Level3"; - level_name[Level5]= "Ctrl"; - level_name[Level6]= "Shift Ctrl"; - level_name[Level7]= "Level3 Ctrl"; - level_name[Level8]= "Shift Level3 Ctrl"; - }; - type "THREE_LEVEL" { - modifiers= Shift+LevelThree; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Level3"; - }; - type "EIGHT_LEVEL" { - modifiers= Shift+LevelThree+LevelFive; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "EIGHT_LEVEL_ALPHABETIC" { - modifiers= Shift+Lock+LevelThree+LevelFive; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level4; - map[Shift+Lock+LevelThree]= Level3; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - map[Lock+LevelFive]= Level6; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - map[Lock+LevelThree+LevelFive]= Level8; - map[Shift+Lock+LevelThree+LevelFive]= Level7; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" { - modifiers= Shift+Lock+NumLock+LevelThree+LevelFive; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - preserve[Shift+LevelFive]= Shift; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - map[NumLock]= Level5; - map[Shift+NumLock]= Level6; - preserve[Shift+NumLock]= Shift; - map[NumLock+LevelThree]= Level7; - map[Shift+NumLock+LevelThree]= Level8; - map[Shift+NumLock+LevelFive]= Level2; - map[NumLock+LevelThree+LevelFive]= Level3; - map[Shift+NumLock+LevelThree+LevelFive]= Level4; - map[Shift+Lock]= Level2; - map[Lock+LevelThree]= Level3; - map[Shift+Lock+LevelThree]= Level4; - map[Lock+LevelFive]= Level5; - map[Shift+Lock+LevelFive]= Level6; - preserve[Shift+Lock+LevelFive]= Shift; - map[Lock+LevelThree+LevelFive]= Level7; - map[Shift+Lock+LevelThree+LevelFive]= Level8; - map[Lock+NumLock]= Level5; - map[Shift+Lock+NumLock]= Level6; - preserve[Shift+Lock+NumLock]= Shift; - map[Lock+NumLock+LevelThree]= Level7; - map[Shift+Lock+NumLock+LevelThree]= Level8; - map[Shift+Lock+NumLock+LevelFive]= Level2; - map[Lock+NumLock+LevelThree+LevelFive]= Level3; - map[Shift+Lock+NumLock+LevelThree+LevelFive]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" { - modifiers= Shift+Lock+NumLock+LevelThree+LevelFive; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - preserve[Shift+LevelFive]= Shift; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - map[NumLock]= Level5; - map[Shift+NumLock]= Level6; - preserve[Shift+NumLock]= Shift; - map[NumLock+LevelThree]= Level7; - map[Shift+NumLock+LevelThree]= Level8; - map[Shift+NumLock+LevelFive]= Level2; - map[NumLock+LevelThree+LevelFive]= Level3; - map[Shift+NumLock+LevelThree+LevelFive]= Level4; - map[Lock]= Level2; - map[Lock+LevelThree]= Level3; - map[Shift+Lock+LevelThree]= Level4; - map[Lock+LevelFive]= Level5; - map[Shift+Lock+LevelFive]= Level6; - map[Lock+LevelThree+LevelFive]= Level7; - map[Shift+Lock+LevelThree+LevelFive]= Level8; - map[Lock+NumLock]= Level5; - map[Shift+Lock+NumLock]= Level6; - map[Lock+NumLock+LevelThree]= Level7; - map[Shift+Lock+NumLock+LevelThree]= Level8; - map[Lock+NumLock+LevelFive]= Level2; - map[Lock+NumLock+LevelThree+LevelFive]= Level4; - map[Shift+Lock+NumLock+LevelThree+LevelFive]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "EIGHT_LEVEL_SEMIALPHABETIC" { - modifiers= Shift+Lock+LevelThree+LevelFive; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level3; - preserve[Lock+LevelThree]= Lock; - map[Shift+Lock+LevelThree]= Level4; - preserve[Shift+Lock+LevelThree]= Lock; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - map[Lock+LevelFive]= Level6; - preserve[Lock+LevelFive]= Lock; - map[Shift+Lock+LevelFive]= Level6; - preserve[Shift+Lock+LevelFive]= Lock; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - map[Lock+LevelThree+LevelFive]= Level7; - preserve[Lock+LevelThree+LevelFive]= Lock; - map[Shift+Lock+LevelThree+LevelFive]= Level8; - preserve[Shift+Lock+LevelThree+LevelFive]= Lock; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "FOUR_LEVEL" { - modifiers= Shift+LevelThree; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - }; - type "FOUR_LEVEL_ALPHABETIC" { - modifiers= Shift+Lock+LevelThree; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level4; - map[Shift+Lock+LevelThree]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - }; - type "FOUR_LEVEL_SEMIALPHABETIC" { - modifiers= Shift+Lock+LevelThree; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level3; - preserve[Lock+LevelThree]= Lock; - map[Shift+Lock+LevelThree]= Level4; - preserve[Shift+Lock+LevelThree]= Lock; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - }; - type "FOUR_LEVEL_MIXED_KEYPAD" { - modifiers= Shift+NumLock+LevelThree; - map[NumLock]= Level2; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[NumLock+LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Shift+NumLock+LevelThree]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Number"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - }; - type "FOUR_LEVEL_X" { - modifiers= Shift+Control+Alt+LevelThree; - map[LevelThree]= Level2; - map[Shift+LevelThree]= Level3; - map[Control+Alt]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Alt Base"; - level_name[Level3]= "Shift Alt"; - level_name[Level4]= "Ctrl+Alt"; - }; - type "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC" { - modifiers= Shift+Lock+LevelThree; - map[Shift]= Level2; - map[Lock]= Level4; - preserve[Lock]= Lock; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level3; - preserve[Lock+LevelThree]= Lock; - map[Shift+Lock+LevelThree]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "AltGr Base"; - level_name[Level4]= "Shift AltGr"; - }; - type "FOUR_LEVEL_PLUS_LOCK" { - modifiers= Shift+Lock+LevelThree; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock]= Level5; - map[Shift+Lock]= Level2; - map[Lock+LevelThree]= Level3; - map[Shift+Lock+LevelThree]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "Lock"; - }; - type "FOUR_LEVEL_KEYPAD" { - modifiers= Shift+NumLock+LevelThree; - map[Shift]= Level2; - map[NumLock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[NumLock+LevelThree]= Level4; - map[Shift+NumLock+LevelThree]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Number"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Alt Number"; - }; -}; - -xkb_compatibility "(unnamed)" { - - virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper; - - interpret.useModMapMods= AnyLevel; - interpret.repeat= False; - interpret.locking= False; - interpret ISO_Level2_Latch+Exactly(Shift) { - useModMapMods=level1; - action= LatchMods(modifiers=Shift,clearLocks,latchToLock); - }; - interpret Shift_Lock+AnyOf(Shift+Lock) { - action= LockMods(modifiers=Shift); - }; - interpret Num_Lock+AnyOf(all) { - virtualModifier= NumLock; - action= LockMods(modifiers=NumLock); - }; - interpret ISO_Level3_Shift+AnyOf(all) { - virtualModifier= LevelThree; - useModMapMods=level1; - action= SetMods(modifiers=LevelThree,clearLocks); - }; - interpret ISO_Level3_Latch+AnyOf(all) { - virtualModifier= LevelThree; - useModMapMods=level1; - action= LatchMods(modifiers=LevelThree,clearLocks,latchToLock); - }; - interpret ISO_Level3_Lock+AnyOf(all) { - virtualModifier= LevelThree; - useModMapMods=level1; - action= LockMods(modifiers=LevelThree); - }; - interpret Alt_L+AnyOf(all) { - virtualModifier= Alt; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Alt_R+AnyOf(all) { - virtualModifier= Alt; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Meta_L+AnyOf(all) { - virtualModifier= Meta; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Meta_R+AnyOf(all) { - virtualModifier= Meta; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Super_L+AnyOf(all) { - virtualModifier= Super; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Super_R+AnyOf(all) { - virtualModifier= Super; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Hyper_L+AnyOf(all) { - virtualModifier= Hyper; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Hyper_R+AnyOf(all) { - virtualModifier= Hyper; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Scroll_Lock+AnyOf(all) { - virtualModifier= ScrollLock; - action= LockMods(modifiers=modMapMods); - }; - interpret ISO_Level5_Shift+AnyOf(all) { - virtualModifier= LevelFive; - useModMapMods=level1; - action= SetMods(modifiers=LevelFive,clearLocks); - }; - interpret ISO_Level5_Latch+AnyOf(all) { - virtualModifier= LevelFive; - useModMapMods=level1; - action= LatchMods(modifiers=LevelFive,clearLocks,latchToLock); - }; - interpret ISO_Level5_Lock+AnyOf(all) { - virtualModifier= LevelFive; - useModMapMods=level1; - action= LockMods(modifiers=LevelFive); - }; - interpret Mode_switch+AnyOfOrNone(all) { - virtualModifier= AltGr; - useModMapMods=level1; - action= SetGroup(group=+1); - }; - interpret ISO_Level3_Shift+AnyOfOrNone(all) { - action= SetMods(modifiers=LevelThree,clearLocks); - }; - interpret ISO_Level3_Latch+AnyOfOrNone(all) { - action= LatchMods(modifiers=LevelThree,clearLocks,latchToLock); - }; - interpret ISO_Level3_Lock+AnyOfOrNone(all) { - action= LockMods(modifiers=LevelThree); - }; - interpret ISO_Group_Latch+AnyOfOrNone(all) { - virtualModifier= AltGr; - useModMapMods=level1; - action= LatchGroup(group=2); - }; - interpret ISO_Next_Group+AnyOfOrNone(all) { - virtualModifier= AltGr; - useModMapMods=level1; - action= LockGroup(group=+1); - }; - interpret ISO_Prev_Group+AnyOfOrNone(all) { - virtualModifier= AltGr; - useModMapMods=level1; - action= LockGroup(group=-1); - }; - interpret ISO_First_Group+AnyOfOrNone(all) { - action= LockGroup(group=1); - }; - interpret ISO_Last_Group+AnyOfOrNone(all) { - action= LockGroup(group=2); - }; - interpret KP_1+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+1); - }; - interpret KP_End+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+1); - }; - interpret KP_2+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+0,y=+1); - }; - interpret KP_Down+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+0,y=+1); - }; - interpret KP_3+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+1); - }; - interpret KP_Next+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+1); - }; - interpret KP_4+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+0); - }; - interpret KP_Left+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+0); - }; - interpret KP_6+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+0); - }; - interpret KP_Right+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+0); - }; - interpret KP_7+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=-1); - }; - interpret KP_Home+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=-1); - }; - interpret KP_8+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+0,y=-1); - }; - interpret KP_Up+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+0,y=-1); - }; - interpret KP_9+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=-1); - }; - interpret KP_Prior+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=-1); - }; - interpret KP_5+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default); - }; - interpret KP_Begin+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default); - }; - interpret KP_F2+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=1); - }; - interpret KP_Divide+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=1); - }; - interpret KP_F3+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=2); - }; - interpret KP_Multiply+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=2); - }; - interpret KP_F4+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=3); - }; - interpret KP_Subtract+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=3); - }; - interpret KP_Separator+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default,count=2); - }; - interpret KP_Add+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default,count=2); - }; - interpret KP_0+AnyOfOrNone(all) { - repeat= True; - action= LockPtrBtn(button=default,affect=lock); - }; - interpret KP_Insert+AnyOfOrNone(all) { - repeat= True; - action= LockPtrBtn(button=default,affect=lock); - }; - interpret KP_Decimal+AnyOfOrNone(all) { - repeat= True; - action= LockPtrBtn(button=default,affect=unlock); - }; - interpret KP_Delete+AnyOfOrNone(all) { - repeat= True; - action= LockPtrBtn(button=default,affect=unlock); - }; - interpret F25+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=1); - }; - interpret F26+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=2); - }; - interpret F27+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=-1); - }; - interpret F29+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=-1); - }; - interpret F31+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default); - }; - interpret F33+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+1); - }; - interpret F35+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+1); - }; - interpret Pointer_Button_Dflt+AnyOfOrNone(all) { - action= PtrBtn(button=default); - }; - interpret Pointer_Button1+AnyOfOrNone(all) { - action= PtrBtn(button=1); - }; - interpret Pointer_Button2+AnyOfOrNone(all) { - action= PtrBtn(button=2); - }; - interpret Pointer_Button3+AnyOfOrNone(all) { - action= PtrBtn(button=3); - }; - interpret Pointer_DblClick_Dflt+AnyOfOrNone(all) { - action= PtrBtn(button=default,count=2); - }; - interpret Pointer_DblClick1+AnyOfOrNone(all) { - action= PtrBtn(button=1,count=2); - }; - interpret Pointer_DblClick2+AnyOfOrNone(all) { - action= PtrBtn(button=2,count=2); - }; - interpret Pointer_DblClick3+AnyOfOrNone(all) { - action= PtrBtn(button=3,count=2); - }; - interpret Pointer_Drag_Dflt+AnyOfOrNone(all) { - action= LockPtrBtn(button=default,affect=both); - }; - interpret Pointer_Drag1+AnyOfOrNone(all) { - action= LockPtrBtn(button=1,affect=both); - }; - interpret Pointer_Drag2+AnyOfOrNone(all) { - action= LockPtrBtn(button=2,affect=both); - }; - interpret Pointer_Drag3+AnyOfOrNone(all) { - action= LockPtrBtn(button=3,affect=both); - }; - interpret Pointer_EnableKeys+AnyOfOrNone(all) { - action= LockControls(controls=MouseKeys); - }; - interpret Pointer_Accelerate+AnyOfOrNone(all) { - action= LockControls(controls=MouseKeysAccel); - }; - interpret Pointer_DfltBtnNext+AnyOfOrNone(all) { - action= SetPtrDflt(affect=button,button=+1); - }; - interpret Pointer_DfltBtnPrev+AnyOfOrNone(all) { - action= SetPtrDflt(affect=button,button=-1); - }; - interpret AccessX_Enable+AnyOfOrNone(all) { - action= LockControls(controls=AccessXKeys); - }; - interpret AccessX_Feedback_Enable+AnyOfOrNone(all) { - action= LockControls(controls=AccessXFeedback); - }; - interpret RepeatKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=RepeatKeys); - }; - interpret SlowKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=SlowKeys); - }; - interpret BounceKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=BounceKeys); - }; - interpret StickyKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=StickyKeys); - }; - interpret MouseKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=MouseKeys); - }; - interpret MouseKeys_Accel_Enable+AnyOfOrNone(all) { - action= LockControls(controls=MouseKeysAccel); - }; - interpret Overlay1_Enable+AnyOfOrNone(all) { - action= LockControls(controls=none); - }; - interpret Overlay2_Enable+AnyOfOrNone(all) { - action= LockControls(controls=none); - }; - interpret AudibleBell_Enable+AnyOfOrNone(all) { - action= LockControls(controls=AudibleBell); - }; - interpret Terminate_Server+AnyOfOrNone(all) { - action= Terminate(); - }; - interpret Alt_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Alt,clearLocks); - }; - interpret Alt_R+AnyOfOrNone(all) { - action= SetMods(modifiers=Alt,clearLocks); - }; - interpret Meta_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Meta,clearLocks); - }; - interpret Meta_R+AnyOfOrNone(all) { - action= SetMods(modifiers=Meta,clearLocks); - }; - interpret Super_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Super,clearLocks); - }; - interpret Super_R+AnyOfOrNone(all) { - action= SetMods(modifiers=Super,clearLocks); - }; - interpret Hyper_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Hyper,clearLocks); - }; - interpret Hyper_R+AnyOfOrNone(all) { - action= SetMods(modifiers=Hyper,clearLocks); - }; - interpret Shift_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Shift,clearLocks); - }; - interpret XF86Switch_VT_1+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=1,!same); - }; - interpret XF86Switch_VT_2+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=2,!same); - }; - interpret XF86Switch_VT_3+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=3,!same); - }; - interpret XF86Switch_VT_4+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=4,!same); - }; - interpret XF86Switch_VT_5+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=5,!same); - }; - interpret XF86Switch_VT_6+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=6,!same); - }; - interpret XF86Switch_VT_7+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=7,!same); - }; - interpret XF86Switch_VT_8+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=8,!same); - }; - interpret XF86Switch_VT_9+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=9,!same); - }; - interpret XF86Switch_VT_10+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=10,!same); - }; - interpret XF86Switch_VT_11+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=11,!same); - }; - interpret XF86Switch_VT_12+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=12,!same); - }; - interpret XF86LogGrabInfo+AnyOfOrNone(all) { - repeat= True; - action= Private(type=0x86,data[0]=0x50,data[1]=0x72,data[2]=0x47,data[3]=0x72,data[4]=0x62,data[5]=0x73,data[6]=0x00); - }; - interpret XF86LogWindowTree+AnyOfOrNone(all) { - repeat= True; - action= Private(type=0x86,data[0]=0x50,data[1]=0x72,data[2]=0x57,data[3]=0x69,data[4]=0x6e,data[5]=0x73,data[6]=0x00); - }; - interpret XF86Next_VMode+AnyOfOrNone(all) { - repeat= True; - action= Private(type=0x86,data[0]=0x2b,data[1]=0x56,data[2]=0x4d,data[3]=0x6f,data[4]=0x64,data[5]=0x65,data[6]=0x00); - }; - interpret XF86Prev_VMode+AnyOfOrNone(all) { - repeat= True; - action= Private(type=0x86,data[0]=0x2d,data[1]=0x56,data[2]=0x4d,data[3]=0x6f,data[4]=0x64,data[5]=0x65,data[6]=0x00); - }; - interpret ISO_Level5_Shift+AnyOfOrNone(all) { - action= SetMods(modifiers=LevelFive,clearLocks); - }; - interpret ISO_Level5_Latch+AnyOfOrNone(all) { - action= LatchMods(modifiers=LevelFive,clearLocks,latchToLock); - }; - interpret ISO_Level5_Lock+AnyOfOrNone(all) { - action= LockMods(modifiers=LevelFive); - }; - interpret Caps_Lock+AnyOfOrNone(all) { - action= LockMods(modifiers=Lock); - }; - interpret Any+Exactly(Lock) { - action= LockMods(modifiers=Lock); - }; - interpret Any+AnyOf(all) { - action= SetMods(modifiers=modMapMods,clearLocks); - }; - indicator "Caps Lock" { - whichModState= locked; - modifiers= Lock; - }; - indicator "Num Lock" { - whichModState= locked; - modifiers= NumLock; - }; - indicator "Scroll Lock" { - whichModState= locked; - modifiers= ScrollLock; - }; - indicator "Shift Lock" { - whichModState= locked; - modifiers= Shift; - }; - indicator "Group 2" { - groups= 0xfe; - }; - indicator "Mouse Keys" { - controls= mouseKeys; - }; -}; - -xkb_symbols "(unnamed)" { - - name[group1]="English (US)"; - name[group2]="Russian"; - - key { [ Escape ] }; - key { [ 1, exclam ] }; - key { - symbols[Group1]= [ 2, at ], - symbols[Group2]= [ 2, quotedbl ] - }; - key { - symbols[Group1]= [ 3, numbersign ], - symbols[Group2]= [ 3, numerosign ] - }; - key { - symbols[Group1]= [ 4, dollar ], - symbols[Group2]= [ 4, semicolon ] - }; - key { [ 5, percent ] }; - key { - symbols[Group1]= [ 6, asciicircum ], - symbols[Group2]= [ 6, colon ] - }; - key { - symbols[Group1]= [ 7, ampersand ], - symbols[Group2]= [ 7, question ] - }; - key { - type[group2]= "FOUR_LEVEL", - symbols[Group1]= [ 8, asterisk ], - symbols[Group2]= [ 8, asterisk, U20BD, NoSymbol ] - }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - key { [ BackSpace, BackSpace ] }; - key { [ Tab, ISO_Left_Tab ] }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ q, Q ], - symbols[Group2]= [ Cyrillic_shorti, Cyrillic_SHORTI ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ w, W ], - symbols[Group2]= [ Cyrillic_tse, Cyrillic_TSE ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ e, E ], - symbols[Group2]= [ Cyrillic_u, Cyrillic_U ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ r, R ], - symbols[Group2]= [ Cyrillic_ka, Cyrillic_KA ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ t, T ], - symbols[Group2]= [ Cyrillic_ie, Cyrillic_IE ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ y, Y ], - symbols[Group2]= [ Cyrillic_en, Cyrillic_EN ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ u, U ], - symbols[Group2]= [ Cyrillic_ghe, Cyrillic_GHE ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ i, I ], - symbols[Group2]= [ Cyrillic_sha, Cyrillic_SHA ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ o, O ], - symbols[Group2]= [ Cyrillic_shcha, Cyrillic_SHCHA ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ p, P ], - symbols[Group2]= [ Cyrillic_ze, Cyrillic_ZE ] - }; - key { - type[group2]= "ALPHABETIC", - symbols[Group1]= [ bracketleft, braceleft ], - symbols[Group2]= [ Cyrillic_ha, Cyrillic_HA ] - }; - key { - type[group2]= "ALPHABETIC", - symbols[Group1]= [ bracketright, braceright ], - symbols[Group2]= [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] - }; - key { [ Return ] }; - key { [ Control_L ] }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ a, A ], - symbols[Group2]= [ Cyrillic_ef, Cyrillic_EF ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ s, S ], - symbols[Group2]= [ Cyrillic_yeru, Cyrillic_YERU ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ d, D ], - symbols[Group2]= [ Cyrillic_ve, Cyrillic_VE ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ f, F ], - symbols[Group2]= [ Cyrillic_a, Cyrillic_A ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ g, G ], - symbols[Group2]= [ Cyrillic_pe, Cyrillic_PE ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ h, H ], - symbols[Group2]= [ Cyrillic_er, Cyrillic_ER ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ j, J ], - symbols[Group2]= [ Cyrillic_o, Cyrillic_O ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ k, K ], - symbols[Group2]= [ Cyrillic_el, Cyrillic_EL ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ l, L ], - symbols[Group2]= [ Cyrillic_de, Cyrillic_DE ] - }; - key { - type[group2]= "ALPHABETIC", - symbols[Group1]= [ semicolon, colon ], - symbols[Group2]= [ Cyrillic_zhe, Cyrillic_ZHE ] - }; - key { - type[group2]= "ALPHABETIC", - symbols[Group1]= [ apostrophe, quotedbl ], - symbols[Group2]= [ Cyrillic_e, Cyrillic_E ] - }; - key { - type[group2]= "ALPHABETIC", - symbols[Group1]= [ grave, asciitilde ], - symbols[Group2]= [ Cyrillic_io, Cyrillic_IO ] - }; - key { [ Shift_L ] }; - key { - symbols[Group1]= [ backslash, bar ], - symbols[Group2]= [ backslash, slash ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ z, Z ], - symbols[Group2]= [ Cyrillic_ya, Cyrillic_YA ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ x, X ], - symbols[Group2]= [ Cyrillic_che, Cyrillic_CHE ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ c, C ], - symbols[Group2]= [ Cyrillic_es, Cyrillic_ES ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ v, V ], - symbols[Group2]= [ Cyrillic_em, Cyrillic_EM ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ b, B ], - symbols[Group2]= [ Cyrillic_i, Cyrillic_I ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ n, N ], - symbols[Group2]= [ Cyrillic_te, Cyrillic_TE ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ m, M ], - symbols[Group2]= [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] - }; - key { - type[group2]= "ALPHABETIC", - symbols[Group1]= [ comma, less ], - symbols[Group2]= [ Cyrillic_be, Cyrillic_BE ] - }; - key { - type[group2]= "ALPHABETIC", - symbols[Group1]= [ period, greater ], - symbols[Group2]= [ Cyrillic_yu, Cyrillic_YU ] - }; - key { - symbols[Group1]= [ slash, question ], - symbols[Group2]= [ period, comma ] - }; - key { [ Shift_R ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86ClearGrab ] - }; - key { [ Alt_L, Meta_L ] }; - key { - type= "PC_SUPER_LEVEL2", - symbols[Group1]= [ space, ISO_Next_Group ] - }; - key { [ Caps_Lock ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F1, F1, F1, F1, XF86Switch_VT_1 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F2, F2, F2, F2, XF86Switch_VT_2 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F3, F3, F3, F3, XF86Switch_VT_3 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F4, F4, F4, F4, XF86Switch_VT_4 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F5, F5, F5, F5, XF86Switch_VT_5 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F6, F6, F6, F6, XF86Switch_VT_6 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F7, F7, F7, F7, XF86Switch_VT_7 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F8, F8, F8, F8, XF86Switch_VT_8 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F9, F9, F9, F9, XF86Switch_VT_9 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F10, F10, F10, F10, XF86Switch_VT_10 ] - }; - key { [ Num_Lock ] }; - key { [ Scroll_Lock ] }; - key { [ KP_Home, KP_7 ] }; - key { [ KP_Up, KP_8 ] }; - key { [ KP_Prior, KP_9 ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86Prev_VMode ] - }; - key { [ KP_Left, KP_4 ] }; - key { [ KP_Begin, KP_5 ] }; - key { [ KP_Right, KP_6 ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86Next_VMode ] - }; - key { [ KP_End, KP_1 ] }; - key { [ KP_Down, KP_2 ] }; - key { [ KP_Next, KP_3 ] }; - key { [ KP_Insert, KP_0 ] }; - key { - type= "KEYPAD", - symbols[Group1]= [ KP_Delete, KP_Decimal ], - symbols[Group2]= [ KP_Delete, KP_Separator ] - }; - key { [ ISO_Level3_Shift ] }; - key { - type[group1]= "FOUR_LEVEL", - symbols[Group1]= [ less, greater, bar, brokenbar ], - symbols[Group2]= [ slash, bar ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F11, F11, F11, F11, XF86Switch_VT_11 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F12, F12, F12, F12, XF86Switch_VT_12 ] - }; - key { [ Katakana ] }; - key { [ Hiragana ] }; - key { [ Henkan_Mode ] }; - key { [ Hiragana_Katakana ] }; - key { [ Muhenkan ] }; - key { [ KP_Enter ] }; - key { [ Control_R ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86Ungrab ] - }; - key { - type= "PC_ALT_LEVEL2", - symbols[Group1]= [ Print, Sys_Req ] - }; - key { - type= "TWO_LEVEL", - symbols[Group1]= [ Alt_R, Meta_R ] - }; - key { [ Linefeed ] }; - key { [ Home ] }; - key { [ Up ] }; - key { [ Prior ] }; - key { [ Left ] }; - key { [ Right ] }; - key { [ End ] }; - key { [ Down ] }; - key { [ Next ] }; - key { [ Insert ] }; - key { [ Delete ] }; - key { [ XF86AudioMute ] }; - key { [ XF86AudioLowerVolume ] }; - key { [ XF86AudioRaiseVolume ] }; - key { [ XF86PowerOff ] }; - key { [ KP_Equal ] }; - key { [ plusminus ] }; - key { - type= "PC_CONTROL_LEVEL2", - symbols[Group1]= [ Pause, Break ] - }; - key { [ XF86LaunchA ] }; - key { [ KP_Decimal, KP_Decimal ] }; - key { [ Hangul ] }; - key { [ Hangul_Hanja ] }; - key { [ Super_L ] }; - key { [ Super_R ] }; - key { [ Menu ] }; - key { [ Cancel ] }; - key { [ Redo ] }; - key { [ SunProps ] }; - key { [ Undo ] }; - key { [ SunFront ] }; - key { [ XF86Copy ] }; - key { [ XF86Open ] }; - key { [ XF86Paste ] }; - key { [ Find ] }; - key { [ XF86Cut ] }; - key { [ Help ] }; - key { [ XF86MenuKB ] }; - key { [ XF86Calculator ] }; - key { [ XF86Sleep ] }; - key { [ XF86WakeUp ] }; - key { [ XF86Explorer ] }; - key { [ XF86Send ] }; - key { [ XF86Xfer ] }; - key { [ XF86Launch1 ] }; - key { [ XF86Launch2 ] }; - key { [ XF86WWW ] }; - key { [ XF86DOS ] }; - key { [ XF86ScreenSaver ] }; - key { [ XF86RotateWindows ] }; - key { [ XF86TaskPane ] }; - key { [ XF86Mail ] }; - key { [ XF86Favorites ] }; - key { [ XF86MyComputer ] }; - key { [ XF86Back ] }; - key { [ XF86Forward ] }; - key { [ XF86Eject ] }; - key { [ XF86Eject ] }; - key { [ XF86AudioNext ] }; - key { [ XF86AudioPlay, XF86AudioPause ] }; - key { [ XF86AudioPrev ] }; - key { [ XF86AudioStop, XF86Eject ] }; - key { [ XF86AudioRecord ] }; - key { [ XF86AudioRewind ] }; - key { [ XF86Phone ] }; - key { [ XF86Tools ] }; - key { [ XF86HomePage ] }; - key { [ XF86Reload ] }; - key { [ XF86Close ] }; - key { [ XF86ScrollUp ] }; - key { [ XF86ScrollDown ] }; - key { [ parenleft ] }; - key { [ parenright ] }; - key { [ XF86New ] }; - key { [ Redo ] }; - key { [ XF86Tools ] }; - key { [ XF86Launch5 ] }; - key { [ XF86Launch6 ] }; - key { [ XF86Launch7 ] }; - key { [ XF86Launch8 ] }; - key { [ XF86Launch9 ] }; - key { [ XF86AudioMicMute ] }; - key { [ XF86TouchpadToggle ] }; - key { [ XF86TouchpadOn ] }; - key { [ XF86TouchpadOff ] }; - key { [ Mode_switch ] }; - key { [ NoSymbol, Alt_L ] }; - key { [ NoSymbol, Meta_L ] }; - key { [ NoSymbol, Super_L ] }; - key { [ NoSymbol, Hyper_L ] }; - key { [ XF86AudioPlay ] }; - key { [ XF86AudioPause ] }; - key { [ XF86Launch3 ] }; - key { [ XF86Launch4 ] }; - key { [ XF86LaunchB ] }; - key { [ XF86Suspend ] }; - key { [ XF86Close ] }; - key { [ XF86AudioPlay ] }; - key { [ XF86AudioForward ] }; - key { [ Print ] }; - key { [ XF86WebCam ] }; - key { [ XF86AudioPreset ] }; - key { [ XF86Mail ] }; - key { [ XF86Messenger ] }; - key { [ XF86Search ] }; - key { [ XF86Go ] }; - key { [ XF86Finance ] }; - key { [ XF86Game ] }; - key { [ XF86Shop ] }; - key { [ Cancel ] }; - key { [ XF86MonBrightnessDown ] }; - key { [ XF86MonBrightnessUp ] }; - key { [ XF86AudioMedia ] }; - key { [ XF86Display ] }; - key { [ XF86KbdLightOnOff ] }; - key { [ XF86KbdBrightnessDown ] }; - key { [ XF86KbdBrightnessUp ] }; - key { [ XF86Send ] }; - key { [ XF86Reply ] }; - key { [ XF86MailForward ] }; - key { [ XF86Save ] }; - key { [ XF86Documents ] }; - key { [ XF86Battery ] }; - key { [ XF86Bluetooth ] }; - key { [ XF86WLAN ] }; - key { [ XF86UWB ] }; - key { [ XF86Next_VMode ] }; - key { [ XF86Prev_VMode ] }; - key { [ XF86MonBrightnessCycle ] }; - key { [ XF86BrightnessAuto ] }; - key { [ XF86DisplayOff ] }; - key { [ XF86WWAN ] }; - key { [ XF86RFKill ] }; - modifier_map Control { }; - modifier_map Shift { }; - modifier_map Shift { }; - modifier_map Mod1 { }; - modifier_map Lock { }; - modifier_map Mod2 { }; - modifier_map Mod5 { }; - modifier_map Control { }; - modifier_map Mod1 { }; - modifier_map Mod4 { }; - modifier_map Mod4 { }; - modifier_map Mod5 { }; - modifier_map Mod1 { }; - modifier_map Mod4 { }; - modifier_map Mod4 { }; -}; - -}; From 2f057bb6ef910f58a3163ea7a44dee941f7b10a6 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sat, 6 Jan 2024 16:12:47 +0300 Subject: [PATCH 12/16] configs/sway: remove keepassxc + replace btm with btop Signed-off-by: Ivan Bushchik --- configs/sway/config | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/sway/config b/configs/sway/config index c38c123..f0772e6 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -165,8 +165,6 @@ for_window [app_id="pavucontrol"] floating enable, resize 600 300, move absolute for_window [app_id="nm-connection-editor"] floating enable, resize 300 150, move absolute position 25ppt 25ppt # Autostart -exec alacritty --class bottom -e btm -for_window [app_id="bottom"] move container to workspace number 10 -exec keepassxc -for_window [class="KeePassXC"] move container to workspace 9 +exec alacritty --class btop -e btop +for_window [app_id="btop"] move container to workspace number 10 From 8c7bae390d11c9aa16aec85a33124b791dbab4ac Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 7 Jan 2024 14:31:38 +0300 Subject: [PATCH 13/16] configs/waybar: change font to Ubuntu Signed-off-by: Ivan Bushchik --- configs/waybar/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/waybar/style.css b/configs/waybar/style.css index 2361109..2fecf6b 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,6 +1,6 @@ @import "macchiato.css"; * { - font-family: "JetBrains Mono", "Noto Sans"; + font-family: "Ubuntu", "Noto Sans"; font-size: 9pt; border: none; font-weight: 400; From 5e939a07ccca41a5736999c683a0c3b37eee62e8 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 7 Jan 2024 14:34:23 +0300 Subject: [PATCH 14/16] configs/waybar: move tray from right to left Signed-off-by: Ivan Bushchik --- configs/waybar/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/waybar/config b/configs/waybar/config index d38d8a2..bea66e3 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -1,9 +1,9 @@ { "height": 38, "position": "top", - "modules-left": ["sway/workspaces", "sway/mode"], + "modules-left": ["sway/workspaces", "tray","sway/mode"], "modules-center": [], - "modules-right": ["tray", "idle_inhibitor", "cpu", "memory", "wireplumber", "battery", "sway/language", "clock"], + "modules-right": ["idle_inhibitor", "cpu", "memory", "wireplumber", "battery", "sway/language", "clock"], "sway/mode": { "format": "{}" }, From fcf066fa3c50c2e3ac4d91b3582b81c67594d69c Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Thu, 11 Jan 2024 13:49:27 +0300 Subject: [PATCH 15/16] alacritty: migrate config Signed-off-by: Ivan Bushchik --- configs/alacritty/alacritty.toml | 109 ++++++++++++++++++++++++++++++ configs/alacritty/alacritty.yml | 110 ------------------------------- 2 files changed, 109 insertions(+), 110 deletions(-) create mode 100644 configs/alacritty/alacritty.toml delete mode 100644 configs/alacritty/alacritty.yml diff --git a/configs/alacritty/alacritty.toml b/configs/alacritty/alacritty.toml new file mode 100644 index 0000000..b9f1a21 --- /dev/null +++ b/configs/alacritty/alacritty.toml @@ -0,0 +1,109 @@ +[[colors.indexed_colors]] +color = "#F5A97F" +index = 16 + +[[colors.indexed_colors]] +color = "#F4DBD6" +index = 17 + +[colors.bright] +black = "#5B6078" +blue = "#8AADF4" +cyan = "#8BD5CA" +green = "#A6DA95" +magenta = "#F5BDE6" +red = "#ED8796" +white = "#A5ADCB" +yellow = "#EED49F" + +[colors.cursor] +cursor = "#F4DBD6" +text = "#24273A" + +[colors.dim] +black = "#494D64" +blue = "#8AADF4" +cyan = "#8BD5CA" +green = "#A6DA95" +magenta = "#F5BDE6" +red = "#ED8796" +white = "#B8C0E0" +yellow = "#EED49F" + +[colors.hints.end] +background = "#A5ADCB" +foreground = "#24273A" + +[colors.hints.start] +background = "#EED49F" +foreground = "#24273A" + +[colors.normal] +black = "#494D64" +blue = "#8AADF4" +cyan = "#8BD5CA" +green = "#A6DA95" +magenta = "#F5BDE6" +red = "#ED8796" +white = "#B8C0E0" +yellow = "#EED49F" + +[colors.primary] +background = "#24273A" +bright_foreground = "#CAD3F5" +dim_foreground = "#CAD3F5" +foreground = "#CAD3F5" + +[colors.search.focused_match] +background = "#A6DA95" +foreground = "#24273A" + +[colors.search.footer_bar] +background = "#A5ADCB" +foreground = "#24273A" + +[colors.search.matches] +background = "#A5ADCB" +foreground = "#24273A" + +[colors.selection] +background = "#F4DBD6" +text = "#24273A" + +[colors.vi_mode_cursor] +cursor = "#B7BDF8" +text = "#24273A" + +[cursor] +blinking = "on" +shape = "Block" + +[font] +size = 9.0 + +[font.bold] +family = "JetBrains Mono NL" +style = "ExtraBold" + +[font.italic] +family = "JetBrains Mono NL" +style = "Italic" + +[font.normal] +family = "JetBrains Mono NL" +style = "SemiBold" + +[scrolling] +history = 100000 +multiplier = 3 + +[window] +opacity = 1 + +[window.dimensions] +columns = 80 +lines = 25 + +[window.padding] +x = 5 +y = 5 diff --git a/configs/alacritty/alacritty.yml b/configs/alacritty/alacritty.yml deleted file mode 100644 index 1c1b9b8..0000000 --- a/configs/alacritty/alacritty.yml +++ /dev/null @@ -1,110 +0,0 @@ -window: - dimensions: - columns: 80 - lines: 25 - padding: - x: 5 - y: 5 - opacity: 1 -scrolling: - history: 100000 - multiplier: 3 - -font: - normal: - family: JetBrains Mono NL - style: SemiBold - - bold: - family: JetBrains Mono NL - style: ExtraBold - - italic: - family: JetBrains Mono NL - style: Italic - size: 9.0 - -cursor: - shape: Block - blinking: on - -colors: - # Default colors - primary: - background: "#24273A" # base - foreground: "#CAD3F5" # text - # Bright and dim foreground colors - dim_foreground: "#CAD3F5" # text - bright_foreground: "#CAD3F5" # text - - # Cursor colors - cursor: - text: "#24273A" # base - cursor: "#F4DBD6" # rosewater - vi_mode_cursor: - text: "#24273A" # base - cursor: "#B7BDF8" # lavender - - # Search colors - search: - matches: - foreground: "#24273A" # base - background: "#A5ADCB" # subtext0 - focused_match: - foreground: "#24273A" # base - background: "#A6DA95" # green - footer_bar: - foreground: "#24273A" # base - background: "#A5ADCB" # subtext0 - - # Keyboard regex hints - hints: - start: - foreground: "#24273A" # base - background: "#EED49F" # yellow - end: - foreground: "#24273A" # base - background: "#A5ADCB" # subtext0 - - # Selection colors - selection: - text: "#24273A" # base - background: "#F4DBD6" # rosewater - - # Normal colors - normal: - black: "#494D64" # surface1 - red: "#ED8796" # red - green: "#A6DA95" # green - yellow: "#EED49F" # yellow - blue: "#8AADF4" # blue - magenta: "#F5BDE6" # pink - cyan: "#8BD5CA" # teal - white: "#B8C0E0" # subtext1 - - # Bright colors - bright: - black: "#5B6078" # surface2 - red: "#ED8796" # red - green: "#A6DA95" # green - yellow: "#EED49F" # yellow - blue: "#8AADF4" # blue - magenta: "#F5BDE6" # pink - cyan: "#8BD5CA" # teal - white: "#A5ADCB" # subtext0 - - # Dim colors - dim: - black: "#494D64" # surface1 - red: "#ED8796" # red - green: "#A6DA95" # green - yellow: "#EED49F" # yellow - blue: "#8AADF4" # blue - magenta: "#F5BDE6" # pink - cyan: "#8BD5CA" # teal - white: "#B8C0E0" # subtext1 - - indexed_colors: - - { index: 16, color: "#F5A97F" } - - { index: 17, color: "#F4DBD6" } - From 2eda743057812b1c9a348670ca5c728686573d5f Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Thu, 25 Jan 2024 08:49:55 +0300 Subject: [PATCH 16/16] configs/alacritty: fix toml config Signed-off-by: Ivan Bushchik --- configs/alacritty/alacritty.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configs/alacritty/alacritty.toml b/configs/alacritty/alacritty.toml index b9f1a21..28f8ab8 100644 --- a/configs/alacritty/alacritty.toml +++ b/configs/alacritty/alacritty.toml @@ -58,10 +58,6 @@ foreground = "#CAD3F5" background = "#A6DA95" foreground = "#24273A" -[colors.search.footer_bar] -background = "#A5ADCB" -foreground = "#24273A" - [colors.search.matches] background = "#A5ADCB" foreground = "#24273A"