From c7117f7e3e9a85354ea1ab138395a96a8a8900be Mon Sep 17 00:00:00 2001
From: Martin Potier <martin.potier@marvid.fr>
Date: Fri, 25 Sep 2020 12:13:26 +0300
Subject: [PATCH] Refactor for wrk

---
 lib/Password.hs   |  2 +-
 lib/Projects.hs   | 29 ++++++++++++++++++++++-------
 lib/Scratchpad.hs |  2 +-
 lib/StatusBar.hs  |  2 +-
 xmonad.hs         |  2 +-
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/lib/Password.hs b/lib/Password.hs
index bb3e495..cf1a491 100644
--- a/lib/Password.hs
+++ b/lib/Password.hs
@@ -52,4 +52,4 @@ mkPassPrompt label f conf = do
       return . lines $ files
 
 copyPassword :: String -> X ()
-copyPassword pass = spawn $ "gpg --decrypt " ++ pass ++ " | /home/eeva/.nix-profile/bin/copy"
+copyPassword pass = spawn $ "gpg --decrypt " ++ pass ++ " | /home/e/.nix-profile/bin/copy"
diff --git a/lib/Projects.hs b/lib/Projects.hs
index e7fcc5c..910ea23 100644
--- a/lib/Projects.hs
+++ b/lib/Projects.hs
@@ -11,7 +11,14 @@ spinVimAndSt dir name =
   Project { projectName = name
           , projectDirectory = dir <> name
           , projectStartHook = Just $ do safeSpawn "vim" ["-g", "+set guifont=Victor\\ Mono\\ SemiBold\\ 18|e ."]
-                                         safeSpawn "st" ["-f","Iosevka Samae-18","-e","tmux","new","-A","-s",name]
+                                         safeSpawn "alacritty" ["-e","tmux","new","-A","-s",name]
+          }
+
+spinChat :: String -> Project
+spinChat name =
+  Project { projectName = name
+          , projectDirectory = "/tmp"
+          , projectStartHook = Just $ do safeSpawnProg (name <> "-desktop")
           }
 
 adminProject = spinVimAndSt "~/admin/"
@@ -19,19 +26,21 @@ candyProject = spinVimAndSt "~/candy/"
 workProject = spinVimAndSt "~/relex/"
 
 projects :: [Project]
-projects =  [ adminProject "sam-configuration-nix"
+projects =  [ adminProject "wrk-config"
             , adminProject "cdc-config"
             , candyProject "dhall-packages"
             , candyProject "exercism"
-            , workProject "atlantis"
+            , spinChat "element"
+            , spinChat "wire"
             , workProject "azure-core-infra"
             , workProject "azure-kube-platform"
             , workProject "bob-the-builder"
             , workProject "docker-images"
             , workProject "gitlab-runners"
-            , workProject "heimdall"
             , workProject "infra-inventory"
             , workProject "isengard"
+            , workProject "isengard-worktree-2"
+            , workProject "isengard-worktree-3"
             , workProject "mordor-ca"
             , workProject "mordor-dashboard"
             , workProject "mordor-deploy"
@@ -41,16 +50,22 @@ projects =  [ adminProject "sam-configuration-nix"
             , workProject "mordor-the-repo"
             , workProject "mordorbooks"
             , workProject "muir"
+            , workProject "nix"
             , workProject "nix-role"
             , workProject "nixos-modules"
             , workProject "nixpkgs"
             , workProject "sm-terraform"
             , workProject "time-tracking"
             , workProject "ugluk-ansible-role"
+            , Project { projectName = "xmonad"
+                      , projectDirectory = "~/.xmonad/"
+                      , projectStartHook = Just $ do safeSpawn "vim" ["-g", "+set guifont=Victor\\ Mono\\ SemiBold\\ 18|e ."]
+                                                     safeSpawn "alacritty" ["-e","tmux","new","-A","-s","xmonad"]
+                      }
             , Project { projectName = "status"
                       , projectDirectory = "/tmp"
                       , projectStartHook = Just $ do
-                          safeSpawn "st" ["-f","Iosevka Samae-12","-e","gotop"]
+                          safeSpawn "alacritty" ["-e","gotop"]
                       }
             , Project { projectName = "email"
                       , projectDirectory = "~/mail"
@@ -58,11 +73,11 @@ projects =  [ adminProject "sam-configuration-nix"
                       }
             , Project { projectName = "frs"
                       , projectDirectory = "/tmp"
-                      , projectStartHook = Just $ do safeSpawnProg "ff-work"
+                      , projectStartHook = Just $ do safeSpawnProg "ff-relex"
                       }
             , Project { projectName = "fre"
                       , projectDirectory = "/tmp"
-                      , projectStartHook = Just $ do safeSpawnProg "ff-eeva"
+                      , projectStartHook = Just $ do safeSpawnProg "ff-perso"
                       }
             , Project { projectName = "network-graph"
                       , projectDirectory = "~/relex/catch-a-network-bug/csvplotter"
diff --git a/lib/Scratchpad.hs b/lib/Scratchpad.hs
index b61eaba..2413daa 100644
--- a/lib/Scratchpad.hs
+++ b/lib/Scratchpad.hs
@@ -16,7 +16,7 @@ modify conf = conf
   }
 
 pads =
-  [ NS "htop" "/run/current-system/sw/bin/st -t htop -e tmux" (title =? "htop")
+  [ NS "htop" "/home/e/.nix-profile/bin/alacritty -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/lib/StatusBar.hs b/lib/StatusBar.hs
index 066f7c5..6facc2f 100644
--- a/lib/StatusBar.hs
+++ b/lib/StatusBar.hs
@@ -31,7 +31,7 @@ runXmobar :: ScreenId -> IO Handle
 runXmobar (S id) = spawnPipe
   $  "/run/current-system/sw/bin/xmobar --screen="
   <> show id
-  <> " /home/eeva/.xmonad/xmobarrc"
+  <> " /home/e/.xmonad/xmobarrc"
 
 killXmobar :: IO ()
 -- killXmobar = spawn "/run/current-system/sw/bin/pkill xmobar"
diff --git a/xmonad.hs b/xmonad.hs
index 402a70e..2c696e3 100755
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -66,7 +66,7 @@ withConfig =
     $ desktopConfig     --   on a default desktop config
     { manageHook         = myManageHook <+> manageHook desktopConfig
     , layoutHook         = desktopLayoutModifiers layouts
-    , terminal           = "/run/current-system/sw/bin/st"
+    , terminal           = "/home/e/.nix-profile/bin/alacritty"
     , normalBorderColor  = S.base03
     , focusedBorderColor = S.violet
     , borderWidth        = 5