diff --git a/lib/KeyBindings.hs b/lib/KeyBindings.hs index 00c2117..c3c0c73 100644 --- a/lib/KeyBindings.hs +++ b/lib/KeyBindings.hs @@ -31,12 +31,11 @@ modify conf = conf `additionalKeysP` -- Add some extra key bindings: [ ("M-S-q", confirmPrompt promptConfig "exit" (io exitSuccess)) - , ("-b", sendMessage (Toggle "Full")) , ("", spawn "/run/current-system/sw/bin/xbacklight -10") , ("", spawn "/run/current-system/sw/bin/xbacklight +10") - , ("", spawn "/run/current-system/sw/bin/playerctl play-pause") - , ("", spawn "/run/current-system/sw/bin/playerctl next") - , ("", spawn "/run/current-system/sw/bin/playerctl previous") + , ("", spawn "/run/current-system/sw/bin/mpc toggle") + , ("", spawn "/run/current-system/sw/bin/mpc next") + , ("", spawn "/run/current-system/sw/bin/mpc prev") , ("M-", kill) , ("M-", windows W.focusDown) , ("M-", sendMessage (Toggle "Full")) @@ -47,10 +46,10 @@ modify conf = conf , ("M-", nextWS) , ("M-", toggleWS' ["NSP"]) , ("M-", windows W.focusUp) - , ("M-S-", spawn "/run/current-system/sw/bin/i3lock -f -t -c 002b36") + , ("M-S-", spawn "/run/current-system/sw/bin/mpc pause; /run/current-system/sw/bin/xset s activate") , ("M-S-", shiftToPrev >> prevWS) , ("M-S-", shiftToNext >> nextWS) - , ("M-s s", spawn "sleep 0.2 ; /run/current-system/sw/bin/scrot -s /tmp/screenSel.png") + , ("M-s s", spawn "/run/current-system/sw/bin/flameshot gui") , ("M-s t", spawn "/run/current-system/sw/bin/scrot /tmp/screen.png") -- Workspace and tasks , ("M-b", switchProjectPrompt promptConfig) diff --git a/lib/Projects.hs b/lib/Projects.hs index 90e5f08..fbd3b10 100644 --- a/lib/Projects.hs +++ b/lib/Projects.hs @@ -4,15 +4,72 @@ module Projects ( import XMonad import XMonad.Actions.DynamicProjects +import XMonad.Util.Run projects :: [Project] -projects = [ Project { projectName = "steam" - , projectDirectory = "~/" - , projectStartHook = Nothing +projects = [ Project { projectName = "admin" + , projectDirectory = "~/admin" + , projectStartHook = Just $ do safeSpawn "vim" ["-g"] + safeSpawnProg "st" } - , Project { projectName = "tootgun" - , projectDirectory = "~/candy/tootgun" - , projectStartHook = Nothing + , Project { projectName = "mordor" + , projectDirectory = "~/mordor" + , projectStartHook = Just $ do safeSpawn "vim" ["-g"] + safeSpawnProg "st" + } + , Project { projectName = "mordor-docs" + , projectDirectory = "~/mordor-2" + , projectStartHook = Just $ do safeSpawn "vim" ["-g"] + safeSpawnProg "st" + } + , Project { projectName = "mordor-other" + , projectDirectory = "~/mordor-3" + , projectStartHook = Just $ do safeSpawn "vim" ["-g"] + safeSpawnProg "st" + } + , Project { projectName = "email" + , projectDirectory = "~/mail" + , projectStartHook = Just $ do safeSpawnProg "st" + } + , Project { projectName = "frs" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do safeSpawnProg "frs" + } + , Project { projectName = "fre" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do safeSpawnProg "fre" + } + , Project { projectName = "network-graph" + , projectDirectory = "~/relex/catch-a-network-bug/csvplotter" + , projectStartHook = Just $ do safeSpawn "zathura" ["weekXGraph.pdf"] + safeSpawnProg "st" + } + , Project { projectName = "orc" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do safeSpawnProg "st" + } + , Project { projectName = "mordor-ops" + , projectDirectory = "~/relex/mordor-ops" + , projectStartHook = Just $ do safeSpawn "vim" ["-g"] + safeSpawnProg "st" + } + , Project { projectName = "mordor-deploy" + , projectDirectory = "~/relex/mordor-deploy" + , projectStartHook = Just $ do safeSpawn "vim" ["-g"] + safeSpawnProg "st" + } + , Project { projectName = "scaleout-ops" + , projectDirectory = "~/relex/scaleout-ops" + , projectStartHook = Just $ do safeSpawn "vim" ["-g"] + safeSpawnProg "st" + } + , Project { projectName = "sound" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do safeSpawnProg "pavucontrol" + } + , Project { projectName = "daily" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do safeSpawn "nix" ["run", "nixpkgs.chromium", "-c", "chromium"] } ] diff --git a/lib/Scratchpad.hs b/lib/Scratchpad.hs index ed0da07..b61eaba 100644 --- a/lib/Scratchpad.hs +++ b/lib/Scratchpad.hs @@ -16,7 +16,7 @@ modify conf = conf } pads = - [ NS "htop" "/run/current-system/sw/bin/alacritty -t htop -e tmux" (title =? "htop") + [ NS "htop" "/run/current-system/sw/bin/st -t htop -e tmux" (title =? "htop") (customFloating $ W.RationalRect (1/3) (1/3) (1/3) (1/3)) -- , NS "stardict" "stardict" (className =? "Stardict") -- (customFloating $ W.RationalRect (1/6) (1/6) (2/3) (2/3)) diff --git a/xmonad.hs b/xmonad.hs index 7bee53c..e212586 100755 --- a/xmonad.hs +++ b/xmonad.hs @@ -58,7 +58,7 @@ withConfig = $ desktopConfig -- on a default desktop config { manageHook = myManageHook <+> manageHook desktopConfig , layoutHook = desktopLayoutModifiers layouts - , terminal = "/run/current-system/sw/bin/alacritty" + , terminal = "/run/current-system/sw/bin/st" , normalBorderColor = S.base03 , focusedBorderColor = S.violet , borderWidth = 5