From 4e92f8998c4802f218e51ce254fca41dd6954e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 9 Jan 2022 19:44:19 +0100 Subject: Switch to Sway --- config/alacritty.yml | 4 ++-- config/sway/config | 24 ++++++++++++++---------- config/wofi/config | 5 +++++ install | 4 ++++ local/bin/startsway | 17 +++++++++++++++++ private | 2 +- profile | 10 ++++------ 7 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 config/wofi/config create mode 100644 local/bin/startsway diff --git a/config/alacritty.yml b/config/alacritty.yml index 1deb867..046e1f5 100644 --- a/config/alacritty.yml +++ b/config/alacritty.yml @@ -55,8 +55,8 @@ colors: # When set to `true`, selected text will be copied to the primary clipboard. #save_to_clipboard: false -mouse: - hide_when_typing: true +#mouse: +# hide_when_typing: true key_bindings: - { key: Return, mods: Control|Shift, action: SpawnNewInstance } diff --git a/config/sway/config b/config/sway/config index f27e89d..5ad66a7 100644 --- a/config/sway/config +++ b/config/sway/config @@ -3,8 +3,8 @@ exec --no-startup-id myswaylock ################################################################################## input type:keyboard { - xkb_layout us,cz_qwerty - xkb_options grp:alt_space_toggle,caps:escape + xkb_layout 'us,cz_qwerty' + xkb_options 'grp:alt_shift_toggle,caps:escape' xkb_numlock enabled } @@ -13,9 +13,13 @@ input type:touchpad { } output '*' { - background '/usr/share/backgrounds/vim-card-black-1920x1080.png' fit + background '/usr/share/backgrounds/vim-card-black-2560x1440.png' fit } +seat * xcursor_theme Adwaita +seat * hide_cursor 10000 +seat * hide_cursor when-typing disable + ################################################################################## smart_borders on @@ -168,18 +172,21 @@ bindsym $mod+Return exec alacritty # Start Firefox bindsym $mod+Shift+Return exec firefox-bin -# start dmenu (a program launcher) -bindsym $mod+d exec --no-startup-id i3-dmenu-desktop --entry-type=name +# start a program +bindsym $mod+d exec --no-startup-id wofi -S drun + +# Type emoji +bindsym $mod+period exec rofimoji --skin-tone neutral # Top bindsym $mod+t exec alacritty -e htop bindsym $mod+Shift+t exec alacritty -e sudo powertop # Passwords -bindsym $mod+Shift+w exec --no-startup-id ~/.config/i3/scripts/pass +bindsym $mod+Shift+w exec --no-startup-id ~/.config/sway/scripts/pass # Calendar bindsym $mod+c exec alacritty -t "Calendar" -e ikhal # Notes -bindsym $mod+Shift+n exec --no-startup-id ~/.config/i3/scripts/notes +bindsym $mod+Shift+n exec --no-startup-id ~/.config/sway/scripts/notes for_window [ title="notes-terminal-window" ] floating enable sticky enable # Mail client bindsym $mod+m exec astroid @@ -225,10 +232,7 @@ for_window [class="Florence"] floating enable # Start daemons exec --no-startup-id swayidle exec --no-startup-id kanshi -exec --no-startup-id ibus-daemon -drx exec --no-startup-id dunst -# Set background -exec --no-startup-id i3background # Start Ferdi exec ferdi diff --git a/config/wofi/config b/config/wofi/config new file mode 100644 index 0000000..1520acb --- /dev/null +++ b/config/wofi/config @@ -0,0 +1,5 @@ +key_up=Control_L-k +key_down=Control_L-j +key_left=Control_L-h +key_right=Control_L-l +key_expand=Control_L-o diff --git a/install b/install index ac87f3c..df76e90 100755 --- a/install +++ b/install @@ -95,10 +95,14 @@ if ask "xorg" "Install XOrg (i3)"; then fi if ask "wayland" "Install Wayland (sway)"; then + inst local/bin/startsway ~/.local/bin/startsway inst Xresources ~/.Xdefaults # X resources for wayland session inst config/sway/ ~/.config/sway inst config/swaylock/ ~/.config/swaylock inst config/swayidle/ ~/.config/swayidle + inst config/wofi/ ~/.config/wofi + [ -f "private/kanshi/$(hostname)" ] \ + && inst "private/kanshi/$(hostname)" ~/.config/kanshi/config fi if ask "alacritty" "Install configurations for terminal emulator"; then diff --git a/local/bin/startsway b/local/bin/startsway new file mode 100644 index 0000000..a162deb --- /dev/null +++ b/local/bin/startsway @@ -0,0 +1,17 @@ +#!/bin/sh +set -eu + +# Declare the current desktop +export XDG_CURRENT_DESKTOP=sway +# Use GTK theme for QT applications +export QT_QPA_PLATFORMTHEME=gtk2 +export QT_STYLE_OVERRIDE='gtk2' +# Fix fullscreen game offscreen +export SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0 +# To fix missing textures on intel +export force_s3tc_enable=true +# Fix firefox touchscreen gestures and force wayland +export MOZ_USE_XINPUT2=1 +export MOZ_ENABLE_WAYLAND=1 + +exec dbus-launch --exit-with-session sway diff --git a/private b/private index 60447c4..e1aadc7 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 60447c428a0c2e05f2d8bcf9d7692318764e98ed +Subproject commit e1aadc797c0350dd77ad01c5de224056279e1934 diff --git a/profile b/profile index e2e3407..12e6fce 100644 --- a/profile +++ b/profile @@ -27,16 +27,14 @@ if [ "$(tty)" = "/dev/tty1" ]; then PROFILE_SELECTION=1 else echo - echo "(1) i3" - echo "(2) sway" + echo "(1) sway" + echo "(2) i3" echo -n "Select or pass to shell: " read -r PROFILE_SELECTION fi if [ "$PROFILE_SELECTION" -eq 1 ]; then - exec startx -- "vt$XDG_VTNR" + exec startsway elif [ "$PROFILE_SELECTION" -eq 2 ]; then - export XDG_CURRENT_DESKTOP=sway - export MOZ_ENABLE_WAYLAND=1 - exec sway + exec startx -- "vt$XDG_VTNR" fi unset PROFILE_SELECTION -- cgit v1.2.3