From c1745032449facab0ea174b2470f80f0a1f4e488 Mon Sep 17 00:00:00 2001 From: Martin Potier Date: Tue, 3 Dec 2019 15:46:51 +0200 Subject: [PATCH] Rework projects declaration --- lib/Projects.hs | 54 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/lib/Projects.hs b/lib/Projects.hs index 89ff6e6..5439d89 100644 --- a/lib/Projects.hs +++ b/lib/Projects.hs @@ -6,31 +6,47 @@ import XMonad import XMonad.Actions.DynamicProjects import XMonad.Util.Run -spinVimAndSt :: String -> Project -spinVimAndSt name = +spinVimAndSt :: String -> String -> Project +spinVimAndSt dir name = Project { projectName = name - , projectDirectory = "~/relex/" <> name + , projectDirectory = dir <> name , projectStartHook = Just $ do safeSpawn "vim" ["-g", "+set guifont=Victor\\ Mono\\ SemiBold\\ 18|e ."] - safeSpawn "st" ["-f","Iosevka Term-18","-e","tmux","new","-A","-s",name] + safeSpawn "st" ["-f","Iosevka Samae-18","-e","tmux","new","-A","-s",name] } +workProject = spinVimAndSt "~/relex/" +candyProject = spinVimAndSt "~/candy/" + projects :: [Project] -projects = [ spinVimAndSt "bob-the-builder" - , spinVimAndSt "infra-inventory" - , spinVimAndSt "mega-repo-1" - , spinVimAndSt "mega-repo-2" - , spinVimAndSt "mega-repo-3" - , spinVimAndSt "mordor-ca" - , spinVimAndSt "mordor-dashboard" - , spinVimAndSt "mordor-deploy" - , spinVimAndSt "mordor-kvm" - , spinVimAndSt "mordor-ops" - , spinVimAndSt "mordorbooks" - , spinVimAndSt "nix-role" +projects = [ candyProject "adventOfCode" + , workProject "ToyVault" + , workProject "ansible-ci" + , workProject "atlantis" + , workProject "bob-the-builder" + , workProject "docker-images" + , workProject "gitlab-runners" + , workProject "infra-inventory" + , workProject "isengard" + , workProject "mordor-ca" + , workProject "mordor-dashboard" + , workProject "mordor-the-repo-1" + , workProject "mordor-the-repo-2" + , workProject "mordor-the-repo-3" + , workProject "mordor-deploy" + , workProject "mordor-kvm" + , workProject "mordor-ops" + , workProject "mordorbooks" + , workProject "nix-role" + , workProject "nixpkgs" + , workProject "time-tracking" + , Project { projectName = "status" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do safeSpawn "st" ["-f","Iosevka Samae-12","-e","sudo","speedometer.py","-r","wlan0","-t","wlan0"] + } , Project { projectName = "admin" , projectDirectory = "~/admin" - , projectStartHook = Just $ do safeSpawn "vim" ["-g"] - safeSpawnProg "st" + , projectStartHook = Just $ do safeSpawn "vim" ["-g", "+set guifont=Victor\\ Mono\\ SemiBold\\ 18|e ."] + safeSpawn "st" ["-f","Iosevka Samae-18","-e","tmux","new","-A","-s","admin"] } , Project { projectName = "email" , projectDirectory = "~/mail" @@ -55,7 +71,7 @@ projects = [ spinVimAndSt "bob-the-builder" } , Project { projectName = "daily" , projectDirectory = "/tmp" - , projectStartHook = Just $ do safeSpawn "nix" ["run", "nixpkgs.chromium", "-c", "chromium"] + , projectStartHook = Just $ do safeSpawnProg "chromium" } , Project { projectName = "notes" , projectDirectory = "~/vimwiki/"