diff options
| -rw-r--r-- | src/XMonad/Custom/Bindings.hs | 39 | ||||
| -rw-r--r-- | src/XMonad/Custom/Misc.hs | 10 | ||||
| -rw-r--r-- | src/XMonad/Custom/Projects.hs | 2 | ||||
| -rw-r--r-- | src/XMonad/Custom/Startup.hs | 4 | ||||
| -rw-r--r-- | stack.yaml | 6 | ||||
| -rw-r--r-- | xmonad-ng.cabal | 30 |
6 files changed, 42 insertions, 49 deletions
diff --git a/src/XMonad/Custom/Bindings.hs b/src/XMonad/Custom/Bindings.hs index 9192f7e..19eaa2a 100644 --- a/src/XMonad/Custom/Bindings.hs +++ b/src/XMonad/Custom/Bindings.hs @@ -64,7 +64,7 @@ import XMonad.Util.XSelection showKeyBindings :: [((KeyMask, KeySym), NamedAction)] -> NamedAction showKeyBindings a = addName "Show Keybindings" $ io $ do - p <- spawnPipe "/usr/bin/zenity --text-info" -- TOOD Find an application that doesn't rely on any toolkits + p <- spawnPipe "zenity --text-info" -- TOOD Find an application that doesn't rely on any toolkits hPutStr p $ unlines $ showKm a hClose p return () @@ -114,8 +114,7 @@ keyBindings c = let subKeys s ks = subtitle s:mkNamedKeymap c ks in subKeys "System" - [ ("M-q" , addName "Restart XMonad" $ spawn "/usr/bin/xmonad --restart") - , ("M-C-q" , addName "Recompile & restart XMonad" $ spawn "/usr/bin/xmonad --recompile && /usr/bin/xmonad --restart") + [ ("M-q" , addName "Restart XMonad" $ spawn "xmonad-ng --restart") , ("M-S-q" , addName "Quit XMonad" $ confirmPrompt hotPromptTheme "Quit XMonad?" $ io exitSuccess) , ("M-x" , addName "Shell prompt" $ shellPrompt promptTheme) , ("M-o" , addName "Goto W prompt" $ windowPrompt promptTheme Goto allWindows) @@ -137,7 +136,7 @@ keyBindings c = \xcast.sh --webm") , ("M-S-<Insert>" , addName "Start recording screen as gif" $ spawn "~/.xmonad/bin/\ \xcast.sh --gif") - , ("M-C-<Insert>" , addName "Stop recording" $ spawn "/usr/bin/pkill ffmpeg") + , ("M-C-<Insert>" , addName "Stop recording" $ spawn "pkill ffmpeg") , ("M-C-c" , addName "Toggle compton on/off" $ spawn "~/.xmonad/bin/\ \toggle-compton.sh") , ("M-C-r" , addName "Toggle redshift on/off" $ spawn "~/.xmonad/bin/\ @@ -153,11 +152,24 @@ keyBindings c = , ("<XF86AudioLowerVolume>" , addName "ALSA: Lower volume" $ void $ lowerVolume 5) , ("<XF86AudioRaiseVolume>" , addName "ALSA: Raise volume" $ void $ raiseVolume 5) , ("<XF86AudioPlay>" , addName "MPD: Play/pause" $ spawn "~/.xmonad/bin/mpc-play-pause.sh") - , ("<XF86AudioStop>" , addName "MPD: Stop" $ spawn "/usr/bin/mpc --no-status stop") - , ("<XF86AudioPrev>" , addName "MPD: Previos track" $ spawn "/usr/bin/mpc --no-status prev") - , ("<XF86AudioNext>" , addName "MPD: Next track" $ spawn "/usr/bin/mpc --no-status next") + , ("<XF86AudioStop>" , addName "MPD: Stop" $ spawn "mpc --no-status stop") + , ("<XF86AudioPrev>" , addName "MPD: Previos track" $ spawn "mpc --no-status prev") + , ("<XF86AudioNext>" , addName "MPD: Next track" $ spawn "mpc --no-status next") ] ^++^ + subKeys "Workspaces & Projects" + ( [ ("M-w" , addName "Switch to project" $ switchProjectPrompt promptTheme) + , ("M-S-w" , addName "Shift to project" $ shiftToProjectPrompt promptTheme) + , ("M-," , addName "Next non-empty WS" nextNonEmptyWS) + , ("M-." , addName "Previous non-empty WS" prevNonEmptyWS) + , ("M-i" , addName "Toggle last WS" $ toggleWS' ["NSP"]) + , ("M-`" , addName "WS prompt" $ workspacePrompt promptTheme $ windows . S.shift) + ] + ++ zipM "M-" "View WS" wsKeys [0 ..] (withNthWorkspace S.greedyView) + ++ zipM "M-S-" "Move W to WS" wsKeys [0 ..] (withNthWorkspace S.shift) + ++ zipM "M-C-S-" "Copy W to WS" wsKeys [0 ..] (withNthWorkspace copy) + ) + ^++^ subKeys "Spawnables" [ ("M-<Return>" , addName "Terminal" $ spawn (CM.term CM.customApplications)) , ("M-b" , addName "Browser" $ spawn (CM.browser CM.customApplications)) @@ -196,19 +208,6 @@ keyBindings c = ++ zipM' "M-C-" "Swap W to screen" arrowKeys directions screenSwap True ) ^++^ - subKeys "Workspaces & Projects" - ( [ ("M-w" , addName "Switch to project" $ switchProjectPrompt promptTheme) - , ("M-S-w" , addName "Shift to project" $ shiftToProjectPrompt promptTheme) - , ("M-," , addName "Next non-empty WS" nextNonEmptyWS) - , ("M-." , addName "Previous non-empty WS" prevNonEmptyWS) - , ("M-i" , addName "Toggle last WS" $ toggleWS' ["NSP"]) - , ("M-`" , addName "WS prompt" $ workspacePrompt promptTheme $ windows . S.shift) - ] - ++ zipM "M-" "View WS" wsKeys [0 ..] (withNthWorkspace S.greedyView) - ++ zipM "M-S-" "Move W to WS" wsKeys [0 ..] (withNthWorkspace S.shift) - ++ zipM "M-C-S-" "Copy W to WS" wsKeys [0 ..] (withNthWorkspace copy) - ) - ^++^ subKeys "Layout Management" [ ("M-<Tab>" , addName "Cycle layouts" $ sendMessage NextLayout) , ("M-C-<Tab>" , addName "Cycle sublayouts" $ toSubl NextLayout) diff --git a/src/XMonad/Custom/Misc.hs b/src/XMonad/Custom/Misc.hs index 78fc0f1..92ea877 100644 --- a/src/XMonad/Custom/Misc.hs +++ b/src/XMonad/Custom/Misc.hs @@ -27,9 +27,9 @@ data Applications = Applications customApplications :: Applications customApplications = Applications - { term = "/usr/bin/urxvtc" - , browser = "/usr/bin/qutebrowser" - , top = "/usr/bin/htop" - , mixer = "/usr/bin/alsamixer" - , notify = "/usr/bin/notify-send" + { term = "urxvtc" + , browser = "qutebrowser" + , top = "htop" + , mixer = "alsamixer" + , notify = "notify-send" } diff --git a/src/XMonad/Custom/Projects.hs b/src/XMonad/Custom/Projects.hs index 44370aa..b4b47b5 100644 --- a/src/XMonad/Custom/Projects.hs +++ b/src/XMonad/Custom/Projects.hs @@ -27,7 +27,7 @@ projects = , Project { projectName = "Emacs" , projectDirectory = "~/" - , projectStartHook = Just $ spawnOn "Emacs" "/usr/bin/emacsclient" + , projectStartHook = Just $ spawnOn "Emacs" "emacsclient" } , Project { projectName = "WWW" diff --git a/src/XMonad/Custom/Startup.hs b/src/XMonad/Custom/Startup.hs index b862b69..592f9b8 100644 --- a/src/XMonad/Custom/Startup.hs +++ b/src/XMonad/Custom/Startup.hs @@ -51,8 +51,8 @@ addEWMHFullscreen = do startupHook' :: X () startupHook' = do - spawnNamedPipe "/usr/bin/xmobar ~/work/xmonad-ng/xmobarrcTop.hs" "xmobarTop" - spawnNamedPipe "/usr/bin/xmobar ~/work/xmonad-ng/xmobarrcBot.hs" "xmobarBot" + spawnNamedPipe "xmobar ~/work/xmonad-ng/xmobarrcTop.hs" "xmobarTop" + spawnNamedPipe "xmobar ~/work/xmonad-ng/xmobarrcBot.hs" "xmobarBot" docksStartupHook addEWMHFullscreen setDefaultCursor xC_left_ptr diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 index 4a80dfe..0000000 --- a/stack.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-9.21 -packages: - - . -extra-deps: - - primitive-0.6.4.0 - - text-1.2.3.0 diff --git a/xmonad-ng.cabal b/xmonad-ng.cabal index 2afc972..7216550 100644 --- a/xmonad-ng.cabal +++ b/xmonad-ng.cabal @@ -1,5 +1,5 @@ name: xmonad-ng -version: 0.2.1.0 +version: 0.2.1.1 synopsis: azahi's XMonad configuration description: azahi's XMonad configuration based on stolen code and bad Haskell knowledge homepage: https://github.com/azahi/xmonad-ng @@ -25,10 +25,10 @@ library exposed-modules: XMonad.Actions.FloatSnapSpaced , XMonad.Actions.PerConditionKeys - build-depends: base >= 4.9 && < 4.10 - , containers >= 0.5 && < 0.6 - , xmonad >= 0.13 && < 0.14 - , xmonad-contrib >= 0.13 && < 0.14 + build-depends: base >= 4.9.1 && < 4.10 + , containers >= 0.5.7 && < 0.6 + , xmonad >= 0.13 && < 0.14 + , xmonad-contrib >= 0.13 && < 0.14 executable xmonad-ng main-is: Main.hs @@ -55,13 +55,13 @@ executable xmonad-ng , XMonad.Custom.Theme , XMonad.Custom.Workspaces - build-depends: X11 >= 1.8 && < 1.9 - , base >= 4.9 && < 4.10 - , containers >= 0.5 && < 0.6 - , directory >= 1.3.0 && < 1.4 - , filepath >= 1.4.1 && < 1.5 - , text >= 1.2.3 && < 1.3 - , time >= 1.6.0 && < 1.7 - , xmonad >= 0.13 && < 0.14 - , xmonad-contrib >= 0.13 && < 0.14 - , xmonad-extras >= 0.13.0 && < 0.14 + build-depends: X11 >= 1.8 && < 1.9 + , base >= 4.9.1 && < 4.10 + , containers >= 0.5.7 && < 0.6 + , directory >= 1.3 && < 1.4 + , filepath >= 1.4.1 && < 1.5 + , text >= 1.2.3 && < 1.3 + , time >= 1.6 && < 1.7 + , xmonad >= 0.13 && < 0.14 + , xmonad-contrib >= 0.13 && < 0.14 + , xmonad-extras >= 0.13 && < 0.14 |