Merge branch 'master' of git://git.draconx.com/fvwmconf

[fvwmconf.git] / config

diff --git a/config b/config
index bcf5388c8cd34a32909c150fd7d10e532a1ff619..d436df7fc72867d41aa7d534388654a293b05902 100644 (file)
--- a/config
+++ b/config
@@ -4,13 +4,24 @@ ImagePath $[FVWM_USERDIR]/icons:$[FVWM_USERDIR]/pixmaps
 DestroyFunc InitFunction
 DestroyFunc StartFunction
 DestroyFunc ExitFunction
-SetEnv TERMINAL /home/nick/bin/urxvt.sh
+
+# Global environment
+SetEnv TERMINAL $[HOME]/bin/urxvt.sh
 PipeRead 'echo SetEnv HOST `hostname`'
 
+SetEnv MUSIC /home/music
+
+SetEnv XMODIFIERS '@im=uim'
+SetEnv GTK_IM_MODULE 'uim'
+SetEnv QT_IM_MODULE 'uim'
+
+SetEnv GTK2_RC_FILES $[FVWM_USERDIR]/gtk2rc
+
 # Global Features
 Read global/multiscreen
 Read global/fullscreen
 Read global/windowmenu
+Read global/appspecific
 
 # Machine-specific features
 PipeRead "[ -f '$[FVWM_USERDIR]/$[HOST]/config' ] \
@@ -20,7 +31,8 @@ PipeRead "[ -f '$[FVWM_USERDIR]/$[HOST]/config' ] \
 # Virtual Desktops
 DesktopSize 6x1
 EdgeThickness 1
-EdgeResistance 1 0
+EdgeResistance 1
+Style * EdgeMoveDelay 1, EdgeMoveResistance 0
 EdgeScroll 0 0
 
 #####