commit 7aebc49effc0bc25a41ef7c1b2a535a69e07e672
parent 820d0bfe8dfa820a1e3ad39f932af105f00dd14f
Author: jacobsGit <JacobDoesLinux@protonmail.com>
Date: Sat, 28 Dec 2019 17:26:46 -0800
switching to super for most things
Diffstat:
5 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
@@ -1,28 +1,25 @@
#sxkhd config
# vim: foldmethod=marker
-# alt = main
-# ctrl = control things
-# shift = spawns
# spawns{{{
-alt + shift + Return
+super + Return
"$TERMINAL"
-alt + shift + m
+super + m
"$TERMINAL" -f "Liberation Mono:pixelsize=11:antialias=true:autohint=true" -e ncmpcpp
-alt + shift + n
+super + n
"$TERMINAL" -e ranger "$HOME/.notes/"
-alt + shift + h
+super + h
"$TERMINAL" -e htop
-alt + shift + f
+super + f
"$BROWSER"
-alt + shift + r
+super + r
dmenu_run -p run: -nb black -fn 'xft:Bitstream Vera Sans Mono:size=11:normal:antialias=true'
-alt + shift + q
+super + q
wmctrl -c :ACTIVE:
#}}}
@@ -50,7 +47,7 @@ XF86AudioMute
ctrl + {Home,End}
xbacklight-script {inc,dec}
-alt + F{1,2,3,4}
+super + F{1,2,3,4}
sudo chvt {1,2,3,4}
Menu
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
@@ -21,21 +21,21 @@ xmonad.hs:68:1: warning: [-Wtabs]
68 | , ((controlMask, xK_equal), (decWindowSpacing 8))
| ^^^^^^^^
-xmonad.hs:83:86: warning: [-Wdeprecations]
+xmonad.hs:83: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 ]]++
- | ^^^^^^^^^^^^^
+83 | [((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:84:130: 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 ]
- | ^^^^^^^^^^^^^
+84 | [((mod1Mask .|. shiftMask, 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]
In the use of `defaultConfig'
diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
@@ -12,7 +12,7 @@ import qualified Data.Map as M
import qualified XMonad.StackSet as S
------------------------------------------
myConfig = defaultConfig
-myModMask = mod1Mask
+myModMask = mod4Mask
myBorderWidth = 2
@@ -46,23 +46,17 @@ myLayoutHook = avoidStruts (
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)
+ [ ((myModMask, xK_q), kill)
+ , ((mod1Mask, xK_space ), sendMessage NextLayout)
+ , ((mod1Mask, xK_Return ), windows S.swapMaster)
+ , ((myModMask, xK_n ), sendMessage Shrink)
+ , ((myModMask, xK_m ), sendMessage Expand)
+ , ((myModMask, xK_z ), restart "xmonad" True)
+ , ((myModMask, xK_t ), withFocused $ windows . S.sink)
+ , ((myModMask, xK_comma ), sendMessage (IncMasterN 1))
+ , ((myModMask, xK_period ), sendMessage (IncMasterN (-1)))
+ , ((mod1Mask, xK_Tab ), windows S.focusDown)
+ , ((mod1Mask .|. shiftMask, xK_Tab), windows S.focusUp)
-- gaps --
, ((controlMask, xK_minus), (incWindowSpacing 8))
, ((controlMask, xK_equal), (decWindowSpacing 8))
@@ -80,8 +74,8 @@ myKeys conf = M.fromList $
, ((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 ]
+ [((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 ]]++
+ [((mod1Mask .|. shiftMask, 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 ]
]
diff --git a/xmonad/.xmonad/xmonad.o b/xmonad/.xmonad/xmonad.o
Binary files differ.
