From c41263a44ebad7058872582099be5645a9fee97d Mon Sep 17 00:00:00 2001 From: eeva Date: Sun, 3 Jun 2018 19:11:02 +0300 Subject: [PATCH 1/5] Default project --- lib/Projects.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Projects.hs b/lib/Projects.hs index 90e5f08..a61e612 100644 --- a/lib/Projects.hs +++ b/lib/Projects.hs @@ -6,8 +6,8 @@ import XMonad import XMonad.Actions.DynamicProjects projects :: [Project] -projects = [ Project { projectName = "steam" - , projectDirectory = "~/" +projects = [ Project { projectName = "admin" + , projectDirectory = "~/admin" , projectStartHook = Nothing } , Project { projectName = "tootgun" From a3c2e1680de999768306e0920b196abfb13b44d9 Mon Sep 17 00:00:00 2001 From: eeva Date: Fri, 8 Jun 2018 08:42:44 +0300 Subject: [PATCH 2/5] Add project steam (autostart) --- lib/Projects.hs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Projects.hs b/lib/Projects.hs index a61e612..281fdd4 100644 --- a/lib/Projects.hs +++ b/lib/Projects.hs @@ -14,6 +14,10 @@ projects = [ Project { projectName = "admin" , projectDirectory = "~/candy/tootgun" , projectStartHook = Nothing } + , Project { projectName = "steam" + , projectDirectory = "~/" + , projectStartHook = Just $ do spawn "steam" + } ] modify :: XConfig l -> XConfig l From 02ef1ead528bcf20d739a2045fbe040be97b02a9 Mon Sep 17 00:00:00 2001 From: eeva Date: Sat, 9 Jun 2018 10:44:40 +0300 Subject: [PATCH 3/5] Add Project firefox --- lib/Projects.hs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Projects.hs b/lib/Projects.hs index 281fdd4..b3568c2 100644 --- a/lib/Projects.hs +++ b/lib/Projects.hs @@ -18,6 +18,10 @@ projects = [ Project { projectName = "admin" , projectDirectory = "~/" , projectStartHook = Just $ do spawn "steam" } + , Project { projectName = "web" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do spawn "firefox" + } ] modify :: XConfig l -> XConfig l From 82ae92f620715aa957f0abf972edbf439452e115 Mon Sep 17 00:00:00 2001 From: eeva Date: Sat, 23 Jun 2018 18:28:05 +0300 Subject: [PATCH 4/5] yt-app --- lib/Projects.hs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Projects.hs b/lib/Projects.hs index b3568c2..06a8aed 100644 --- a/lib/Projects.hs +++ b/lib/Projects.hs @@ -22,6 +22,10 @@ projects = [ Project { projectName = "admin" , projectDirectory = "/tmp" , projectStartHook = Just $ do spawn "firefox" } + , Project { projectName = "yt" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do spawn "ytapp-launcher.sh" + } ] modify :: XConfig l -> XConfig l From b5b91cdd8df1021100faf545060ed9693592eedd Mon Sep 17 00:00:00 2001 From: eeva Date: Sun, 27 Jan 2019 21:20:08 +0200 Subject: [PATCH 5/5] Changes --- lib/KeyBindings.hs | 28 ++++++++++++++-------------- lib/Projects.hs | 4 ++++ lib/Scratchpad.hs | 2 +- xmonad.hs | 2 +- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/lib/KeyBindings.hs b/lib/KeyBindings.hs index 00c2117..efd5062 100644 --- a/lib/KeyBindings.hs +++ b/lib/KeyBindings.hs @@ -8,7 +8,7 @@ import Data.List (sort, isSuffixOf) import Data.Maybe (isJust) import Graphics.X11.Types import System.Exit -import Text.EditDistance +-- import Text.EditDistance import XMonad import XMonad.Actions.CycleWS import XMonad.Actions.DynamicProjects @@ -47,7 +47,7 @@ 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/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") @@ -83,15 +83,15 @@ promptConfig = def , promptBorderWidth = 5 } --- Slightly taken from --- https://mail.haskell.org/pipermail/xmonad/2010-October/010671.html -data FuzzySpawn = FuzzySpawn deriving (Read, Show) -instance XPrompt FuzzySpawn where showXPrompt _ = "RunC: " -fuzzyPrompt config = do - cmds <- io getCommands - let compl s - | null s = [] - | otherwise = let weight c = levenshteinDistance defaultEditCosts s c - in map snd $ take 20 $ sort $ map (\c -> (weight c,c)) cmds - mkXPrompt FuzzySpawn config (return . compl) spawn - +-- -- Slightly taken from +-- -- https://mail.haskell.org/pipermail/xmonad/2010-October/010671.html +-- data FuzzySpawn = FuzzySpawn deriving (Read, Show) +-- instance XPrompt FuzzySpawn where showXPrompt _ = "RunC: " +-- fuzzyPrompt config = do +-- cmds <- io getCommands +-- let compl s +-- | null s = [] +-- | otherwise = let weight c = levenshteinDistance defaultEditCosts s c +-- in map snd $ take 20 $ sort $ map (\c -> (weight c,c)) cmds +-- mkXPrompt FuzzySpawn config (return . compl) spawn +-- diff --git a/lib/Projects.hs b/lib/Projects.hs index 06a8aed..e695783 100644 --- a/lib/Projects.hs +++ b/lib/Projects.hs @@ -26,6 +26,10 @@ projects = [ Project { projectName = "admin" , projectDirectory = "/tmp" , projectStartHook = Just $ do spawn "ytapp-launcher.sh" } + , Project { projectName = "Diablo" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do spawn "/run/current-system/sw/bin/wine '/home/eeva/.wine/drive_c/Program Files/Battle.net/Battle.net Launcher.exe'" + } ] modify :: XConfig l -> XConfig l 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