summaryrefslogtreecommitdiffstats
path: root/tv/5pkgs/haskell
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-06-07 19:51:47 +0200
committermakefu <github@syntax-fehler.de>2020-06-07 19:51:47 +0200
commit8dc4c3d153f4f6536815dbb122bf5465ed3a800a (patch)
tree584ff99e146b1b1a40ff1b2ab026de00a984eb0d /tv/5pkgs/haskell
parent54502928f633568c694cac94dfd4de527c8414bc (diff)
parent8ae780cf2689a0e62718fe0dcc8b80e584f68d23 (diff)
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'tv/5pkgs/haskell')
-rw-r--r--tv/5pkgs/haskell/xmonad-tv/src/Paths.hs3
-rw-r--r--tv/5pkgs/haskell/xmonad-tv/src/main.hs15
2 files changed, 15 insertions, 3 deletions
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
index dd21511b4..6b7235530 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
@@ -3,6 +3,9 @@ module Paths where
import Helpers.Path
+flameshot :: FilePath
+flameshot = findExecutable "flameshot-once"
+
otpmenu :: FilePath
otpmenu = findExecutable "otpmenu"
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index 400c87ab9..c83b411bd 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -18,11 +18,13 @@ import XMonad.Actions.CycleWS (toggleWS)
import XMonad.Layout.NoBorders ( smartBorders )
import XMonad.Layout.ResizableTile (ResizableTall(ResizableTall))
import XMonad.Layout.ResizableTile (MirrorResize(MirrorExpand,MirrorShrink))
+import qualified XMonad.Prompt
import qualified XMonad.StackSet as W
import Data.Map (Map)
import qualified Data.Map as Map
import XMonad.Hooks.UrgencyHook (SpawnUrgencyHook(..), withUrgencyHook)
-import XMonad.Hooks.ManageHelpers (doCenterFloat)
+import XMonad.Hooks.ManageHelpers (doCenterFloat,doRectFloat)
+import Data.Ratio
import XMonad.Hooks.Place (placeHook, smart)
import XMonad.Actions.PerWorkspaceKeys (chooseAction)
@@ -66,6 +68,8 @@ mainNoArgs = do
composeAll
[ appName =? "fzmenu-urxvt" --> doCenterFloat
, appName =? "pinentry" --> doCenterFloat
+ , title =? "Upload to Imgur" -->
+ doRectFloat (W.RationalRect 0 0 (1 % 8) (1 % 8))
, placeHook (smart (1,0))
]
, startupHook =
@@ -151,8 +155,8 @@ myKeys conf = Map.fromList $
, ((_4 , xK_comma ), sendMessage $ IncMasterN 1)
, ((_4 , xK_period ), sendMessage $ IncMasterN (-1))
- , ((_4 , xK_a ), addWorkspacePrompt def)
- , ((_4 , xK_r ), renameWorkspace def)
+ , ((_4 , xK_a ), addWorkspacePrompt promptXPConfig)
+ , ((_4 , xK_r ), renameWorkspace promptXPConfig)
, ((_4 , xK_Delete ), removeEmptyWorkspace)
, ((_4 , xK_Return ), toggleWS)
@@ -163,6 +167,8 @@ myKeys conf = Map.fromList $
, ((_4, xF86XK_AudioMute), pavucontrol [])
, ((_4, xK_Prior), forkFile Paths.xcalib ["-invert", "-alter"] Nothing)
+
+ , ((0, xK_Print), forkFile Paths.flameshot [] Nothing)
]
where
_4 = mod4Mask
@@ -184,6 +190,9 @@ myKeys conf = Map.fromList $
resetLayout = setLayout $ XMonad.layoutHook conf
+ promptXPConfig =
+ def { XMonad.Prompt.font = myFont }
+
pagerConfig :: PagerConfig
pagerConfig = def