X-Git-Url: http://git.draconx.ca/gitweb/fvwmconf.git/blobdiff_plain/b806e35698faf14958f097aee99ca812e54970a9..49992fd5ef5385336dd065917cb1bbb05900992b:/config

diff --git a/config b/config
index 769e0c7..99a6260 100644
--- a/config
+++ b/config
@@ -5,15 +5,18 @@ DestroyFunc InitFunction
 DestroyFunc StartFunction
 DestroyFunc ExitFunction
 SetEnv TERMINAL /home/nick/bin/urxvt.sh
+PipeRead 'echo SetEnv HOST `hostname`'
 
-# Features
-Read multiscreen
-Read nickstheme
-Read rootmenu
-Read wallpaper
-Read windowmenu
-Read bindings
-Read panels
+# Global Features
+Read global/multiscreen
+Read global/fullscreen
+Read global/windowmenu
+Read global/appspecific
+
+# Machine-specific features
+PipeRead "[ -f '$[FVWM_USERDIR]/$[HOST]/config' ] \
+          && echo Read $[HOST]/config \
+	  || echo Read default/config"
 
 # Virtual Desktops
 DesktopSize 6x1
@@ -38,18 +41,6 @@ OpaqueMoveSize -1
 Style * TileCascadePlacement, GrabFocusOff
 Style * ResizeOpaque
 Style * EWMHUseStrutHints, MwmButtons
-EwmhBaseStruts 0 0 0 42
-
-# Bindings
-Key grave A C Exec exec $[TERMINAL]
-
-# FVWM Console
-Key F3 A M Module FvwmConsole -terminal $[TERMINAL]
-Key F3 A M2 Module FvwmConsole -terminal $[TERMINAL]
-
-# Close Window
-Key F4 A M Close
-Key F4 A M2 Close
 
 # Window Buttons
 Mouse 1 I N IconClick
@@ -73,31 +64,6 @@ Style Xchat DecorateTransient
 Style EasyTag_Scanner DecorateTransient
 Style "Open Image" DecorateTransient
 
-#####
-# Modifier Key
-##########
-DestroyFunc Mouse1Func
-AddToFunc   Mouse1Func
- + C Raise
- + D Maximize 100 100
- + M Move
-
-DestroyFunc Mouse2Func
-AddToFunc   Mouse2Func
- + C Menu MenuWindow
- + D Maximize 0 100
-
-DestroyFunc Mouse3Func
-AddToFunc   Mouse3Func
- + C Lower
- + D Maximize 100 0
- + M PipeRead '. $[FVWM_USERDIR]/resize.sh $[pointer.wx] $[pointer.wy] $[w.width] $[w.height]'
-
-
-Mouse 1 WFT M Mouse1Func
-Mouse 2 WFT M Mouse2Func
-Mouse 3 WFT M Mouse3Func
-
 # URGENT!
 
 DestroyFunc UrgencyFunc