aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2021-08-02 09:53:36 +0200
committerCharles Cabergs <me@cacharle.xyz>2021-08-02 09:53:36 +0200
commit3baf089b119ceb54ac5618bcb64bd0b2dfc80455 (patch)
tree8c94088a82e9cd51a7a7573f8399872eb5a70735
parent0cc6f0cc54c70331aefa4fc32628c1722f5a38fd (diff)
downloaddotfiles-3baf089b119ceb54ac5618bcb64bd0b2dfc80455.tar.gz
dotfiles-3baf089b119ceb54ac5618bcb64bd0b2dfc80455.tar.bz2
dotfiles-3baf089b119ceb54ac5618bcb64bd0b2dfc80455.zip
Switching back to st (accented characters are not printed but still understood by other applications so it's fine)
-rw-r--r--config/xmonad/xmonad.hs10
-rwxr-xr-xtest5
2 files changed, 10 insertions, 5 deletions
diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs
index a059cc5..769435b 100644
--- a/config/xmonad/xmonad.hs
+++ b/config/xmonad/xmonad.hs
@@ -20,12 +20,14 @@ import XMonad.Layout.Spacing (Border (..), spacingRaw)
import XMonad.Hooks.InsertPosition (Focus (..), Position (..),
insertPosition)
+myTerminal = "st"
+
-- xmonad :: XConfig -> IO ()
-- https://hackage.haskell.org/package/xmonad-0.15/docs/XMonad-Core.html#t:XConfig
main = xmonad $ desktopConfig
{ normalBorderColor = "#1c1c1c"
, focusedBorderColor = "#8a8a8a"
- , terminal = "alacritty"
+ , terminal = myTerminal
, layoutHook = layoutHook'
, manageHook = manageHook'
, modMask = mod4Mask -- mod key to super
@@ -58,8 +60,8 @@ keys' = [ ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down")
, ("<XF86TouchpadToggle>", spawn "touchpad-toggle")
, ("M-o", spawn "project-open")
- , ("M-i", spawn "st -e zsh -c 'source ~/.config/zsh/.zshrc && rc'")
- , ("M-m", spawn "st -e mocp -C /home/cacharle/.config/moc/config")
+ , ("M-i", spawn $ myTerminal ++ " -e zsh -c 'source ~/.config/zsh/.zshrc && rc'")
+ , ("M-m", spawn $ myTerminal ++ " -e mocp -C /home/cacharle/.config/moc/config")
, ("M-S-d", spawn "notify-send -i x-office-calendar \"$(date +\"%H:%M %A %d/%m/%Y %B\")\"")
, ("M-S-b", spawn "notify-send --hint=int:transient:1 --hint=int:value:\"$(cat /sys/class/power_supply/BAT0/capacity)\" \"Battery\"")
, ("M-q", spawn "notify-send 'Restarting xmonad'" >> spawn restartCmd)
@@ -68,7 +70,7 @@ keys' = [ ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down")
startupHook' :: X ()
startupHook' = do
- spawnOnOnce "code" "st"
+ spawnOnOnce "code" myTerminal
spawnOnOnce "web" "qutebrowser"
confirm :: String -> X () -> X ()
diff --git a/test b/test
index 0cc44f8..3d3f6e1 100755
--- a/test
+++ b/test
@@ -19,10 +19,13 @@ vint -s config/vim/pluggins.vim || ret=$?
# FLAKE8
flake8 --ignore F821,E501,W504,N816,E241 config/qutebrowser/config.py || ret=$?
-flake8 --ignore W504 config/python/startup.py || ret=$?
+flake8 --ignore W504,CCR001 config/python/startup.py || ret=$?
# CRONTAB
crontab -T crontab/root.crontab || ret=$?
crontab -T crontab/user.crontab || ret=$?
+# XMONAD
+xmonad --recompile || ret=$?
+
exit $ret