From d9e176d81032fa4add02e693aa7e0ed8a9d4b468 Mon Sep 17 00:00:00 2001 From: Yuri Zamyatin Date: Sat, 21 Dec 2024 00:59:00 +0000 Subject: [PATCH] wip --- arch-root/install.sh | 7 ++-- arch-user/config/foot/foot.ini | 2 +- arch-user/config/sway/config.tmpl | 62 ++++++++++++++++--------------- arch-user/config/xkb/symbols/us | 4 +- 4 files changed, 40 insertions(+), 35 deletions(-) diff --git a/arch-root/install.sh b/arch-root/install.sh index 1b37a19..603c199 100644 --- a/arch-root/install.sh +++ b/arch-root/install.sh @@ -16,8 +16,8 @@ PACKAGES=( # desktop env sway swaybg xorg-xwayland # basic - foot bemenu-wayland i3blocks mako # terminals, ui - xorg-xev wl-clipboard slurp grim # interaction + foot bemenu-wayland i3blocks mako libnotify # terminals, ui + wev wl-clipboard wtype slurp grim # interaction ttf-roboto ttf-roboto-mono # fonts # gui apps @@ -37,7 +37,8 @@ file_has_line() { pacman -Syu pacman -S --needed "${PACKAGES[@]}" -pacman -S --needed brightnessctl sof-firmware intel-media-driver intel-ucode +pacman -S --needed brightnessctl sof-firmware intel-media-driver intel-ucode mesa +pacman -S --needed libreoffice-still file_has_line "/etc/profile" "umask 002" diff --git a/arch-user/config/foot/foot.ini b/arch-user/config/foot/foot.ini index 4009cae..a90d8e1 100644 --- a/arch-user/config/foot/foot.ini +++ b/arch-user/config/foot/foot.ini @@ -83,7 +83,7 @@ font=Roboto Mono:size=12 # long-press-delay=400 [colors] -# alpha=1.0 +alpha=0.5 background=0d1117 # foreground=ffffff # flash=7f7f00 diff --git a/arch-user/config/sway/config.tmpl b/arch-user/config/sway/config.tmpl index 58c83ba..e353c90 100644 --- a/arch-user/config/sway/config.tmpl +++ b/arch-user/config/sway/config.tmpl @@ -2,15 +2,15 @@ set $mod Mod4 set $left n -set $down e -set $up i +set $up e +set $down i set $right o ################ inputs #################### input "type:keyboard" { xkb_layout us(colemak_yz),us(basic),ru } -bindsym $mod+0 input "type:keyboard" xkb_switch_layout next +bindsym --to-code ISO_Level3_Shift+Shift input "type:keyboard" xkb_switch_layout next input "type:touchpad" { dwt enabled tap enabled @@ -20,20 +20,18 @@ input "type:touchpad" { ############################################ ############### workspaces ################# -bindsym --to-code $mod+x workspace x -bindsym --to-code $mod+c workspace c -bindsym --to-code $mod+d workspace d -bindsym --to-code $mod+v workspace v -bindsym --to-code $mod+z workspace z -bindsym --to-code $mod+k workspace k -bindsym --to-code $mod+h workspace h -bindsym --to-code $mod+Control+x move container to workspace x -bindsym --to-code $mod+Control+c move container to workspace c -bindsym --to-code $mod+Control+d move container to workspace d -bindsym --to-code $mod+Control+v move container to workspace v -bindsym --to-code $mod+Control+z move container to workspace z -bindsym --to-code $mod+Control+k move container to workspace k -bindsym --to-code $mod+Control+h move container to workspace h +bindsym --to-code $mod+a workspace a +bindsym --to-code $mod+r workspace r +bindsym --to-code $mod+s workspace s +bindsym --to-code $mod+t workspace t +bindsym --to-code $mod+g workspace g +bindsym --to-code $mod+m workspace m +bindsym --to-code $mod+Shift+a move container to workspace a +bindsym --to-code $mod+Shift+r move container to workspace r +bindsym --to-code $mod+Shift+s move container to workspace s +bindsym --to-code $mod+Shift+t move container to workspace t +bindsym --to-code $mod+Shift+g move container to workspace g +bindsym --to-code $mod+Shift+m move container to workspace m bindgesture swipe:right workspace prev bindgesture swipe:left workspace next ############################################ @@ -43,11 +41,11 @@ bindsym --to-code $mod+$left focus left bindsym --to-code $mod+$down focus down bindsym --to-code $mod+$up focus up bindsym --to-code $mod+$right focus right -bindsym --to-code $mod+Control+$left move left -bindsym --to-code $mod+Control+$down move down -bindsym --to-code $mod+Control+$up move up -bindsym --to-code $mod+Control+$right move right -bindsym --to-code $mod+r mode "resize" +bindsym --to-code $mod+Shift+$left move left +bindsym --to-code $mod+Shift+$down move down +bindsym --to-code $mod+Shift+$up move up +bindsym --to-code $mod+Shift+$right move right + bindsym --to-code $mod+7 mode "resize" mode "resize" { bindsym $left resize shrink width 5ppt bindsym $down resize grow height 5ppt @@ -59,13 +57,19 @@ bindsym --to-code $mod+f fullscreen floating_modifier $mod normal bindsym --to-code $mod+b splith - bindsym --to-code $mod+m splitv - bindsym --to-code $mod+s layout stacking + bindsym --to-code $mod+6 splitv + bindsym --to-code $mod+5 layout stacking bindsym --to-code $mod+w layout tabbed bindsym --to-code $mod+9 layout toggle split - bindsym --to-code $mod+a focus parent - bindsym --to-code $mod+Shift+minus move scratchpad - bindsym --to-code $mod+minus scratchpad show + bindsym --to-code $mod+8 focus parent + bindsym --to-code $mod+Shift+d move scratchpad + bindsym --to-code $mod+d scratchpad show +############################################ + +################## keys #################### +bindsym --to-code $mod+x exec wtype -P XF86Cut +bindsym --to-code $mod+c exec wtype -P XF86Copy +bindsym --to-code $mod+v exec wtype -P XF86Paste ############################################ ################ styles #################### @@ -90,9 +94,9 @@ bar { ################ scripts ################## bindsym --to-code $mod+Escape kill -bindsym --to-code $mod+Control+r reload -bindsym --to-code $mod+Return exec foot +bindsym --to-code $mod+Return exec footclient bindsym --to-code $mod+Space exec run.sh ########################################### exec foot -s +exec mako diff --git a/arch-user/config/xkb/symbols/us b/arch-user/config/xkb/symbols/us index 8811ed9..ce3ace4 100644 --- a/arch-user/config/xkb/symbols/us +++ b/arch-user/config/xkb/symbols/us @@ -24,8 +24,8 @@ xkb_symbols "colemak_yz" { key.type = "FOUR_LEVEL"; # navigation key { [ n, N, Left, eacute] }; - key { [ e, E, Down, eacute ] }; - key { [ i, I, Up, iacute ] }; + key { [ e, E, Up, eacute ] }; + key { [ i, I, Down, iacute ] }; key { [ o, O, Right, oacute ] }; };