bigupdate

5 files changed, 146 insertions, 124 deletions

diff --git a/fvwm/.fvwm/.sidebar.fvwm2rc b/fvwm/.fvwm/.sidebar.fvwm2rc
index 5b56587..48d8362 100644
--- a/fvwm/.fvwm/.sidebar.fvwm2rc
+++ b/fvwm/.fvwm/.sidebar.fvwm2rc
@@ -51,27 +51,11 @@ DestroyModuleConfig FvwmButtons sidebar: *
             Colorset 8,  PressColorset 9,\
             Action Module FvwmIdent )
 
-*sidebar: ( 1x2 , Frame 1, ActiveTitle "Update", \
-            Colorset 8, \
-            PressColorset 9, \
-            Icon "Singing Bowl.png", \
-            Action (Mouse 1) Refresh, \
-            Action (Mouse 3) Restart)
-
 *sidebar: ( 1x2, Frame 1, ActiveTitle "Lock", \
             Colorset 8, \
             PressColorset 9, \
             Icon "Shoji2(paper sliding-door).png", \
-            Action (Mouse 1) Exec exec xscreensaver-command -lock , \
-            Action (Mouse 3) Exec "Xscreensaver-demo" \
-                exec xscreensaver-demo )
-
-*sidebar: ( 1x2 , Frame 1, ActiveTitle "Suspend", \
-            Colorset 8, \
-            PressColorset 9, \
-            Icon "Futon (bed).png", \
-            Action (Mouse 1) Exec exec "$HOME/.local/bin/scripts/sysact.sh" )
-
+            Action (Mouse 1) Exec exec slock)
 
 # Style sidebar Sticky, NeverFocus, !Borders, NoIcon, \
 #                 FixedSize, !Title, WindowListSkip, Layer 0, \
diff --git a/fvwm/.fvwm/config b/fvwm/.fvwm/config
index e1cea86..8612e37 100644
--- a/fvwm/.fvwm/config
+++ b/fvwm/.fvwm/config
@@ -36,6 +36,9 @@ ImagePath +:$[FVWM_USERDIR]/icon/Yoritsuki
 
 read .sidebar.fvwm2rc
 
+SetEnv fvwmscript $[HOME]/.fvwm/fvwmscript/
+SetEnv scripts $[HOME]/.fvwm/scripts
+
 ###########
 # 1: Functions
 #
@@ -63,7 +66,7 @@ AddToFunc   StartFunction
 + I Test (Init) InitBackground
 + I Test (Init) Module FvwmBanner
 + I Module FvwmButtons LeftPanel
-# + I Module FvwmButtons sidebar
++ I Module FvwmButtons sidebar
 + I Module FvwmEvent EventNewDesk
 
 # Function to set background when fvwm starts
@@ -154,15 +157,15 @@ AddToFunc   ChangeDesk
 + I SendToModule FvwmButtons ChangeButton desk$0 Colorset 11
 
 # Function used for tiling/un-tiling windows.
-DestroyFunc Tile
-AddToFunc Tile
-+ I ThisWindow (Maximized) Maximize toggle
-+ I TestRc (Match) Break
-+ I Maximize Forget
-+ I Raise
-+ I Maximize $0 $1
-+ I Move $2 $3
-+ I Focus
+# DestroyFunc Tile
+# AddToFunc Tile
+# + I ThisWindow (Maximized) Maximize toggle
+# + I TestRc (Match) Break
+# + I Maximize Forget
+# + I Raise
+# + I Maximize $0 $1
+# + I Move $2 $3
+# + I Focus
 
 #############
 # 2: Styles #
@@ -212,7 +215,7 @@ MoveThreshold 3
 Style * SloppyFocus, MouseFocusClickRaises
 
 # Default Font
-DefaultFont "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=14:antialias=True"
+DefaultFont "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=12:antialias=True"
 
 # Window Placement
 Style * MinOverlapPlacement, GrabFocusOff, !UsePPosition
@@ -306,7 +309,7 @@ MenuStyle * MenuColorset 5, ActiveColorset 6, GreyedColorset 7, TitleColorset 8
 MenuStyle * Hilight3DOff, HilightBack, HilightTitleBack, SeparatorsLong
 MenuStyle * TrianglesSolid, TrianglesUseFore
 # MenuStyle * ItemFormat "%|%3.1i%5.3l%5.3>%|"
