This commit is contained in:
Andrey Parhomenko 2024-07-30 22:24:58 +05:00
parent e8d01a2ce8
commit 65ba8d0fbd
5 changed files with 25 additions and 86 deletions

View file

@ -1,4 +1,4 @@
. $HOME/.shrc
. $HOME/.profile
export PS1='; '
set -o vi

View file

@ -24,6 +24,10 @@ lfcd(){
fi
}
usctl(){
systemctl --user $@
}
sctl(){
systemctl $@
}
@ -127,8 +131,8 @@ fi
export CLI_FILE_MANAGER=`which-first lf`
export XCOMPOSER='river'
export XTERMINAL='kitty'
export XINSIDE_TERMINAL='kitty'
export XTERMINAL='kitty -1 --instance-group "$DISPLAY"'
export XINSIDE_TERMINAL='kitty -1 --instance-group "$DISPLAY"'
export XRUNNER='fuzzel'
export XDMENU='fuzzel -d'
export XBAR='waybar'
@ -137,7 +141,7 @@ fi
export XSOUND_CONTROL='pavucontrol'
export XFILE_MANAGER='$XINSIDE_TERMINAL $CLI_FILE_MANAGER'
export XRESOURCE_MONITOR='$XINSIDE_TERMINAL htop'
export XCALENDAR='$XTERMINAL -e calcurse'
export XCALENDAR='$XINSIDE_TERMINAL calcurse'
export XPUSH_NOTIFICATION_DAEMON='dunst'
export XNOTIFY='dunstify'
export XLOCKER='swaylock'
@ -169,20 +173,24 @@ source-if-exist "$ETC/script/lf.sh"
test -r $SETENV && . "$SETENV" && setenv profile
# Visual editor.
vedit(){
ve(){
$VISUAL $@
}
# Editor.
edit(){
e(){
$EDITOR $@
}
# Run pager.
page() {
p() {
$PAGER $@
}
q() {
exit
}
# Manual find.
manf() {
if test -z "$CLI_DMENU" ; then
@ -196,3 +204,4 @@ manf() {
export GPG_TTY=$(tty)
export SSH_TTY=$(tty)

View file

@ -2,74 +2,6 @@
. $HOME/.profile
q(){
echo $SHLVL - 1 | bc
exit
}
tmpcdfile=`mktemp`
c() {
oldpwd=`pwd`
path=""
for v in $@ ; do
path="$path$v/"
done
if eval "command cd $path" && test -n "$1" ; then
cat $CDHIST > $tmpcdfile
{ pwd ; goblin cat $tmpcdfile ; } | \
sed $CDHISTMAX'q' | \
goblin uniq -U > $CDHIST
fi
pwd
}
l() {
ls $@
}
cl() {
c $@
l
}
la() {
ls -al $@
}
cds() {
acds | sed 10q | goblin quote | nl
}
acds() {
cat $CDHIST
}
b() {
num=$1
if test "$1" = "" ; then
num=1
fi
backcd=`sed -n $num'p' "$CDHIST"`
c "$backcd"
}
e() {
$EDITOR $@
}
ev() {
$VISUAL $@
}
t() {
tree $@
}
export PS1=$PROMPT
test -r "$LOGIN" && . "$LOGIN"

View file

@ -1,6 +1,2 @@
unbind C-b
set -g prefix C-t
set-option -g status-position top
set -g status-bg white
set -g status-fg black
setw -g mode-keys vi
# Empty for no need at the SSH connections.

View file

@ -20,7 +20,9 @@ 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 "eval $XTERMINAL"
riverctl map normal Super+Shift Return spawn 'eval $XTERMINAL'
riverctl map normal Super+Shift T spawn 'eval $XTERMINAL tmux'
#riverctl map normal Super+Alt+Shift Return spawn '$ETC/river/mterm'
# Close the focused view.
riverctl map normal Super X close
@ -209,9 +211,10 @@ riverctl map normal Super+Shift S spawn "eval $XDISPLAY_REGION_SCREENSHOT"
# Only first time, no reloading.
if test -z "$RIVER_RELOAD" ; then
export QT_QPA_PLATFORM=wayland
#export QT_QPA_PLATFORM=wayland
#export QT_QPA_PLATFORM=xcb
export XDG_CURRENT_DESKTOP=sway
#export XDG_CURRENT_DESKTOP=sway
eval $XCLIPBOARD_DAEMON &
eval $RIVER_TILER &
eval $XPUSH_NOTIFICATION_DAEMON &
@ -226,11 +229,10 @@ if test -z "$RIVER_RELOAD" ; then
WAYLAND_DISPLAY \
XDG_CURRENT_DESKTOP=river
# Systemctl stuff.
XWIRE_DAEMON=wireplumber
systemctl --user stop pipewire "$XWIRE_DAEMON" xdg-desktop-portal xdg-desktop-portal-wlr
systemctl --user start "$XWIRE_DAEMON"
fi
#$XNOTIFY "set '$XTERMINAL' as terminal"