commit 58d4c0f1793b5e173f6ca3261433c0ac1bf2d1e4
parent 4ffca8b76ce936a392e53f1e6c613c07b54acd4a
Author: jacobsGit <JacobDoesLinux@protonmail.com>
Date: Mon, 9 Dec 2019 00:29:32 -0800
added pp xmobar output
Diffstat:
4 files changed, 25 insertions(+), 27 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,40 +1,32 @@
-xmonad.hs:12:16: warning: [-Wdeprecations]
+xmonad.hs:12: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."
|
-12 | myBaseConfig = defaultConfig
- | ^^^^^^^^^^^^^
+12 | myConfig = defaultConfig
+ | ^^^^^^^^^^^^^
-xmonad.hs:48:101: warning: [-Wdeprecations]
+xmonad.hs:52: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."
|
-48 | [((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]]++
+52 | [((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]]++
| ^^^^^^^^^^^^^
-xmonad.hs:49:131: warning: [-Wdeprecations]
+xmonad.hs:53: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."
|
-49 | [((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]]++
+53 | [((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]
| ^^^^^^^^^^^^^
-xmonad.hs:50:101: warning: [-Wdeprecations]
+xmonad.hs:67:82: 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."
|
-50 | [((mod4Mask .|. shiftMask, k), (windows $ S.shift i )) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_p]
- | ^^^^^^^^^^^^^
-
-xmonad.hs:61:82: 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."
- |
-61 | , manageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
+67 | , manageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
| ^^^^^^^^^^^^^
diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
@@ -9,7 +9,7 @@ import XMonad.Layout.Fullscreen
import qualified Data.Map as M
import qualified XMonad.StackSet as S
------------------------------------------
-myBaseConfig = defaultConfig
+myConfig = defaultConfig
myModMask = mod1Mask
@@ -18,11 +18,16 @@ myNormalBorderColor = "#000000"
myFocusedBorderColor = "#111195"
+myBar = "xmobar"
+myPP = xmobarPP { ppCurrent = xmobarColor "#1ABC9C" "#333333" . wrap " " " " }
+
+
myLayoutHook = avoidStruts (
Tall 1 (3/100) (1/2) |||
noBorders (fullscreenFull Full)
)
+
myKeys conf = M.fromList $
[ ((myModMask .|. shiftMask , xK_q ), kill)
, ((myModMask .|. shiftMask , xK_space ), setLayout $ XMonad.layoutHook conf)
@@ -33,8 +38,8 @@ myKeys conf = M.fromList $
, ((myModMask , xK_j ), windows S.focusDown)
, ((myModMask .|. shiftMask , xK_Tab ), windows S.focusUp)
, ((myModMask , xK_k ), windows S.focusUp)
--- , ((myModMask .|. shiftMask , xK_h ), windows S.swapDown)
--- , ((myModMask .|. shiftMask , xK_l ), windows S.swapUp)
+ , ((myModMask .|. shiftMask , xK_h ), windows S.swapDown)
+ , ((myModMask .|. shiftMask , xK_l ), windows S.swapUp)
, ((myModMask , xK_j ), sendMessage Shrink)
, ((myModMask , xK_k ), sendMessage Expand)
, ((myModMask , xK_n ), refresh)
@@ -43,21 +48,22 @@ myKeys conf = M.fromList $
, ((myModMask , xK_period ), sendMessage (IncMasterN (-1)))
, ((myModMask , xK_q ), restart "xmonad" True)
]++
- --
- -- Workspaces
+ -- 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]]++
- [((mod4Mask .|. shiftMask, k), (windows $ S.shift 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]
]
+toggleStrutsKey XConfig {XMonad.modMask = modMask} = (modMask, xK_b)
-main = xmonad =<< xmobar (ewmh myBaseConfig)
+main = xmonad =<< statusBar myBar myPP toggleStrutsKey myConfig
{ modMask = myModMask
+ , keys = myKeys
, borderWidth = myBorderWidth
, normalBorderColor = myNormalBorderColor
, focusedBorderColor = myFocusedBorderColor
- , keys = myKeys
- , manageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
+ , layoutHook = myLayoutHook
, handleEventHook = docksEventHook
+ , manageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
}
+
diff --git a/xmonad/.xmonad/xmonad.o b/xmonad/.xmonad/xmonad.o
Binary files differ.