-MenuStyle * Font "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=14:antialias=True"
+MenuStyle * Font "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=12:antialias=True"
 
 # Root Menu
 #
@@ -480,17 +483,27 @@ AddToMenu   MenuFvwmManPages "Help" Title
 #
 # Silent supresses any errors (such as keyboards with no Menu key).
 Silent Key F1 A M Menu MenuFvwmRoot
-Silent Key Menu A A Menu MenuFvwmRoot
+Silent Key Space A 4 Menu MenuFvwmRoot
 Silent Key Tab A M WindowList Root c c NoDeskSort, CurrentAtEnd, SelectOnRelease Meta_L
-Silent Key 1 A 4 GotoDesk 0 0
-Silent Key 2 A 4 GotoDesk 0 1
-Silent Key 3 A 4 GotoDesk 0 2
-Silent Key 4 A 4 GotoDesk 0 3
-
-Silent Key 1 A 4S MoveToDesk 0 0
-Silent Key 2 A 4S MoveToDesk 0 1
-Silent Key 3 A 4S MoveToDesk 0 2
-Silent Key 4 A 4S MoveToDesk 0 3
+Silent Key F1 A 4 GotoDesk 0 0
+Silent Key F2 A 4 GotoDesk 0 1
+Silent Key F3 A 4 GotoDesk 0 2
+Silent Key F4 A 4 GotoDesk 0 3
+
+Silent Key F1 A 4S MoveToDesk 0 0
+Silent Key F2 A 4S MoveToDesk 0 1
+Silent Key F3 A 4S MoveToDesk 0 2
+Silent Key F4 A 4S MoveToDesk 0 3
+
+Silent Key 1 A 4 GotoPage 0 0
+Silent Key 2 A 4 GotoPage 1 0
+Silent Key 3 A 4 GotoPage 0 1
+Silent Key 4 A 4 GotoPage 1 1
+
+Silent Key 1 A 4S MoveToPage 0 0
+Silent Key 2 A 4S MoveToPage 1 0
+Silent Key 3 A 4S MoveToPage 0 1
+Silent Key 4 A 4S MoveToPage 1 1
 
 DestroyMenu MenuSendToPage
 AddToMenu   MenuSendToPage
@@ -510,9 +523,6 @@ Silent Key Return A 4 Exec exec $[infostore.terminal]
 Silent Key Return   A 4     Exec exec $[infostore.terminal]
 Silent Key E        A 4     Exec exec emacs
 Silent Key N        A 4     Exec exec emacsclient -c
-Silent Key F1       A 4     Exec exec firefox-bin
-Silent Key F2       A 4     Exec exec emacs
-Silent Key F3       A 4     Exec exec emacsclient -c -e '(bard/default-agenda)'
 Silent Key D        A 4     Exec exec dmenu_run
 
 # browser
@@ -530,6 +540,7 @@ Silent Key B       A 4        Exec exec "$HOME/.local/bin/scripts/scratch.sh"
 Silent Key N       A 4S       Exec exec "$HOME/.local/bin/scripts/dired_selector"
 Silent Key M       A 4S       Exec exec "$HOME/.local/bin/scripts/wallpaper.sh"
 Silent Key M       A 4        Exec exec emacsclient -c -e '(emms)'
+Silent Key Quote   A 4        Exec exec emacsclient -c -e '(calc)'
 # screenshot
 Silent Key Print   A S        Exec exec maim "$HOME/Pictures/screenshots/pic-full-$(date '+%y%m%d-%H%M-%S').png"; notify-send 'screenshot taken'
 Silent Key Print   A A        Exec exec "$HOME/.local/bin/scripts/maimpick"
@@ -571,15 +582,18 @@ Silent Key Q        A     4       Close
 Silent Mouse 3        A     4       Resize
 Silent Mouse 1        A     4       Move
 
+# maximize/minimize window
+
 # alt+shift hjkl to tile left, bottom-right, top-right, full-right respectively 
