commit f4f9417a526a4d72681ac132b4d8bb183c09ced0
parent d4f7b589ca5a24db04d084f040dd3b5131c937b9
Author: jacobsGit <JacobDoesLinux@protonmail.com>
Date: Thu, 2 Jan 2020 23:09:23 -0800
formatted, rearranged, tweaked, everything
Diffstat:
4 files changed, 82 insertions(+), 91 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,46 +1,39 @@
-xmonad.hs:14:12: warning: [-Wdeprecations]
+xmonad.hs:15: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."
|
-14 | myConfig = defaultConfig
+15 | myConfig = defaultConfig
| ^^^^^^^^^^^^^
-xmonad.hs:42:42: warning: [-Wdeprecations]
+xmonad.hs:39:40: warning: [-Wdeprecations]
In the use of `spacing' (imported from XMonad.Layout.Spacing):
Deprecated: "Use spacingRaw instead."
|
-42 | gaps [(L,0), (R,0), (U,0), (D,0)] $ spacing 0 $ Tall 1 (3/100) (1/2) |||
- | ^^^^^^^
+39 | gaps [(L,0), (R,0), (U,0), (D,0)] $ spacing 0 $ Tall 1 (3/100) (1/2)
+ | ^^^^^^^
-xmonad.hs:68:1: warning: [-Wtabs]
- Tab character found here.
- Please use spaces instead.
- |
-68 | , ((controlMask, xK_equal), (decWindowSpacing 8))
- | ^^^^^^^^
-
-xmonad.hs:83:86: warning: [-Wdeprecations]
+xmonad.hs:81:85: 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."
|
-83 | [((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_i, xK_o, xK_p ]]++
- | ^^^^^^^^^^^^^
+81 | [ ((mod1Mask, k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, xK_o, xK_p ]]++
+ | ^^^^^^^^^^^^^
-xmonad.hs:84:116: warning: [-Wdeprecations]
+xmonad.hs:82:116: 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."
|
-84 | [((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_i, xK_o, xK_p ]
+82 | [ ((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_i, xK_o, xK_p]]
| ^^^^^^^^^^^^^
-xmonad.hs:100:78: warning: [-Wdeprecations]
+xmonad.hs:98: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."
- |
-100 | myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
- | ^^^^^^^^^^^^^
+ |
+98 | myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
+ | ^^^^^^^^^^^^^
diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
@@ -11,12 +11,12 @@ import XMonad.Layout.Gaps
import qualified Data.Map as M
import qualified XMonad.StackSet as S
------------------------------------------
+------------------------------------------
myConfig = defaultConfig
-myModMask = mod1Mask
-myBorderWidth = 2
-myNormalBorderColor = "#000000"
+myBorderWidth = 3
+myNormalBorderColor = "#200"
myFocusedBorderColor = "#111195"
@@ -24,78 +24,76 @@ 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 "#ffffff" "#001234" . wrap " " " "
--- , ppSep = "<fc=#00336a> | </fc>"
- , ppHiddenNoWindows = xmobarColor "#893412" ""
- , ppHidden = xmobarColor "#0067f9" ""
- , ppWsSep = " "
- , ppSep = ""
- , ppTitle = xmobarColor "#006789" "" . shorten 68
- , ppLayout = xmobarColor "#000000" "" . shorten 0}
-
+myPP = xmobarPP {
+ ppSep = "<fc=#22339a> | </fc>"
+ , ppCurrent = xmobarColor "#2245f9" ""
+ , ppHidden = xmobarColor "#944" ""
+ , ppWsSep = "<fc=#999>,</fc>"
+ , ppLayout = xmobarColor "#445" ""
+ , ppTitle = xmobarColor "#445" "" . shorten 60
+ }
---0033FF (nice blue)
myLayoutHook = avoidStruts (
- 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_space ), setLayout $ XMonad.layoutHook conf)
- , ((myModMask .|. shiftMask , xK_q ), kill)
- , ((myModMask , xK_space ), sendMessage NextLayout)
- --, ((myModMask , xK_m ), windows S.focusMaster)
- , ((myModMask , xK_Return ), windows S.swapMaster)
- , ((myModMask , xK_Tab ), windows S.focusDown)
- --, ((myModMask , xK_k ), windows S.focusDown)
- , ((myModMask .|. shiftMask , xK_Tab ), windows S.focusUp)
- -- , ((myModMask , xK_n ), windows S.focusUp)
- --, ((myModMask .|. shiftMask , xK_h ), windows S.swapDown)
- --, ((myModMask .|. shiftMask , xK_l ), windows S.swapUp)
- , ((myModMask , xK_n ), sendMessage Shrink)
- , ((myModMask , xK_m ), sendMessage Expand)
- --, ((myModMask , xK_n ), refresh)
- , ((myModMask , xK_t ), withFocused $ windows . S.sink)
- , ((myModMask , xK_comma ), sendMessage (IncMasterN 1))
- , ((myModMask , xK_period ), sendMessage (IncMasterN (-1))) , ((myModMask , xK_z ), restart "xmonad" True)
- -- gaps --
- , ((controlMask, xK_minus), (incWindowSpacing 8))
- , ((controlMask, xK_equal), (decWindowSpacing 8))
- , ((mod1Mask, xK_equal), (sendMessage $ DecGap 8 R) >> (sendMessage $ DecGap 8 L) >> (sendMessage $ DecGap 8 U) >> (sendMessage $ DecGap 8 D))
- , ((mod1Mask, xK_minus), (sendMessage $ IncGap 8 R) >> (sendMessage $ IncGap 8 L) >> (sendMessage $ IncGap 8 U) >> (sendMessage $ IncGap 8 D))
- , ((mod4Mask, xK_equal), (decWindowSpacing 8) >> (sendMessage $ DecGap 8 R) >> (sendMessage $ DecGap 8 L) >> (sendMessage $ DecGap 8 U) >> (sendMessage $ DecGap 8 D))
- , ((mod4Mask, xK_minus), (incWindowSpacing 8) >> (sendMessage $ IncGap 8 R) >> (sendMessage $ IncGap 8 L) >> (sendMessage $ IncGap 8 U) >> (sendMessage $ IncGap 8 D))
- -- toggle --
- , ((mod4Mask, xK_0), (sendMessage $ ToggleGaps) >> (toggleWindowSpacingEnabled))
- , ((mod1Mask, xK_0), (sendMessage $ ToggleGaps))
- , ((controlMask, xK_0), (toggleWindowSpacingEnabled))
- -- reset --
- , ((mod1Mask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
- , ((mod4Mask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
- , ((controlMask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
- ]++
- -- 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_i, 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_a, xK_s, xK_d, xK_i, xK_o, xK_p ]
- ]
-
-
-main = xmonad . ewmh =<< statusBar myBar myPP toggleStrutsKey myConfig
- { modMask = myModMask
- , keys = myKeys
- , borderWidth = myBorderWidth
- , normalBorderColor = myNormalBorderColor
- , focusedBorderColor = myFocusedBorderColor
- , layoutHook = myLayoutHook
- , manageHook = myManageHook
- , handleEventHook = docksEventHook }
+ gaps [(L,0), (R,0), (U,0), (D,0)] $ spacing 0 $ Tall 1 (3/100) (1/2)
+ |||
+ noBorders (fullscreenFull Full)
+ )
+
+
+
+myKeys conf = M.fromList $ [
+ ((mod1Mask .|. shiftMask, xK_space), setLayout $ XMonad.layoutHook conf)
+ , ((mod1Mask, xK_space ), sendMessage NextLayout)
+ , ((mod1Mask, xK_n ), sendMessage Shrink)
+ , ((mod1Mask, xK_m ), sendMessage Expand)
+ , ((mod4Mask .|. shiftMask, xK_r), restart "xmonad" True)
+ , ((mod4Mask, xK_r), refresh)
+ , ((mod4Mask .|. shiftMask, xK_q), kill)
+
+ , ((mod4Mask, xK_comma ), sendMessage (IncMasterN 1))
+ , ((mod4Mask, xK_period ), sendMessage (IncMasterN (-1)))
+
+ , ((mod1Mask, xK_l), windows S.swapMaster)
+ , ((mod1Mask, xK_h), windows S.focusMaster)
+ , ((mod1Mask, xK_j ), windows S.focusDown)
+ , ((mod1Mask, xK_k ), windows S.focusUp)
+ , ((mod1Mask .|. shiftMask, xK_j), windows S.swapDown)
+ , ((mod1Mask .|. shiftMask, xK_k), windows S.swapUp)
+ , ((mod4Mask .|. shiftMask, xK_s), withFocused $ windows . S.sink)
+ -- gaps --
+ , ((controlMask, xK_minus), (incWindowSpacing 8))
+ , ((controlMask, xK_equal), (decWindowSpacing 8))
+ , ((mod1Mask, xK_equal), (sendMessage $ DecGap 8 R) >> (sendMessage $ DecGap 8 L) >> (sendMessage $ DecGap 8 U) >> (sendMessage $ DecGap 8 D))
+ , ((mod1Mask, xK_minus), (sendMessage $ IncGap 8 R) >> (sendMessage $ IncGap 8 L) >> (sendMessage $ IncGap 8 U) >> (sendMessage $ IncGap 8 D))
+ , ((mod4Mask, xK_equal), (decWindowSpacing 8) >> (sendMessage $ DecGap 8 R) >> (sendMessage $ DecGap 8 L) >> (sendMessage $ DecGap 8 U) >> (sendMessage $ DecGap 8 D))
+ , ((mod4Mask, xK_minus), (incWindowSpacing 8) >> (sendMessage $ IncGap 8 R) >> (sendMessage $ IncGap 8 L) >> (sendMessage $ IncGap 8 U) >> (sendMessage $ IncGap 8 D))
+
+ , ((mod4Mask, xK_0), (sendMessage $ ToggleGaps) >> (toggleWindowSpacingEnabled))
+ , ((mod1Mask, xK_0), (sendMessage $ ToggleGaps))
+ , ((controlMask, xK_0), (toggleWindowSpacingEnabled))
+
+ , ((mod1Mask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
+ , ((mod4Mask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
+ , ((controlMask, xK_backslash), (setScreenWindowSpacing 0) >> (sendMessage $ setGaps [(L,0), (R,0), (U,0), (D,0)]))
+ ]++
+ [ ((mod1Mask, k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_i, 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_a, xK_s, xK_d, xK_i, xK_o, xK_p]]
+
+
+
+main = xmonad . ewmh =<< statusBar "xmobar" myPP toggleStrutsKey myConfig {
+ keys = myKeys
+ , borderWidth = myBorderWidth
+ , normalBorderColor = myNormalBorderColor
+ , focusedBorderColor = myFocusedBorderColor
+ , layoutHook = myLayoutHook
+ , manageHook = myManageHook
+ , handleEventHook = docksEventHook
+ }
myManageHook = manageDocks <+> (isFullscreen --> doFullFloat) <+> manageHook defaultConfig
-toggleStrutsKey XConfig {XMonad.modMask = modMask} = (modMask, xK_b)
+toggleStrutsKey XConfig {XMonad.modMask = modMask} = (mod4Mask, xK_b)
diff --git a/xmonad/.xmonad/xmonad.o b/xmonad/.xmonad/xmonad.o
Binary files differ.
