update keybinds

6 files changed, 82 insertions, 61 deletions

diff --git a/wmaker/GNUstep/Defaults/WMGLOBAL b/wmaker/GNUstep/Defaults/WMGLOBAL
index a92127d..435f171 100644
--- a/wmaker/GNUstep/Defaults/WMGLOBAL
+++ b/wmaker/GNUstep/Defaults/WMGLOBAL
@@ -1,4 +1,4 @@
 {
-  BoldSystemFont = "Iosevka Comfy:slant=0:weight=200:width=100:pixelsize=16";
-  SystemFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=16";
+  BoldSystemFont = "Iosevka Comfy:slant=0:weight=200:width=100:pixelsize=11";
+  SystemFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=11";
 }
diff --git a/wmaker/GNUstep/Defaults/WMRootMenu b/wmaker/GNUstep/Defaults/WMRootMenu
index 0078ee0..a4f2e96 100644
--- a/wmaker/GNUstep/Defaults/WMRootMenu
+++ b/wmaker/GNUstep/Defaults/WMRootMenu
@@ -2,9 +2,11 @@
   "Window Maker",
   (
     Applications,
-    (Firefox, EXEC, firefox),
+    (Firefox, EXEC, "firefox-bin"),
     (PCManFM, EXEC, pcmanfm),
     (Urxvt, SHORTCUT, "Mod4+Return", EXEC, urxvt),
+    (Emacsclient, SHORTCUT, "Mod4+n", EXEC, "emacsclient -c -n"),
+    (EMMS, SHORTCUT, "Mod4+m", EXEC, "emacs-launcher \"music\""),
     (Terminals, (st, EXEC, st)),
     (Graphics, (GIMP, EXEC, gimp), ("ImageMagick Display", EXEC, display)),
     (Multimedia, (VLC, EXEC, vlc)),
@@ -29,7 +31,7 @@
     (System, (top, EXEC, "urxvtc -e btop")),
     ("P2P Network", (sftp, EXEC, "st -e sftp"))
   ),
-  (Run..., EXEC, "%A(Run, Type command:)"),
+  (Run..., SHORTCUT, "Mod4+d", EXEC, "dmenu_run -c -l 15"),
   (
     Appearance,
     (
@@ -162,11 +164,7 @@
     ("Save Session", SAVE_SESSION),
     ("Clear Session", CLEAR_SESSION)
   ),
-  (
-    "Configure Window Maker",
-    EXEC,
-    "/usr/lib64/GNUstep/Applications/WPrefs.app/WPrefs"
-  ),
+  ("Configure Window Maker", EXEC, WPrefs),
   ("Info Panel", INFO_PANEL),
   ("Restart Window Maker", RESTART),
   ("Other Window Managers", ("Start Motif Window Manager", RESTART, mwm)),
diff --git a/wmaker/GNUstep/Defaults/WMWindowAttributes b/wmaker/GNUstep/Defaults/WMWindowAttributes
index 3d7fe7d..699e95f 100644
--- a/wmaker/GNUstep/Defaults/WMWindowAttributes
+++ b/wmaker/GNUstep/Defaults/WMWindowAttributes
@@ -1,33 +1,42 @@
 {
+  firefox.Firefox = {
+    SharedAppIcon = No;
+    Icon = firefox.xpm;
+  };
   pcmanfm.Pcmanfm = {
     AlwaysUserIcon = Yes;
     Icon = Bookshelf.xpm;
   };
-  firefox.Firefox = {
-    SharedAppIcon = No;
-    NoAppIcon = Yes;
-    Icon = Netscape.xpm;
-  };
   emacs.Emacs = {
     AlwaysUserIcon = Yes;
     Icon = "retro-emacs-logo.xpm";
   };
+  Navigator.LibreWolf = {
+    AlwaysUserIcon = Yes;
+    Icon = Mozilla.png;
+    EmulateAppIcon = Yes;
+  };
   st.St = {
     AlwaysUserIcon = No;
     Icon = "logan-terminal.xpm";
   };
   LibreWolf.LibreWolf = {
-    Icon = LibreWolf.LibreWolf.xpm;
+    SharedAppIcon = No;
+    Icon = Mozilla.png;
   };
   St = {
     AlwaysUserIcon = No;
     Icon = "logan-terminal.xpm";
   };
+  Navigator.firefox = {
+    AlwaysUserIcon = Yes;
+    Icon = Mozilla_Firefox_3.5_logo.png;
+    EmulateAppIcon = Yes;
+  };
   urxvt.URxvt = {
     Icon = TerminalLinux.xpm;
   };
-  Navigator.firefox = {
-    AlwaysUserIcon = Yes;
-    Icon = Netscape.xpm;
+  groupLeader.WPrefs = {
+    Icon = groupLeader.WPrefs.xpm;
   };
 }
diff --git a/wmaker/GNUstep/Defaults/WPrefs b/wmaker/GNUstep/Defaults/WPrefs
index 51a7ad1..6d078a5 100644
--- a/wmaker/GNUstep/Defaults/WPrefs
+++ b/wmaker/GNUstep/Defaults/WPrefs
@@ -5,27 +5,27 @@
     "#000000",
     "#292929",
     "#525252",
-    "#818181",
-    "#aaaaaa",
-    "#d3d3d3",
-    "#fdfdfd",
-    "#d3d389",
-    "#d3a27b",
-    "#89d389",
-    "#89d3cb",
-    "#d38989",
-    "#8999d3",
-    "#ba83d3",
-    "#d389ba",
-    "#d34a4a",
-    "#4a5ad3",
-    "#4ad3cb",
-    "#4ad35a",
-    "#cbd34a",
-    "#d3814a",
-    "#87d331",
-    "#cb29c3",
-    "#cb2973"
+    "#808080",
+    "#a7a7a7",
+    "#d0d0d0",
+    "#fafafa",
+    "#d0d086",
+    "#d09f7b",
+    "#86d086",
+    "#86d0c8",
+    "#d08686",
+    "#8696d0",
+    "#b780d0",
+    "#d086b7",
+    "#d04a4a",
+    "#4a5ad0",
+    "#4ad0c8",
+    "#4ad05a",
+    "#c8d04a",
+    "#d0804a",
+    "#84d031",
+    "#c829c0",
+    "#c82973"
   );
-  BalloonHelp = NO;
+  BalloonHelp = YES;
 }