-Silent Key H        A     MS      Tile 60 100 +0 +0
-Silent Key L        A     MS      Tile 40 100 -0 +0
-Silent Key J        A     MS      Tile 40 40 -0 -0
-Silent Key K        A     MS      Tile 40 60 -0 +0
+# Silent Key H        A     MS      Tile 60 100 +0 +0
+# Silent Key L        A     MS      Tile 40 100 -0 +0
+# Silent Key J        A     MS      Tile 40 40 -0 -0
+# Silent Key K        A     MS      Tile 40 60 -0 +0
  
 # Super+C/F/J/H/K/L - center, maximize, move window, etc
 Silent Key C        A     4       AnimatedMove 50-50w 50-50w
 Silent Key F        A     4       Maximize toggle 100 100
+Silent Key F        A     4S      Iconify
 silent Key H        A     4       AnimatedMove +0 w0px
 Silent Key L        A     4       AnimatedMove -0 w0px
 Silent Key J        A     4       AnimatedMove w0px -0
@@ -590,10 +604,10 @@ Silent Key J        A     4S      Move w0px w20px
 Silent Key K        A     4S      Move w0px w-20px
  
 # Maximize in direction until we hit another window.
-Silent Key H        A     MC      Maximize growleft 0
-Silent Key L        A     MC      Maximize growright 0
-Silent Key J        A     MC      Maximize 0 growdown
-Silent Key K        A     MC      Maximize 0 growup
+Silent Key Left        A     MC      Maximize growleft 0
+Silent Key Right       A     MC      Maximize growright 0
+Silent Key Up          A     MC      Maximize 0 growup
+Silent Key Down        A     MC      Maximize 0 growdown
 
 #######
 # 6: Window Decor
@@ -640,7 +654,7 @@ ButtonStyle 6 - MwmDecorMin
 # a window. One use is getting the class/resource/name of a window.
 DestroyModuleConfig FvwmIdent:*
 *FvwmIdent: Colorset 10
-*FvwmIdent: Font "xft:Iosevka Comfy:size=14:antialias=True"
+*FvwmIdent: Font "xft:Iosevka Comfy:size=12:antialias=True"
 
 # FvwmBanner
 #
@@ -670,14 +684,15 @@ DestroyModuleConfig FvwmScript:*
 #
 # Note - To use the system tray you must have "stalonetray" installed.
 DestroyModuleConfig LeftPanel:*
+DestroyModuleConfig LeftPanel:*
 *LeftPanel: Geometry 120x$[vp.height]+0+0
 # *LeftPanel: Geometry 120x$[vp.height]-0+0
 *LeftPanel: Colorset 10
 *LeftPanel: Rows $[vp.height]
 *LeftPanel: Columns 120
 *LeftPanel: Frame 0
-*LeftPanel: Font "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=14:antialias=True"
-# *LeftPanel: (120x20, Icon "fvwm-logo-small.png", Frame 0)
+*LeftPanel: Font "xft:Iosevka Comfy:Bold:size=12:antialias=True"
+# *LeftPanel: (120x45, Icon "fvwm-logo-small.png", Frame 0)
 *LeftPanel: (120x5, Frame 0)
 *LeftPanel: (10x20, Frame 0)
 *LeftPanel: (25x20, Id desk0, Title "0", Action (Mouse 1) GotoDesk 0 0, Colorset 11, ActiveColorset 12, Frame 0)
@@ -692,76 +707,11 @@ DestroyModuleConfig LeftPanel:*
 Test (x stalonetray) *LeftPanel: (120x20, Swallow(NoClose,UseOld) \
     stalonetray 'Exec exec stalonetray --config \
     "$[FVWM_DATADIR]/default-config/.stalonetrayrc"', Frame 0)
-# Test (x stalonetray) PipeRead 'echo "*LeftPanel: (120x$(($[vp.height]-225)), \
-#     Top, Swallow FvwmIconMan \'Module FvwmIconMan\', Frame 0)"'
-
-Test (x stalonetray) PipeRead 'echo "*LeftPanel: (120x200), \
+Test (x stalonetray) PipeRead 'echo "*LeftPanel: (120x$(($[vp.height]-225)), \
     Top, Swallow FvwmIconMan \'Module FvwmIconMan\', Frame 0)"'
