From 8d1c03a8625ca3e9ff5bec928a9f4f17e8ceb997 Mon Sep 17 00:00:00 2001 From: Martin Potier Date: Wed, 15 Dec 2021 12:38:09 +0200 Subject: [PATCH] Switch to kitty --- lib/KeyBindings.hs | 3 +++ lib/Projects.hs | 11 ++++++----- lib/Scratchpad.hs | 2 +- xmonad.hs | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/KeyBindings.hs b/lib/KeyBindings.hs index cbfd667..d05848f 100644 --- a/lib/KeyBindings.hs +++ b/lib/KeyBindings.hs @@ -75,6 +75,9 @@ modify conf = conf -- resizing the master/slave ratio , ("M-h", sendMessage Shrink) -- Shrink the master area , ("M-l", sendMessage Expand) -- Expand the master area + -- dunstctl calls + , ("C-", spawn "dunstctl close") + , ("C-S-", spawn "dunstctl close-all") ] diff --git a/lib/Projects.hs b/lib/Projects.hs index 16fec92..17024a6 100644 --- a/lib/Projects.hs +++ b/lib/Projects.hs @@ -10,8 +10,8 @@ spinTextEditorAndTerm :: String -> String -> Project spinTextEditorAndTerm dir name = Project { projectName = name , projectDirectory = dir <> name - , projectStartHook = Just $ do safeSpawn "emacsclient" ["-c"] - safeSpawn "nvidia-offload" ["alacritty","-e","tmux","new","-A","-s",name] + , projectStartHook = Just + $ safeSpawn "nvidia-offload" ["kitty","tmux","new","-A","-s",name] } spinChat :: String -> Project @@ -25,7 +25,7 @@ spinInTermWithName :: String -> String -> Project spinInTermWithName projectName cmd = Project { projectName = projectName , projectDirectory = "/tmp" - , projectStartHook = Just $ do safeSpawn "alacritty" ["-e", cmd] + , projectStartHook = Just $ do safeSpawn "kitty" [cmd] } spinInTerm :: String -> Project @@ -48,6 +48,7 @@ projects = [ adminProject "wrk-config" , adminProject "overlays-personal" , candyProject "dhall-packages" , candyProject "hfdb" + , candyProject "adventofcode" , justStart "obs" , justStart "m8c" , spinChat "element" @@ -55,7 +56,7 @@ projects = [ adminProject "wrk-config" , spinChat "wire" , spinInTerm "k9s" , spinInTermWithName "email" "neomutt" - , spinTextEditorAndTerm "~/.xmonad" "xmonad" + , spinTextEditorAndTerm "~/." "xmonad" -- Dark magic! , workProject "azure-core-infra" , workProject "azure-kube-platform" , workProject "bob-the-builder" @@ -107,7 +108,7 @@ projects = [ adminProject "wrk-config" , Project { projectName = "status" , projectDirectory = "/tmp" , projectStartHook = Just $ do - safeSpawn "nvidia-offload" ["alacritty","-e","gotop"] + safeSpawn "nvidia-offload" ["kitty","gotop"] } , Project { projectName = "frs" , projectDirectory = "/tmp" diff --git a/lib/Scratchpad.hs b/lib/Scratchpad.hs index 68c06e5..703e5ec 100644 --- a/lib/Scratchpad.hs +++ b/lib/Scratchpad.hs @@ -16,7 +16,7 @@ modify conf = conf } pads = - [ NS "htop" "nvidia-offload alacritty -t htop -e tmux" (title =? "htop") + [ NS "htop" "nvidia-offload kitty --title htop 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 38c50ef..591a209 100755 --- a/xmonad.hs +++ b/xmonad.hs @@ -69,7 +69,7 @@ withConfig = { manageHook = myManageHook <+> manageHook desktopConfig , layoutHook = desktopLayoutModifiers layouts , startupHook = spawnOnce "sh ~/.fehbg" - , terminal = "nvidia-offload alacritty" + , terminal = "nvidia-offload kitty" , normalBorderColor = S.base03 , focusedBorderColor = S.violet , borderWidth = 5