battery script, change keybinds

4 files changed, 25 insertions, 24 deletions

diff --git a/fvwm/.fvwm/config b/fvwm/.fvwm/config
index 8612e37..d7dd61c 100644
--- a/fvwm/.fvwm/config
+++ b/fvwm/.fvwm/config
@@ -215,7 +215,7 @@ MoveThreshold 3
 Style * SloppyFocus, MouseFocusClickRaises
 
 # Default Font
-DefaultFont "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=12:antialias=True"
+DefaultFont "xft:Iosevka Comfy Duo:size=12:antialias=True"
 
 # Window Placement
 Style * MinOverlapPlacement, GrabFocusOff, !UsePPosition
@@ -309,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=12:antialias=True"
+MenuStyle * Font "xft:Iosevka Comfy Duo:Italic:size=14:antialias=True"
 
 # Root Menu
 #
@@ -585,10 +585,10 @@ 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     4C      Tile 60 100 +0 +0
+Silent Key L        A     4C      Tile 40 100 -0 +0
+Silent Key J        A     4C      Tile 40 40 -0 -0
+Silent Key K        A     4C      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
@@ -711,9 +711,11 @@ Test (x stalonetray) PipeRead 'echo "*LeftPanel: (120x$(($[vp.height]-225)), \
     Top, Swallow FvwmIconMan \'Module FvwmIconMan\', Frame 0)"'
 Test (!x stalonetray) PipeRead 'echo "*LeftPanel: (120x$(($[vp.height]-205)),\
     Top, Swallow FvwmIconMan \'Module FvwmIconMan\', Frame 0)"'
-*LeftPanel: (120x45, Swallow DateTime 'Module FvwmScript fvwmscript/FvwmScript-DateTime',\
+*LeftPanel: (120x60, Swallow DateTime 'Module FvwmScript fvwmscript/FvwmScript-DateTime',\
     Frame 0)
-*LeftPanel: (120x5, Frame 0)
+*LeftPanel: (120x50, Swallow ACPIStatus 'Module FvwmScript fvwmscript/FvwmScript-ACPIStatus',\
+    Frame 0)    
+# *LeftPanel: (120x5, Frame 0)
 
 # FvwmPager
 #
@@ -726,7 +728,7 @@ DestroyModuleConfig FvwmPager:*
 *FvwmPager: WindowColorsets 10 11
 *FvwmPager: Font None
 *FvwmPager: Balloons All
-*FvwmPager: BalloonFont "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=12:antialias=True"
+*FvwmPager: BalloonFont "xft:Iosevka Comfy Duo:Italic:size=14:antialias=True"
 *FvwmPager: BallonYOffset +2
 *FvwmPager: Window3dBorders
 *FvwmPager: MiniIcons
@@ -748,7 +750,7 @@ DestroyModuleConfig FvwmIconMan:*
 *FvwmIconMan: DrawIcons always
 *FvwmIconMan: ReliefThickness 0
 *FvwmIconMan: Format "%t"
-*FvwmIconMan: Font "Shadow=2:xft:Iosevka Comfy Duo:Italic:size=12:antialias=True"
+*FvwmIconMan: Font "xft:Iosevka Comfy Duo:size=14:antialias=True"
 *FvwmIconMan: Action Mouse 0 A ret
 *FvwmIconMan: Action Mouse 1 A sendcommand IconManClick
 *FvwmIconMan: Action Mouse 3 A sendcommand "Menu MenuIconOps"
diff --git a/fvwm/.fvwm/fvwmscript/.#FvwmScript-ACPIStatus b/fvwm/.fvwm/fvwmscript/.#FvwmScript-ACPIStatus
deleted file mode 120000
index f86cf16..0000000
--- a/fvwm/.fvwm/fvwmscript/.#FvwmScript-ACPIStatus
+++ /dev/null
@@ -1 +0,0 @@
[email protected]:1720031871
\ No newline at end of file
diff --git a/fvwm/.fvwm/fvwmscript/FvwmScript-ACPIStatus b/fvwm/.fvwm/fvwmscript/FvwmScript-ACPIStatus
index b6c6d75..a9daa8b 100644
--- a/fvwm/.fvwm/fvwmscript/FvwmScript-ACPIStatus
+++ b/fvwm/.fvwm/fvwmscript/FvwmScript-ACPIStatus
@@ -1,21 +1,21 @@
-WindowTitle {}
+WindowTitle {ACPIStatus}
 WindowSize  120 35
-Font "xft:Iosevka Comfy:size=12"
+Font "xft:Iosevka Comfy:size=14"
 
 Init
  Begin
-  Set $Date = (GetOutput {exec date "+%Y-%m-%d"} 1 -1)
+  Set $Battery = (GetOutput {exec acpi | sed -e 's/^.*, \([0-9]*\)%.*$/\1%/g'} 1 -1)
 
-  ChangeTitle 1 $Date
+  ChangeTitle 1 $Battery
 End
 
 PeriodicTasks
  Begin
-  If (RemainderOfDiv (GetTime) 15)==0 Then
+  If (RemainderOfDiv (GetTime) 60)==0 Then
   Begin
-   Set $Date = (GetOutput {exec date "+%Y-%m-%d"} 1 -1)
+   Set $Battery = (GetOutput {exec acpi | sed -e 's/^.*, \([0-9]*\)%.*$/\1%/g'} 1 -1)
 
-   ChangeTitle 1 $Date
+   ChangeTitle 1 $Battery
   End
 End
 
@@ -23,7 +23,7 @@ Widget 1
 Property
  Position 0 0
  Size 120 20
- Font "xft:Iosevka Comfy:size=12"
+ Font "xft:Iosevka Comfy:size=14"
  Type ItemDraw
  Flags NoReliefString
  Title {}
diff --git a/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime b/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime
index 1d316d9..340ea1f 100644
--- a/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime
+++ b/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime
@@ -1,6 +1,6 @@
 WindowTitle {DateTime}
-WindowSize  120 35
-Font "xft:Iosevka Comfy:size=12"
+WindowSize  120 65
+Font "xft:Iosevka Comfy:size=14"
 
 Init
  Begin
@@ -27,7 +27,7 @@ Widget 1
 Property
  Position 0 0
  Size 120 20
- Font "xft:Iosevka Comfy:size=12"
+ Font "xft:Iosevka Comfy:size=14"
  Type ItemDraw
  Flags NoReliefString
  Title {}
@@ -41,8 +41,8 @@ End
 Widget 2
 Property
  Position 0 20
- Size 120 15
- Font "xft:Iosevka Comfy:size=12"
+ Size 120 20
+ Font "xft:Iosevka Comfy:size=14"
  Type ItemDraw
  Flags NoReliefString
  Title {}