-
-*LeftPanel: ( 120x40, Frame 1, Colorset 8, PressColorset 9,  \
-            Icon "Chouchin Reinensai.png", \
-            ActiveTitle "Net", \
-            Action (Mouse 1) Exec exec firefox-bin, \
-            Action (Mouse 2) Exec exec discord, \
-            Action (Mouse 3) Exec exec librewolf-bin)
-
-*LeftPanel: ( 120x40, Frame 1, Colorset 8, PressColorset 9, \
-            Icon Bonsai.png, \
-            ActiveTitle "Files", \
-            Action (Mouse 1) Exec exec emacsclient -c -e "(dired \"~/\")", \
-            Action (Mouse 3) Exec exec "$HOME/.local/bin/scripts/dired_selector" )
-
-*LeftPanel: ( 120x40, Frame 1, Colorset 8, PressColorset 9, \
-            ActiveTitle "Term", \
-            Icon "Yunomi (tea cup).png", \
-            Action (Mouse 1) Exec "St" exec st)
-
-*LeftPanel: ( 120x40, Frame 1, Colorset 8,  PressColorset 9, \
-            ActiveTitle "Editor", \
-            Icon Shodou.png, \
-            Action (Mouse 1) Exec "GNU Emacs" exec emacs, \
-            Action (Mouse 3) Exec "GNU Emacs (client)" exec emacsclient -c )
-
-*LeftPanel: ( 120x40, Frame 1, Colorset 8, PressColorset 9, \
-            ActiveTitle "Media", \
-            Icon Shamisen.png, \
-            Action (Mouse 1) Exec exec emacsclient -c -e '(emms)')
-
-*LeftPanel: ( 120x40, Frame 1, Colorset 8, PressColorset 9, \
-            ActiveTitle "Utilities", \
-            Icon "Ishidourou.png", \
-            Action (Mouse 1) Exec "Network" exec st -e nmtui, \
-            Action (Mouse 3) Exec "Monitor" exec st -e btop)
-
-*LeftPanel: ( 120x40, Frame 1, Icon "Tourist guidebook.png", \
-            ActiveTitle "Identify ...", \
-            Colorset 8,  PressColorset 9,\
-            Action Module FvwmIdent )
-
-*LeftPanel: ( 120x40 , Frame 1, ActiveTitle "Update", \
-            Colorset 8, \
-            PressColorset 9, \
-            Icon "Singing Bowl.png", \
-            Action (Mouse 1) Refresh, \
-            Action (Mouse 3) Restart)
-
-*LeftPanel: ( 120x40, Frame 1, ActiveTitle "Lock", \
-            Colorset 8, \
-            PressColorset 9, \
-            Icon "Shoji2(paper sliding-door).png", \
-            Action (Mouse 1) Exec exec xscreensaver-command -lock , \
-            Action (Mouse 3) Exec "Xscreensaver-demo" \
-                exec xscreensaver-demo )
-
-*LeftPanel: ( 120x40 , Frame 1, ActiveTitle "Suspend", \
-            Colorset 8, \
-            PressColorset 9, \
-            Icon "Futon (bed).png", \
-            Action (Mouse 1) Exec exec "$HOME/.local/bin/scripts/sysact.sh" )
-
 Test (!x stalonetray) PipeRead 'echo "*LeftPanel: (120x$(($[vp.height]-205)),\
     Top, Swallow FvwmIconMan \'Module FvwmIconMan\', Frame 0)"'
