diff options
| -rw-r--r-- | Common/sway/autostart | 33 | ||||
| -rw-r--r-- | Common/sway/config | 48 | ||||
| -rw-r--r-- | Common/sway/hid (renamed from Common/sway/touchpad) | 14 | ||||
| -rw-r--r-- | Common/sway/keyboard | 7 | ||||
| -rw-r--r-- | Common/sway/outputs | 0 | ||||
| -rw-r--r-- | Common/sway/pointer | 5 | ||||
| l--------- | Common/sway/sway | 1 | ||||
| -rw-r--r-- | Common/sway/variables | 6 | ||||
| -rw-r--r-- | Common/sway/workspaces | 0 | ||||
| -rwxr-xr-x | install/install_linux.sh | 28 | ||||
| -rw-r--r-- | linux/greetd.toml | 16 |
11 files changed, 92 insertions, 66 deletions
diff --git a/Common/sway/autostart b/Common/sway/autostart index 9adfafc..faece20 100644 --- a/Common/sway/autostart +++ b/Common/sway/autostart @@ -1,12 +1,23 @@ -#exec rm /tmp/nwg-shell-check-update.lock -#exec wlsunset -l 59.9614 -L 10.925 -t 4500 -T 6500 -g 1.0 -#exec swaync -s /home/jakob/.config/swaync/preset-1.css +# screen locking +exec swayidle timeout 1200 physlock \ + timeout 1800 'swaymsg "output * dpms off"' \ + resume 'swaymsg "output * dpms on"' + +# notification centre +exec swaync + +# system tray applets +exec blueman-applet +exec udiskie exec nm-applet --indicator -#exec_always nwg-autotiling -#exec_always nwg-drawer -r -c 6 -is 64 -fscol 2 -s preset-1.css -term foot -#exec_always nwg-dock -d -p bottom -a center -i 48 -hd 20 -s preset-1.css -#exec_always nwg-panel -c preset-1 -s preset-1.css -#exec_always nwg-shell-check-updates -exec swayidle timeout 1200 nwg-lock timeout 1800 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' -#exec nwg-update-indicator -#exec nwg-shell-config + +# Wayland Overlay Bar, volume/brigtness bar +set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock +exec rm -f $WOBSOCK && mkfifo $WOBSOCK && tail -f $WOBSOCK | wob + +# use clipman for clipboard management +exec wl-paste -t text --watch clipman store --no-persist + +# Nice color hues in the evenings +exec wlsunset -l 59.9614 -L 10.925 -t 4500 -T 6500 -g 1.0 + diff --git a/Common/sway/config b/Common/sway/config index 7520ba8..763b828 100644 --- a/Common/sway/config +++ b/Common/sway/config @@ -1,15 +1,5 @@ -# The files we include below will be created / overwritten by nwg-shell tools -# -include variables -include outputs include autostart -include workspaces -include keyboard -include pointer -include touchpad - -# nwg-shell sway config -# Read `man 5 sway` for reference. +include hid # border & title for_window [title="^.*"] border none, title_format "<b> %class >> %title </b>" @@ -35,24 +25,10 @@ set $down k set $left j set $right semicolon -############### wob ################## -set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock -exec rm -f $WOBSOCK && mkfifo $WOBSOCK && tail -f $WOBSOCK | wob - -############### Autostart ################## - -exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK -exec hash dbus-update-activation-environment 2>/dev/null && \ - dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK -exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 -exec ~/.azotebg -exec blueman-applet -exec udiskie - ### Turn off screen on lid closed -# set $laptop eDP-1 -# bindswitch lid:on output $laptop disable -# bindswitch lid:off output $laptop enable +set $laptop eDP-1 +bindswitch lid:on output $laptop disable +bindswitch lid:off output $laptop enable ############# Bindings ################## @@ -61,18 +37,15 @@ bindsym $Mod+Shift+q kill bindsym Mod1+F4 kill # core applications -bindsym $Mod+Return exec $term -bindsym $Mod+s exec nwg-shell-config -bindsym $Mod+w exec $browser -bindsym $Mod+f exec $filemanager +bindsym $Mod+Return exec alacritty +bindsym $Mod+w exec firefox +bindsym $Mod+f exec thunar bindsym $Mod+c exec swaync-client -t -bindsym Mod1+l exec nwg-lock -bindsym $Mod+F1 exec nwg-shell-help +bindsym Mod1+l exec physlock bindsym $Mod+d exec wofi --show=drun -#bindsym $Mod+d exec rofi -lines 12 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns 3 -font 'Noto Sans 8' # Exit menu -bindsym $Mod+p exec $exit +bindsym $Mod+p exec wlogout # Exit sway (default way to log you out of your Wayland session) bindsym $Mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' @@ -275,4 +248,7 @@ for_window [title="(?i)(?:Cssh|cssh)"] border none floating enable for_window [app_id="(?i)(?:Cssh|cssh)"] floating enable for_window [title="CSSH"] floating enable +# Make it easier to spot X11 windows +for_window [shell="xwayland"] title_format "[XWayland] %title" + popup_during_fullscreen smart diff --git a/Common/sway/touchpad b/Common/sway/hid index 2cdb7bf..7ef3f70 100644 --- a/Common/sway/touchpad +++ b/Common/sway/hid @@ -1,3 +1,11 @@ +input "type:keyboard" { + xkb_layout us,no + repeat_delay 300 + repeat_rate 40 + xkb_capslock disabled + xkb_numlock disabled +} + input "type:touchpad" { pointer_accel 0.0 natural_scroll disabled @@ -11,3 +19,9 @@ input "type:touchpad" { dwt enabled middle_emulation enabled } + +input "type:pointer" { + natural_scroll disabled + scroll_factor 1.0 + left_handed disabled +} diff --git a/Common/sway/keyboard b/Common/sway/keyboard deleted file mode 100644 index 6b2c442..0000000 --- a/Common/sway/keyboard +++ /dev/null @@ -1,7 +0,0 @@ -input "type:keyboard" { - xkb_layout us,no - repeat_delay 300 - repeat_rate 40 - xkb_capslock disabled - xkb_numlock disabled -} diff --git a/Common/sway/outputs b/Common/sway/outputs deleted file mode 100644 index e69de29..0000000 --- a/Common/sway/outputs +++ /dev/null diff --git a/Common/sway/pointer b/Common/sway/pointer deleted file mode 100644 index db6e52f..0000000 --- a/Common/sway/pointer +++ /dev/null @@ -1,5 +0,0 @@ -input "type:pointer" { - natural_scroll disabled - scroll_factor 1.0 - left_handed disabled -} diff --git a/Common/sway/sway b/Common/sway/sway deleted file mode 120000 index f217ee1..0000000 --- a/Common/sway/sway +++ /dev/null @@ -1 +0,0 @@ -/home/jakob/_code/dotfiles/Common/sway
\ No newline at end of file diff --git a/Common/sway/variables b/Common/sway/variables deleted file mode 100644 index 934265d..0000000 --- a/Common/sway/variables +++ /dev/null @@ -1,6 +0,0 @@ -set $term alacritty -set $browser google-chrome-stable --enable-features=UseOzonePlatform --ozone-platform=wayland -set $filemanager thunar -set $editor emacs -set $launcher nwg-drawer -set $exit nwg-bar -p center -a middle -i 48 -s preset-1.css diff --git a/Common/sway/workspaces b/Common/sway/workspaces deleted file mode 100644 index e69de29..0000000 --- a/Common/sway/workspaces +++ /dev/null diff --git a/install/install_linux.sh b/install/install_linux.sh index 5e75e97..a57bfe5 100755 --- a/install/install_linux.sh +++ b/install/install_linux.sh @@ -60,6 +60,33 @@ if [ $res -eq 1 ]; then tput rc; tput ed fi +dlgYN "> Install greetd and tuigreet" res +if [ $res -eq 1 ]; then + tput sc + $INST_PM greetd + curl https://github.com/apognu/tuigreet/releases/download/0.8.0/tuigreet-0.8.0-x86_64 -o /usr/local/bin/tuigreet + chmod +x /usr/local/bin/tuigreet + cp /etc/greetd/config.toml /etc/greetd.config.toml.orig + ln -isf "$CWD/linux/greetd.toml" /etc/greetd/config.toml + systemctl enable greetd + tput rc; tput ed +fi + +dlgYN "> Install tlp" res +if [ $res -eq 1 ]; then + tput sc + $INST_PM tlp + systemctl enable --now tlp + tput rc; tput ed +fi + +dlgYN "> Install sway" res +if [ $res -eq 1 ]; then + tput sc + $INST_PM sway swayidle physlock alacritty blueman network-manager-gnome wob wlogout wofi brightnessctl clipman + tput rc; tput ed +fi + dlgYN "> Create symlinks" res if [ $res -eq 1 ]; then CWD=$(pwd) @@ -91,4 +118,5 @@ fi tput setaf 3 echo "\nPlease install the font Roboto mono nerd, and enable it in your terminal." echo "\nPlease run ':PlugInstall' in vim" +echo "\nTo to start greetd, reboot system" tput sgr0 diff --git a/linux/greetd.toml b/linux/greetd.toml new file mode 100644 index 0000000..b34a8f0 --- /dev/null +++ b/linux/greetd.toml @@ -0,0 +1,16 @@ +[terminal] +# The VT to run the greeter on. Can be "next", "current" or a number +# designating the VT. +vt = 8 + +# The default session, also known as the greeter. +[default_session] + +# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh` +# with whatever you want started, such as `sway`. +command = "/usr/local/bin/tuigreet --remember --remember-user-session --asterisks --user-menu --cmd sway" + +# The user to run the command as. The privileges this user must have depends +# on the greeter. A graphical greeter may for example require the user to be +# in the `video` group. +user = "_greetd" |