diff --git a/dot/file/profile b/dot/file/profile index bfe7a07..4bac07c 100755 --- a/dot/file/profile +++ b/dot/file/profile @@ -74,7 +74,6 @@ fi # Custom. export KITTY_CONFIG_DIRECTORY="$ETC/kitty" - export OPENER="xdg-open" export APP="$HOME/app" export BIN="$HOME/bin" export LOAD="$HOME/load" @@ -89,11 +88,6 @@ fi export PROMPT="; " export PS1="$PROMPT" export SUDO_PROMPT="# " - export EDITOR=`which-first nvim vim vi ed` - export VISUAL="$EDITOR" - export GIT_EDITOR="$VISUAL" - export PAGER=`which-first bat less more cat` - export MANPAGER="`which-first less more`" export CMDHIST="$ETC/cmds" export CMDHISTMAX="100" @@ -120,10 +114,18 @@ fi # CLI. +# Programs. + export OPENER="`which-first xdg-open`" + export EDITOR=`which-first nvim vim vi ed` + export VISUAL="$EDITOR" + export GIT_EDITOR="$VISUAL" + + export PAGER=`which-first moar bat less more cat` + export MANPAGER="`which-first moar less more`" + export CLI_DMENU=`which-first fzf` export CLI_FILE_MANAGER=`which-first lf` -# X/Wayland stuff. export XCOMPOSER='river' export XTERMINAL='kitty' export XINSIDE_TERMINAL='kitty' @@ -133,22 +135,28 @@ fi export XBLUETOOTH_MANAGER='blueman-manager' export XOUTPUT_DAEMON='kanshi' export XSOUND_CONTROL='pavucontrol' - export XFILE_MANAGER="$XINSIDE_TERMINAL $CLI_FILE_MANAGER" - export XRESOURCE_MONITOR="$XINSIDE_TERMINAL htop" - export XCALENDAR="$XTERMINAL -e calcurse" + export XFILE_MANAGER='$XINSIDE_TERMINAL $CLI_FILE_MANAGER' + export XRESOURCE_MONITOR='$XINSIDE_TERMINAL htop' + export XCALENDAR='$XTERMINAL -e calcurse' export XPUSH_NOTIFICATION_DAEMON='dunst' export XNOTIFY='dunstify' export XLOCKER='swaylock' export XSUSPEND='systemctl suspend' + export XCLIPBOARD_MANAGER='clipman store' + export XCLIPBOARD_DAEMON='wl-paste -t text --watch $XCLIPBOARD_MANAGER' + export XCLIPBOARD_TOOL='clipman pick --tool=CUSTOM --tool-args="$XDMENU"' + export XEDITOR="`which-first nvim-qt`" - export XCLIPBOARD_TOOL="clipman pick --tool=CUSTOM --tool-args='$XDMENU'" - export XDISPLAY_REGION="slurp" + export XDISPLAY_REGION='slurp' export XDISPLAY_SCREENSHOT="grim" export XDISPLAY_REGION_SCREENSHOT='slurp | grim -g - - | wl-copy' export XVIDEO_PLAYER='mpv' export XLINK_VIDEO_PLAYER='mpv' export XTYPE='wtype' + export XBACKGROUND_DAEMON='swaybg -m fill -i $ETC/img/eat-sleep-code-repeat.png' + export XBLUETOOTH_APPLET='blueman-applet' + export RIVER_TILER='rivertile -view-padding 0 -outer-padding 0' # Android. export ANDROID_HOME="$HOME/app/android/Sdk" @@ -177,6 +185,10 @@ page() { # Manual find. manf() { + if test -z "$CLI_DMENU" ; then + echo No 'no $CLI_DMENU env' + return 1 + fi man `man -k . | $CLI_DMENU -e -1 $(if test ! -z $@ ; then echo -- -q "$@" ; fi ) | awk '{print $1}'` } diff --git a/river/init b/river/init index 71994fe..71b023d 100755 --- a/river/init +++ b/river/init @@ -20,7 +20,7 @@ riverctl border-color-unfocused 0x586e75 # Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc. # Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot) -riverctl map normal Super+Shift Return spawn "$XTERMINAL" +riverctl map normal Super+Shift Return spawn "eval $XTERMINAL" # Close the focused view. riverctl map normal Super X close @@ -126,9 +126,6 @@ riverctl map normal Super+Shift L send-layout-cmd rivertile "main-location right riverctl map normal Super+Shift J send-layout-cmd rivertile "main-location bottom" riverctl map normal Super+Shift H send-layout-cmd rivertile "main-location left" -# Terminal. -riverctl map normal Super+Alt T spawn "$XTERMINAL" - # Declare a passthrough mode. This mode has only a single mapping to return to # normal mode. This makes it useful for testing a nested wayland compositor riverctl declare-mode passthrough @@ -190,6 +187,8 @@ riverctl rule-add -title 'Save Image' float #riverctl rule-add -title 'Choose an image' #riverctl rule-add -title 'Save Image' +riverctl rule-add -title Warframe fullscreen + # Make all views with an app-id that starts with "float" and title "foo" start floating. riverctl rule-add -app-id 'float*' -title 'foo' float @@ -213,15 +212,15 @@ if test -z "$RIVER_RELOAD" ; then export QT_QPA_PLATFORM=wayland #export QT_QPA_PLATFORM=xcb export XDG_CURRENT_DESKTOP=sway - eval wl-paste -t text --watch $XCLIPBOARD_MANAGER & - eval rivertile -view-padding 0 -outer-padding 0 & + eval $XCLIPBOARD_DAEMON & + eval $RIVER_TILER & eval $XPUSH_NOTIFICATION_DAEMON & eval $XOUTPUT_DAEMON & - swaybg -m fill -i $ETC/img/eat-sleep-code-repeat.png & + eval $XBACKGROUND_DAEMON & eval $XBAR & - blueman-applet & + eval $XBLUETOOTH_APPLET & dbus-update-activation-environment --systemd \ WAYLAND_DISPLAY \ @@ -233,4 +232,5 @@ if test -z "$RIVER_RELOAD" ; then fi +#$XNOTIFY "set '$XTERMINAL' as terminal"