-*LeftPanel: (120x45, Swallow DateTime 'Module FvwmScript FvwmScript-DateTime',\
+*LeftPanel: (120x45, Swallow DateTime 'Module FvwmScript fvwmscript/FvwmScript-DateTime',\
     Frame 0)
 *LeftPanel: (120x5, Frame 0)
 
@@ -776,7 +726,7 @@ DestroyModuleConfig FvwmPager:*
 *FvwmPager: WindowColorsets 10 11
 *FvwmPager: Font None
 *FvwmPager: Balloons All
-*FvwmPager: BalloonFont "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=14:antialias=True"
+*FvwmPager: BalloonFont "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=12:antialias=True"
 *FvwmPager: BallonYOffset +2
 *FvwmPager: Window3dBorders
 *FvwmPager: MiniIcons
@@ -798,7 +748,7 @@ DestroyModuleConfig FvwmIconMan:*
 *FvwmIconMan: DrawIcons always
 *FvwmIconMan: ReliefThickness 0
 *FvwmIconMan: Format "%t"
-*FvwmIconMan: Font "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=14:antialias=True"
+*FvwmIconMan: Font "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=12:antialias=True"
 *FvwmIconMan: Action Mouse 0 A ret
 *FvwmIconMan: Action Mouse 1 A sendcommand IconManClick
 *FvwmIconMan: Action Mouse 3 A sendcommand "Menu MenuIconOps"
@@ -838,5 +788,3 @@ DestroyFunc SmartPrevPageFlipFocus
 AddToFunc SmartPrevPageFlipFocus
 + I Prev (CurrentDesk,AcceptsFocus,!Iconic,Iconifiable) FuncFlipFocusWindow
 + I TestRc (Match) EchoPageNumberIfFull cyan
-
-Key Z A 4 SmartPrevPageFlipFocus
\ No newline at end of file
diff --git a/fvwm/.fvwm/fvwmscript/.#FvwmScript-ACPIStatus b/fvwm/.fvwm/fvwmscript/.#FvwmScript-ACPIStatus
new file mode 120000
index 0000000..f86cf16
--- /dev/null
+++ b/fvwm/.fvwm/fvwmscript/.#FvwmScript-ACPIStatus
@@ -0,0 +1 @@
[email protected]:1720031871
\ No newline at end of file
diff --git a/fvwm/.fvwm/fvwmscript/FvwmScript-ACPIStatus b/fvwm/.fvwm/fvwmscript/FvwmScript-ACPIStatus
new file mode 100644
index 0000000..b6c6d75
--- /dev/null
+++ b/fvwm/.fvwm/fvwmscript/FvwmScript-ACPIStatus
@@ -0,0 +1,35 @@
+WindowTitle {}
+WindowSize  120 35
+Font "xft:Iosevka Comfy:size=12"
+
+Init
+ Begin
+  Set $Date = (GetOutput {exec date "+%Y-%m-%d"} 1 -1)
+
+  ChangeTitle 1 $Date
+End
+
+PeriodicTasks
+ Begin
+  If (RemainderOfDiv (GetTime) 15)==0 Then
+  Begin
+   Set $Date = (GetOutput {exec date "+%Y-%m-%d"} 1 -1)
+
+   ChangeTitle 1 $Date
+  End
+End
+
+Widget 1
+Property
+ Position 0 0
+ Size 120 20
+ Font "xft:Iosevka Comfy:size=12"
+ Type ItemDraw
+ Flags NoReliefString
+ Title {}
+Main
+ Case message of
+  SingleClic :
+  Begin
+  End
+End
diff --git a/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime b/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime
new file mode 100644
index 0000000..1d316d9
--- /dev/null
+++ b/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime
@@ -0,0 +1,54 @@
+WindowTitle {DateTime}
+WindowSize  120 35
+Font "xft:Iosevka Comfy:size=12"
+
+Init
+ Begin
+  Set $Date = (GetOutput {exec date "+%Y-%m-%d"} 1 -1)
+  Set $Time = (GetOutput {exec date "+%H:%M"} 1 -1)
+
+  ChangeTitle 1 $Date
+  ChangeTitle 2 $Time
+End
+
+PeriodicTasks
+ Begin
+  If (RemainderOfDiv (GetTime) 15)==0 Then
+  Begin
+   Set $Date = (GetOutput {exec date "+%Y-%m-%d"} 1 -1)
+   Set $Time = (GetOutput {exec date "+%H:%M"} 1 -1)
+
+   ChangeTitle 1 $Date
+   ChangeTitle 2 $Time
+  End
+End
+
+Widget 1
+Property
+ Position 0 0
+ Size 120 20
+ Font "xft:Iosevka Comfy:size=12"
+ Type ItemDraw
+ Flags NoReliefString
+ Title {}
+Main
+ Case message of
+  SingleClic :
+  Begin
+  End
+End
+
+Widget 2
+Property
+ Position 0 20
+ Size 120 15
+ Font "xft:Iosevka Comfy:size=12"
+ Type ItemDraw
+ Flags NoReliefString
+ Title {}
+Main
+ Case message of
+  SingleClic :
+  Begin
+  End
+End