diff --git a/wmaker/GNUstep/Defaults/WindowMaker b/wmaker/GNUstep/Defaults/WindowMaker
index b9df160..caffa18 100644
--- a/wmaker/GNUstep/Defaults/WindowMaker
+++ b/wmaker/GNUstep/Defaults/WindowMaker
@@ -1,9 +1,11 @@
 {
-  FTitleColor = "#dbdbdb";
+  FTitleColor = "#d7d7d7";
   FrameBorderColor = "#000000";
   ScreenCaptureKey = None;
-  MenuDisabledColor = "#969696";
+  MiniaturizeKey = "Shift+Mod4+F";
+  MenuDisabledColor = "#959595";
   Superfluous = NO;
+  LastWorkspaceKey = "Mod4+Tab";
   PixmapPath = (
     "/home/bard/GNUstep/Library/WindowMaker/Pixmaps",
     "/home/bard/GNUstep/Library/WindowMaker/Backgrounds",
@@ -21,8 +23,12 @@
     "#3d4254"
   );
   ToggleKbdModeKey = None;
+  WindowMenuKey = "Shift+Mod4+space";
+  MiniwindowPreviewBalloons = YES;
   ClipTitleFont = "Iosevka Comfy Wide Duo:slant=0:weight=80:width=125:pixelsize=10";
+  MaximizeKey = "Mod4+F";
   DoNotMakeAppIconsBounce = YES;
+  MaximusKey = "Mod4+T";
   IconTitleFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=12";
   MenuTextBack = (
     spixmap,
@@ -31,37 +37,41 @@
   );
   LargeDisplayFont = "Iosevka Comfy Wide Duo-24:slant=0:weight=200:width=125:pixelsize=24";
   KeepDockOnPrimaryHead = YES;
+  CycleWorkspaces = YES;
+  HotCornerDelay = 250;
   ResizeCursor = (
     bitmap,
     "/usr/share/WindowMaker/Themes/Motion.themed/dot_resize.xbm",
     "/usr/share/WindowMaker/Themes/Motion.themed/dot_resize_mask.xbm"
   );
-  HotCornerDelay = 250;
-  CenterKey = None;
-  IconTitleColor = "#c1c1c1";
+  CenterKey = "Mod4+C";
+  MoveToLastWorkspaceKey = "Shift+Mod4+Tab";
   TitleJustify = left;
-  MenuTextColor = "#d6d6d6";
+  IconTitleColor = "#bdbdbd";
+  MenuTextColor = "#d2d2d2";
   IconBack = (
     spixmap,
     "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/tile.png",
     "#424242"
   );
   AntialiasedText = YES;
-  MenuTitleColor = "#d6d6d6";
+  MenuTitleColor = "#d2d2d2";
+  LowerKey = "Mod4+S";
   MenuTitleFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=16";
   HotCorners = NO;
   WindowTitleExtendSpace = "-1";
   MoveTo6to12Head = None;
   DbClickFullScreen = NO;
-  IconPosition = brh;
   MenuTextFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=16";
+  NoWindowOverDock = YES;
+  NoWindowOverIcons = YES;
+  OmnipresentKey = "Shift+Mod4+S";
   WorkspaceBack = (
     spixmap,
     "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/scylla.tif",
     "#545454"
   );
-  OmnipresentKey = "Mod1+S";
-  HighlightTextColor = "#d6d6d6";
+  HighlightTextColor = "#d2d2d2";
   MenuTitleBack = (
     spixmap,
     "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/focused.png",
@@ -69,7 +79,7 @@
   );
   EnforceIconMargin = NO;
   AutoArrangeIcons = YES;
-  ClipTitleColor = "#cccccc";
+  ClipTitleColor = "#c8c8c8";
   MoveTo12to6Head = None;
   HotCornerActions = (None, None, None, None);
   WaitCursor = (
@@ -77,17 +87,18 @@
     "/usr/share/WindowMaker/Themes/Motion.themed/dot_wait.xbm",
     "/usr/share/WindowMaker/Themes/Motion.themed/dot_wait_mask.xbm"
   );
-  HighlightColor = "#4a4d49";
+  CloseKey = "Mod4+Q";
   FrameFocusedBorderColor = "#000000";
+  HighlightColor = "#4a4d49";
   WindowTitleFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=16";
-  RunKey = "Mod4+D";
-  CClipTitleColor = "#e5e5e5";
+  WrapMenus = YES;
+  CClipTitleColor = "#e1e1e1";
   MoveCursor = (
     bitmap,
     "/usr/share/WindowMaker/Themes/Motion.themed/dot_move.xbm",
     "/usr/share/WindowMaker/Themes/Motion.themed/dot_move_mask.xbm"
   );
-  RootMenuKey = "Mod1+space";
+  RootMenuKey = "Mod4+space";
   ResizebarBack = (
     spixmap,
     "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/focused.png",
@@ -102,23 +113,26 @@
     "/usr/share/WindowMaker/Pixmaps",
     "/usr/share/pixmaps"
   );
-  MiniPreviewSize = 72;
+  MiniPreviewSize = 248;
+  RaiseKey = "Mod4+A";
   DisplayFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
   KbdModeLock = NO;
-  MenuTextExtendSpace = "-1";
+  ModifierKey = Mod4;
   PTitleBack = (
     spixmap,
     "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/unfocused.png",
     "#3d4554"
   );
-  UTitleColor = "#989898";
+  MenuTextExtendSpace = "-1";
+  ViKeyMenus = YES;
+  UTitleColor = "#959595";
   UTitleBack = (
     spixmap,
     "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/unfocused.png",
     "#3d4554"
   );
-  PTitleColor = "#999999";
   CloseRootMenuByLeftOrRightMouseClick = YES;
+  PTitleColor = "#959595";
   MenuTitleExtendSpace = "-1";
-  FrameSelectedBorderColor = "#fefefe";
+  FrameSelectedBorderColor = "#fafafa";
 }
diff --git a/wmaker/GNUstep/Library/WindowMaker/autostart b/wmaker/GNUstep/Library/WindowMaker/autostart
index 9cb23ff..647d5cb 100755
--- a/wmaker/GNUstep/Library/WindowMaker/autostart
+++ b/wmaker/GNUstep/Library/WindowMaker/autostart
@@ -14,5 +14,5 @@
 #
 # This file must be executable.
 #
-xset m 20/10 4
+xset m 22/10 4