From 6dc16e1476e55ea34b32bee558d429d7d11d0e9e Mon Sep 17 00:00:00 2001 From: Marc Vertes Date: Sun, 5 Mar 2023 12:46:32 +0100 Subject: update --- .Xresources | 1 + .bashrc | 8 ++++---- .fvwm2rc | 33 ++++++++++++++++++--------------- .profile | 4 +++- .xinitrc | 15 ++++++--------- .xsession | 4 +--- bin/batt | 9 +++++++-- bin/lt | 2 ++ 8 files changed, 42 insertions(+), 34 deletions(-) diff --git a/.Xresources b/.Xresources index 4ca3ee9..84b45b0 100644 --- a/.Xresources +++ b/.Xresources @@ -30,6 +30,7 @@ xterm*VT100.Translations: #override \ ! Meta minus: smaller-vt-font() \n\ ! Meta equal: larger-vt-font() \n xterm*cursorColor: red +xterm*activeIcon: false !xterm*visualBell: true !xterm*geometry: 100x32 !xterm*faceName: DejaVu Sans Mono diff --git a/.bashrc b/.bashrc index b0cc715..40f4812 100644 --- a/.bashrc +++ b/.bashrc @@ -151,7 +151,7 @@ meteo() { # eval "$(direnv hook bash)" #export GITHUB_TOKEN=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 -set -o vi -bind -m vi-command ".":insert-last-argument -bind -m vi-command 'Control-l: clear-screen' -bind -m vi-insert 'Control-l: clear-screen' +#set -o vi +#bind -m vi-command ".":insert-last-argument +#bind -m vi-command 'Control-l: clear-screen' +#bind -m vi-insert 'Control-l: clear-screen' diff --git a/.fvwm2rc b/.fvwm2rc index dff146c..97be73b 100644 --- a/.fvwm2rc +++ b/.fvwm2rc @@ -21,8 +21,8 @@ EdgeResistance 100000 100000 DeskTopSize 2x2 -#ImagePath /usr/X11R6/include/X11/pixmaps/ -#ImagePath /usr/share/pixmaps/ +ImagePath /usr/X11R6/include/X11/pixmaps/ +ImagePath /usr/share/pixmaps/ Style "*" BorderWidth 4, HandleWidth 4 Style "Fvwm*" NoTitle, Sticky, WindowListSkip @@ -34,16 +34,20 @@ Style "gkrellm" NoTitle, Sticky, WindowListSkip, CirculateSkip #Style "*unknown*" NoTitle, BorderWidth 0, NoHandles, WindowListSkip #Style "rxvt" Icon Monitor.xpm -#Style "xterm" Icon Monitor.xpm -#Style "uxterm" Icon Monitor.xpm +Style "xterm" Icon Monitor.xpm +Style "uxterm" Icon Monitor.xpm #========================================================================# # Stuff to do at start-up # AddToFunc "StartFunction" -+ "I" Module FvwmPager 0 0 -+ "I" Exec dunst ++ I Exec xsetroot -solid '#103040' ++ I Test (Init) Exec stalonetray ++ I Test (Init) Exec nm-applet ++ I Exec status2 +#+ "I" Module FvwmPager 0 0 +#+ "I" Exec dunst #+ "I" Exec xsetroot -solid rgb:3/4/5 #+ "I" Exec setxkbmap fr #+ "I" Exec synclient VertScrollDelta=-114 @@ -111,7 +115,7 @@ DestroyMenu "Settings" AddToMenu "Settings" + "&Display" Exec exec arandr #+ "&Keyboard" Exec exec setxkbmap fr -+ "&Network" Exec exec nm-connection-editor ++ "&Network" Exec exec nm-applet + "&Power" Exec exec xt -e sudo powertop + "&Sound" Exec exec pavucontrol @@ -130,16 +134,15 @@ AddToMenu "Utilities" #+ "&Top" Exec exec uxterm -T Top -n Top -e top #+ "&Xterm" Exec exec urxvtc +sb -sl 500 -j -ls -cr red + "&Xterm" Exec exec xt -+ "&Black Xterm" Exec exec xtb ++ "&Black Xterm" Exec exec xt -bg black -fg grey70 + "File manager" Exec exec pcmanfm-qt + "&Top" Exec exec xt -T Top -n Top -e /bin/top -#+ "&Web" Exec exec chromium --disk-cache-dir=/tmp/chromium-cache ++ "&Web" Exec exec chromium --disk-cache-dir=/tmp/chromium-cache #+ "&Web" Exec exec brave -+ "&Firefox" Exec exec firefox -+ "&Chromium" Exec exec chromium --disk-cache-dir=/tmp/chromium-cache +#+ "&Firefox" Exec exec firefox +#+ "&Chromium" Exec exec chromium --disk-cache-dir=/tmp/chromium-cache + "T&hunderbird" Exec exec thunderbird #+ "xclipboard" Exec exec xclipboard -#+ "" Nop + "" Nop + "&System" Popup Settings + "&Desktop" Popup Desktop-Apps @@ -160,8 +163,8 @@ AddToMenu "Window Ops" + "(Un)Stick" Stick + "(Un)Maximize Alt+F12" Function maximize_func + "" Nop -+ "&Kill" Destroy -+ "&Close" Delete ++ "&Kill" Destroy ++ "&Close Alt+F9" Delete + "" Nop + "Switch to..." WindowList + "Refresh Screen" Refresh @@ -177,7 +180,7 @@ AddToMenu "Window-Ops2" "&Move Alt+F5" Move-or-Raise + "Ma&ximize Alt+F12" Maximize 100 100 + "" Nop + "&Kill" Destroy -+ "&Close" Delete ++ "&Close Alt+F9" Delete #========================================================================# # diff --git a/.profile b/.profile index 1312363..0971b3d 100644 --- a/.profile +++ b/.profile @@ -1,6 +1,8 @@ # ~/.profile -PATH=~/bin:/usr/local/sbin:/usr/sbin:/sbin:~/.cargo/bin:$PATH:~/go/bin +PATH=~/bin:~/mu/bin:/usr/local/sbin:/usr/sbin:/sbin:~/.cargo/bin:$PATH:~/go/bin + +export LD_LIBRARY_PATH=~/mu/lib64:~/mu/lib [ "${SHELL##*/}" = bash ] && . ~/.bashrc diff --git a/.xinitrc b/.xinitrc index 338283d..7928166 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,12 +1,6 @@ #!/bin/sh -#. /etc/X11/xinit/xinitrc.d/50-systemd-user.sh eval $(ssh-agent) -eval $(gnome-keyring-daemon --start) -export SSH_AUTH_SOCK - -# start pulseaudio on crux only. Should be handled by systemd on arch -#pulseaudio --start --exit-idle-time=-1 --log-target=syslog & # enable tapping and natural scrolling on touchpad # see xinput --list[-props] for ids @@ -14,18 +8,21 @@ xinput --set-prop 'SYNA7DAB:00 06CB:CD40 Touchpad' 'libinput Tapping Enabled' 1 xinput --set-prop 'SYNA7DAB:00 06CB:CD40 Touchpad' 'libinput Natural Scrolling Enabled' 1 # Better use /etc/X11/xorg.conf.d/10-keyboard.conf to handle hot plugged keyboards -setxkbmap fr +# setxkbmap fr #xk hdmi xrdb ~/.Xresources #xsetroot -solid rgb:3/4/5 -xsetroot -solid rgb:1/3/4 +#xsetroot -solid rgb:1/3/4 +#xsetroot -solid '#103040' #feh --bg-fill ~/Downloads/Alaska_Range.jpg #conky #slock +#stalonetray & +#nm-applet & +#status2 & # Start window manager exec fvwm -#lxpolkit #exec i3 diff --git a/.xsession b/.xsession index 804c3cd..c25faba 100755 --- a/.xsession +++ b/.xsession @@ -1,6 +1,4 @@ #!/bin/sh -# start pulseaudio on crux only. Should be handled by systemd on arch -#pulseaudio --start --exit-idle-time=-1 --log-target=syslog & eval $(ssh-agent) @@ -17,7 +15,7 @@ hdmi xrdb ~/.Xresources #xsetroot -solid rgb:3/4/5 -xsetroot -solid rgb:1/3/4 +#xsetroot -solid rgb:1/3/4 #feh --bg-fill ~/Pictures/night1.jpg #feh --bg-fill ~/Downloads/Alaska_Range.jpg #conky diff --git a/bin/batt b/bin/batt index a5eb22f..73273d5 100755 --- a/bin/batt +++ b/bin/batt @@ -1,4 +1,9 @@ #!/bin/sh # print battery status -. /sys/class/power_supply/BAT0/uevent && -echo "$POWER_SUPPLY_TYPE $POWER_SUPPLY_STATUS $POWER_SUPPLY_CAPACITY%" +. /sys/class/power_supply/BAT0/uevent +case $POWER_SUPPLY_STATUS in + Discharging) s='↧' ;; + Full) s='¤' ;; + Charging) s='↥' ;; +esac +echo "power $s $POWER_SUPPLY_CAPACITY%" diff --git a/bin/lt b/bin/lt index 48424ef..741c42d 100755 --- a/bin/lt +++ b/bin/lt @@ -37,6 +37,7 @@ ca() { pp() { pp_s=$1 pp_b=$2 R1='' while true; do + ! [ "$pp_s" ] && R1='' && break [ "$pp_b" = "$pp_s" ] && break pp_s=${pp_s%/*} [ "$R1" ] && R1=$R1/.. || R1=.. @@ -50,6 +51,7 @@ rp() { ! [ "$rp_c" ] && ca "$1" "$2" && rp_c=$R1 rp_bs=${rp_s#$rp_c/} pp "$rp_d" "$rp_c" && R1=$R1/$rp_bs && R1=${R1#../} + case $R1 in //*) R1=${R1#/};; esac } skip=".git .gitignore .*.swp Makefile README.md" -- cgit v1.2.3