summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xresources-orange9
-rw-r--r--xmonad/xmonad.hs21
2 files changed, 22 insertions, 8 deletions
diff --git a/Xresources-orange b/Xresources-orange
index 43e52ca..0a3b2f9 100644
--- a/Xresources-orange
+++ b/Xresources-orange
@@ -11,13 +11,16 @@ Xft.hintstyle: hintslight
!! Droid Sans Mono
!URxvt.font: xft:Droid Sans Mono-9:hinting=True;antialias:True,xft:Bitstream Vera Sans Mono,9x15
+!urxvt*font: xft:bitstream vera sans mono:size=10:antialias=true
URxvt.font: xft:Source Code Pro:pixelsize=12,hinting=True,antialias:True,style=regular
URxvt.letterSpace: -1
-!urxvt*font: xft:bitstream vera sans mono:size=10:antialias=true
+URxvt.keysym.M-c: perl:clipboard:copy
+URxvt.keysym.M-v: perl:clipboard:paste
URxvt.scrollBar: false
URxvt.saveLines: 40000
-URxvt.perl-ext-common: default,matcher,resize-font
+URxvt.perl-ext-common: default,matcher,resize-font,clipboard
+URxvt.clipboard.autocopy: true
URxvt.resize-font.smaller: C-Down
URxvt.resize-font.bigger: C-Up
URxvt.iso14755: false
@@ -78,4 +81,4 @@ URxvt.matcher.button: 1
*.color18: base01
*.color19: base02
*.color20: base04
-*.color21: base06 \ No newline at end of file
+*.color21: base06
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index b64dbb7..a98e572 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -22,9 +22,14 @@ myConfig =
, modMask = mod4Mask
, terminal = "$TERMINAL"
, borderWidth = 2
+ , normalBorderColor = "#000000"
, workspaces = pure <$> "\"<>PYAOEU"
}
+muteCommand = "pactl set-sink-mute @DEFAULT_SINK@ toggle"
+increaseVolumeCommand = "sh -c \"pactl set-sink-mute 0 false ; pactl set-sink-volume @DEFAULT_SINK@ +5%\""
+decreaseVolumeCommand = "sh -c \"pactl set-sink-mute 0 false ; pactl set-sink-volume @DEFAULT_SINK@ -- -5%\""
+
myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
-- launch a terminal
@@ -83,6 +88,10 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
-- , ((modm , xK_period), sendMessage (IncMasterN (-1)))
, ((modm .|. shiftMask, xK_Tab ), sendMessage (IncMasterN (-1)))
+ , ((modm , xK_w ), spawn muteCommand)
+ , ((modm , xK_v ), spawn decreaseVolumeCommand)
+ , ((modm , xK_z ), spawn increaseVolumeCommand)
+
-- This is redundant because it's added by the statusBar function.
-- , ((modm , xK_b ), sendMessage ToggleStruts)
@@ -101,10 +110,10 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
-- mod-[1..9], Switch to workspace N
-- mod-shift-[1..9], Move client to workspace N
--
- [((m .|. modm, k), windows $ f i)
- | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
- , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
- ++
+ -- [((m .|. modm, k), windows $ f i)
+ -- | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
+ -- , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
+ -- ++
[((m .|. modm, k), windows $ f i)
| (i, k) <- zip (XMonad.workspaces conf) [
@@ -113,10 +122,12 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
, xK_period
, xK_p
, xK_y
+ , xK_f
, xK_a
, xK_o
, xK_e
- , xK_u]
+ , xK_u
+ , xK_i]
, (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
++