diff --git a/lib/KeyBindings.hs b/lib/KeyBindings.hs index 37f3ec0..dfbbfc9 100644 --- a/lib/KeyBindings.hs +++ b/lib/KeyBindings.hs @@ -52,7 +52,7 @@ modify conf = conf , ("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 "/run/current-system/sw/bin/flameshot gui") + , ("M-s s", spawn "flameshot gui") , ("M-s t", spawn "/run/current-system/sw/bin/scrot /tmp/screen.png") -- Workspace and tasks , ("M-b", switchProjectPrompt promptConfig) @@ -81,7 +81,7 @@ promptConfig = def , defaultText = "" , fgColor = S.base02 , fgHLight = S.base03 - , font = "xft:Iosevka Term:style=Regular:size=8" + , font = "xft:Iosevka Samae:style=Regular:size=8" , height = 24 , promptBorderWidth = 5 } @@ -97,4 +97,4 @@ promptConfig = def -- | 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/Password.hs b/lib/Password.hs index bb08efa..7302b28 100644 --- a/lib/Password.hs +++ b/lib/Password.hs @@ -52,5 +52,6 @@ mkPassPrompt label f conf = do return . lines $ files selectPassword :: String -> X () -selectPassword pass = spawn $ "gpg --decrypt " ++ pass ++ " | xclip -selection clipboard" +selectPassword pass = spawn $ "gpg --decrypt " ++ pass ++ " | copy" +-- “copy” comes with the xmonad module in the nix configuration diff --git a/lib/Projects.hs b/lib/Projects.hs index 9504b97..d51de10 100644 --- a/lib/Projects.hs +++ b/lib/Projects.hs @@ -7,32 +7,33 @@ import XMonad.Actions.DynamicProjects import XMonad.Util.Run projects :: [Project] -projects = [ Project { projectName = "admin" - , projectDirectory = "~/admin" - , projectStartHook = Just $ do safeSpawn "vim" ["-g"] - safeSpawnProg "st" - } - , Project { projectName = "sound" - , projectDirectory = "/tmp" - , projectStartHook = Just $ do safeSpawnProg "pavucontrol" - } - , Project { projectName = "steam" - , projectDirectory = "~/" - , projectStartHook = Just $ do spawn "steam" - } - , Project { projectName = "web" - , projectDirectory = "/tmp" - , projectStartHook = Just $ do spawn "firefox" - } - , Project { projectName = "yt" - , 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'" - } - ] +projects = + [ Project { projectName = "admin" + , projectDirectory = "~/admin" + , projectStartHook = Just $ do safeSpawn "vim" ["-g"] + safeSpawnProg "st" + } + , Project { projectName = "flim" + , projectDirectory = "/flims/rtorrent/download" + , projectStartHook = Just $ do safeSpawnProg "st" + } + , Project { projectName = "sound" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do safeSpawnProg "pavucontrol" + } + , Project { projectName = "steam" + , projectDirectory = "~/" + , projectStartHook = Just $ do spawn "steam" + } + , Project { projectName = "web" + , projectDirectory = "/tmp" + , projectStartHook = Just $ do spawn "firefox" + } + , 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 modify conf = dynamicProjects projects conf