commit cc16f56ae4d9ce803729aa46425a34b2fb938b86
parent 5a35c4bd563235acd652f4603a5673fc05b35fc5
Author: jacobsGit <JacobDoesLinux@protonmail.com>
Date: Mon, 9 Dec 2019 23:38:58 -0800
Major improvments in all areas
Diffstat:
5 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/xmonad/.xmonad/xmonad-x86_64-linux b/xmonad/.xmonad/xmonad-x86_64-linux
Binary files differ.
diff --git a/xmonad/.xmonad/xmonad.errors b/xmonad/.xmonad/xmonad.errors
@@ -1,32 +1,39 @@
-xmonad.hs:13:12: warning: [-Wdeprecations]
+xmonad.hs:14:12: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
-13 | myConfig = defaultConfig
+14 | myConfig = defaultConfig
| ^^^^^^^^^^^^^
-xmonad.hs:55:101: warning: [-Wdeprecations]
+xmonad.hs:41:42: warning: [-Wdeprecations]
+ In the use of `spacing' (imported from XMonad.Layout.Spacing):
+ Deprecated: "Use spacingRaw instead."
+ |
+41 | gaps [(L,0), (R,0), (U,0), (D,0)] $ spacing 0 $ Tall 1 (3/100) (1/2) |||
+ | ^^^^^^^
+
+xmonad.hs:72:101: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
-55 | [((myModMask , k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_p]]++
+72 | [((myModMask , k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]]++
| ^^^^^^^^^^^^^
-xmonad.hs:56:131: warning: [-Wdeprecations]
+xmonad.hs:73:131: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
-56 | [((mod4Mask , k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_p]
+73 | [((mod4Mask , k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]
| ^^^^^^^^^^^^^
-xmonad.hs:69:82: warning: [-Wdeprecations]
+xmonad.hs:89:78: warning: [-Wdeprecations]
In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
-69 | , manageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
- | ^^^^^^^^^^^^^
+89 | myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
+ | ^^^^^^^^^^^^^
diff --git a/xmonad/.xmonad/xmonad.hi b/xmonad/.xmonad/xmonad.hi
Binary files differ.
diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
@@ -5,11 +5,12 @@ import XMonad.Hooks.EwmhDesktops
import XMonad.Hooks.ManageHelpers
import XMonad.Layout.NoBorders
import XMonad.Layout.Fullscreen
+import XMonad.Layout.Spacing
+import XMonad.Layout.Gaps
import qualified Data.Map as M
import qualified XMonad.StackSet as S
------------------------------------------
-toggleStrutsKey XConfig {XMonad.modMask = modMask} = (modMask, xK_b)
myConfig = defaultConfig
myModMask = mod1Mask
@@ -19,17 +20,31 @@ myNormalBorderColor = "#000000"
myFocusedBorderColor = "#111195"
+myWorkspaces :: [WorkspaceId]
+myWorkspaces = ["1:chat", "2:web", "3:code", "4:pdf", "5:doc", "6:vbox" ,"7:games", "8:vid", "9:gimp" ]
+
+
myBar = "xmobar"
-myPP = xmobarPP { ppCurrent = xmobarColor "#000000" "#555555" . wrap " " " " }
+myPP = xmobarPP { ppCurrent = xmobarColor "#000000" "#dddddd" . wrap " " " "
+-- , ppSep = "<fc=#00336a> | </fc>" --0033FF (nice blue)
+-- , ppHiddenNoWindows = xmobarColor "#220000" ""
+ , ppHidden = xmobarColor "#0caca0" ""
+ , ppWsSep = " "
+ , ppSep = ""
+ , ppTitle = xmobarColor "#000000" "" . shorten 0
+ , ppLayout = xmobarColor "#000000" ""}
+
+
myLayoutHook = avoidStruts (
- Tall 1 (3/100) (1/2) |||
- noBorders (fullscreenFull Full)
- )
+ gaps [(L,0), (R,0), (U,0), (D,0)] $ spacing 0 $ Tall 1 (3/100) (1/2) |||
+ noBorders (fullscreenFull Full))
+
myKeys conf = M.fromList $
+ -- xmonad specific keybindings --
[ ((myModMask .|. shiftMask , xK_q ), kill)
, ((myModMask .|. shiftMask , xK_space ), setLayout $ XMonad.layoutHook conf)
, ((myModMask , xK_space ), sendMessage NextLayout)
@@ -47,17 +62,18 @@ myKeys conf = M.fromList $
, ((myModMask , xK_t ), withFocused $ windows . S.sink)
, ((myModMask , xK_comma ), sendMessage (IncMasterN 1))
, ((myModMask , xK_period ), sendMessage (IncMasterN (-1)))
- , ((myModMask , xK_q ), restart "xmonad" True)
+ , ((myModMask , xK_z ), restart "xmonad" True)
+ -- gaps --
+ , ((myModMask .|. controlMask, xK_minus), (incWindowSpacing 8) >> (sendMessage $ IncGap 45 R) >> (sendMessage $ IncGap 45 L))
+ , ((myModMask .|. controlMask, xK_equal), (decWindowSpacing 8) >> (sendMessage $ DecGap 45 R) >> (sendMessage $ DecGap 45 L))
+ , ((myModMask .|. controlMask, xK_0), (sendMessage $ ToggleGaps) >> (toggleWindowSpacingEnabled))
]++
-
-
-- workspaces --
- [((myModMask , k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_p]]++
- [((mod4Mask , k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_p]
+ [((myModMask , k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]]++
+ [((mod4Mask , k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_o, xK_p ]
]
-
main = xmonad =<< statusBar myBar myPP toggleStrutsKey myConfig
{ modMask = myModMask
, keys = myKeys
@@ -65,6 +81,10 @@ main = xmonad =<< statusBar myBar myPP toggleStrutsKey myConfig
, normalBorderColor = myNormalBorderColor
, focusedBorderColor = myFocusedBorderColor
, layoutHook = myLayoutHook
- , handleEventHook = docksEventHook
- , manageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
- }
+ , manageHook = myManageHook
+ , handleEventHook = docksEventHook }
+
+
+
+myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
+toggleStrutsKey XConfig {XMonad.modMask = modMask} = (modMask, xK_b)
diff --git a/xmonad/.xmonad/xmonad.o b/xmonad/.xmonad/xmonad.o
Binary files differ.
