update

5 files changed, 24 insertions, 26 deletions

diff --git a/.fvwm2rc b/.fvwm2rc
index 97be73b..40c6ab9 100644
--- a/.fvwm2rc
+++ b/.fvwm2rc
@@ -1,23 +1,19 @@
 HilightColor	black IndianRed
-WindowFont	fixed
-IconFont	fixed
-MenuStyle	black grey76 grey30 fixed fvwm
+MenuStyle	* fvwm, Foreground black, Background grey76, Greyed grey30, Font fixed, AnimationOff
 IgnoreModifiers 2
 
-#Style "*" SloppyFocus
-Style "*" MouseFocusClickRaises
-Style "*" ForeColor black
-Style "*" BackColor SteelBlue
-Style "*" IconBox 800x64+0-0
-Style "*" MWMFunctions, MWMButtons, MWMBorder, MWMDecor, DecorateTransient, StickyIcon
-Style "*" RandomPlacement
+Style * MouseFocusClickRaises
+Style * ForeColor black
+Style * BackColor SteelBlue
+Style * IconBox 800x64+0-0
+Style * MWMFunctions, MWMButtons, MWMBorder, MWMDecor, DecorateTransient, StickyIcon
+Style * RandomPlacement
 
 OpaqueMoveSize 0
-#EdgeScroll 100 100
-#EdgeScroll 100000 100000
 EdgeScroll 0 0
-EdgeResistance 100000 100000
-#style "*" EdgeMoveResistance 100000 100
+EdgeResistance -1
+Style * EdgeMoveResistance 100000
+Style * EdgeMoveDelay -1
 
 DeskTopSize 2x2
 
@@ -30,7 +26,6 @@ Style "*Pager"      NoHandles, BorderWidth 0, WindowListSkip, CirculateSkip
 Style "FvwmBanner"  StaysOnTop
 Style "FvwmButtons" NoTitle, NoHandles, Sticky, WindowListSkip,BorderWidth 4
 Style "*lock"       NoTitle, NoHandles, WindowListSkip
-Style "gkrellm"     NoTitle, Sticky, WindowListSkip, CirculateSkip
 #Style "*unknown*"   NoTitle, BorderWidth 0, NoHandles, WindowListSkip
 
 #Style "rxvt"       Icon Monitor.xpm
@@ -43,6 +38,7 @@ Style "uxterm"     Icon Monitor.xpm
 
 AddToFunc "StartFunction"
 + I Exec xsetroot -solid '#103040'
++ I Test (Init) Exec xss-lock xlock +resetsaver
 + I Test (Init) Exec stalonetray
 + I Test (Init) Exec nm-applet
 + I Exec status2
@@ -81,12 +77,9 @@ AddToFunc "Focus-and-Raise" I Focus
 #========================================================================#
 DestroyMenu "Quit-Verify"
 AddToMenu "Quit-Verify"
-#+ "&Lock screen"	Exec exec vlock -an
 + "&Fvwm restart"	Restart
-#+ "&Lock screen"	Exec exec slock sudo sh -c "echo mem > /sys/power/state"
++ "&Lock screen"	Exec exec xlock +resetsaver
 + "&Quit X11"		Quit
-+ "&Suspend"		Exec exec slock sudo sh -c "echo mem > /sys/power/state"
-#+ "&Suspend"		Exec exec suspend
 + "&Reboot"		Exec exec sudo /sbin/reboot
 + "&Power off"		Exec exec sudo /sbin/poweroff
 
@@ -103,9 +96,9 @@ AddToMenu "Desktop-Apps"
 + "&Discord"		Exec exec discord
 + "&Firefox"		Exec exec firefox
 + "&Google Chrome"	Exec exec google-chrome-stable
-+ "&Keybase"		Exec exec keybase-gui
-+ "&LibreOffice"	Exec exec libreoffice
-+ "&RSS Guard"	Exec exec rssguard
+#+ "&Keybase"		Exec exec keybase-gui
+#+ "&LibreOffice"	Exec exec libreoffice
++ "&RSS Guard"	Exec exec rssguard -n
 + "S&ignal"		Exec exec signal-desktop
 + "&Slack"		Exec exec slack
 + "Sea&Monkey"	Exec exec seamonkey
@@ -124,7 +117,7 @@ AddToMenu "Multimedia"
 + "&Asunder"	Exec exec asunder
 + "&Geeqie"		Exec exec geeqie
 #+ "&Molotov"		Exec exec molotov
- "&Quodlibet"		Exec exec quodlibet
++ "&Quodlibet"		Exec exec quodlibet
 + "&Spotify"		Exec exec spotify
 + "&Vlc"		Exec exec vlc
 
diff --git a/.profile b/.profile
index 0971b3d..ff554d1 100644
--- a/.profile
+++ b/.profile
@@ -6,9 +6,10 @@ export LD_LIBRARY_PATH=~/mu/lib64:~/mu/lib
 
 [ "${SHELL##*/}" = bash ] && . ~/.bashrc
 
+tabs -4
+
 # Last action: auto start X11 when logged on first console
 #case $HOSTNAME in
 #([sS]wift|yoda) [ "$(tty)" != /dev/tty1 ] || exec startx ;;
 #esac
-
-tabs -4
+[ "$(tty)" != /dev/tty1 ] || exec startx 
diff --git a/.xinitrc b/.xinitrc
index 7928166..a66e8a5 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+exec 1>$HOME/.local/share/xorg/xinit.log 2>&1
+
 eval $(ssh-agent)
 
 # enable tapping and natural scrolling on touchpad
diff --git a/bin/lt b/bin/lt
index 741c42d..bf0631c 100755
--- a/bin/lt
+++ b/bin/lt
@@ -54,7 +54,7 @@ rp() {
 	case $R1 in //*) R1=${R1#/};; esac
 }
 
-skip=".git .gitignore .*.swp Makefile README.md"
+skip=".build .git .gitignore .*.swp Makefile README.md"
 
 # lt links src tree to dest (each file is a link)
 lt() {
diff --git a/swift/lib64/elogind/system-sleep/lock b/swift/lib64/elogind/system-sleep/lock
new file mode 100755
index 0000000..6dd4119
--- /dev/null
+++ b/swift/lib64/elogind/system-sleep/lock
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ "$1" = pre ] && exec su -c 'DISPLAY=:0 /usr/bin/xlock' marc