Update xmonad

4c10e969a57d61d728531d20e12dc4743fe7ff41
Alexis Sellier committed ago 1 parent fb467c78
.xmonad/xmonad.hs +27 -31
114 114
toggleStrutsKey :: XConfig t -> (KeyMask, KeySym)
115 115
toggleStrutsKey XConfig { XMonad.modMask = modMask } = (modMask, xK_b)
116 116
117 117
myXPConfig :: XPConfig
118 118
myXPConfig = def
119 -
  { position          = CenteredAt 0.5 0.09
119 +
  { position          = CenteredAt 0.5 0.1
120 120
  , alwaysHighlight   = True
121 121
  , height            = 60
122 122
  , promptBorderWidth = 1
123 -
  , font              = "xft:Inconsolata:size=14"
123 +
  , font              = "xft:Fira Code:size=13"
124 124
  , borderColor       = "#555555"
125 125
  , bgColor           = "#111111"
126 126
  }
127 127
128 128
myKeys :: FilePath -> XConfig Layout -> Map (KeyMask, KeySym) (X ())
133 133
       [ ((modMask, xK_F12),                    safeSpawn "sleep" [])
134 134
       , ((modMask .|. shiftMask, xK_F12),      safeSpawn "systemctl" ["hibernate"])
135 135
       , ((modMask, xK_F11),                    safeSpawn "slock" [])
136 136
       , ((modMask, xK_F10),                    safeSpawn "toggle-displays" [])
137 137
       , ((modMask, xK_F5),                     safeSpawn "refresh-display" [])
138 -
       , ((modMask, xK_p),                      rofi)
138 +
       , ((modMask, xK_p),                      runExecutable)
139 +
       , ((modMask, xK_o),                      switchWindow)
139 140
       , ((modMask, xK_Tab),                    toggleWS)
140 141
       , ((modMask .|. controlMask, xK_Return), toggleFloatNext >> (spawn $ XMonad.terminal conf))
141 142
       , ((modMask, xK_Print),                  screenshotPrompt home)
142 143
       , ((modMask .|. shiftMask, xK_Print),    safeSpawn "screenshot-region" [])
143 144
       , ((modMask, xK_0),                      windows $ greedyView "ω")
144 145
       , ((modMask .|. shiftMask, xK_0),        windows $ shift "ω")
145 146
       , ((modMask, xK_Left),                   prevWS)
146 147
       , ((modMask, xK_Right),                  nextWS)
147 148
       , ((modMask .|. shiftMask, xK_q),        confirmPrompt myXPConfig "Exit XMonad?" $ io (exitWith ExitSuccess))
148 149
       ]
149 -
    dmenu :: X ()
150 -
    dmenu = safeSpawn
151 -
        "dmenu_run" [ "-fn", "Inconsolata-14,Monospace-12"
152 -
                    , "-i"
153 -
                    , "-y", "-1"
154 -
                    , "-h",  "24"
155 -
                    , "-nb", "black"
156 -
                    , "-nf", "#bbb"
157 -
                    , "-sb", "#444"
158 -
                    , "-sf", "white"
159 -
                    ]
160 -
161 -
rofi :: X ()
162 -
rofi = safeSpawn
163 -
    "rofi" [ "-show", "run"
164 -
           , "-color-active", "#fdf6e3,#268bd2,#eee8d5,#268bd2,#fdf6e3"
165 -
           , "-color-normal", "#111,#bbb,#111,#bbb,#000"
166 -
           , "-color-urgent", "#fdf6e3,#dc322f,#eee8d5,#dc322f,#fdf6e3"
167 -
           , "-color-window", "#111,#666"
168 -
           , "-font", "Inconsolata 16"
169 -
           , "-hide-scrollbar"
170 -
           , "-levenshtein-sort"
171 -
           , "-lines", "7"
172 -
           , "-matching", "fuzzy"
173 -
           , "-padding", "5"
174 -
           , "-separator-style", "solid"
175 -
           , "-width", "30"
176 -
           ]
150 +
151 +
rofi :: String -> [String] -> X ()
152 +
rofi mode opts = safeSpawn
153 +
    "rofi" (opts ++ [ "-show", mode
154 +
            , "-color-active", "#fdf6e3,#268bd2,#eee8d5,#268bd2,#fdf6e3"
155 +
            , "-color-normal", "#111,#bbb,#111,#bbb,#000"
156 +
            , "-color-urgent", "#fdf6e3,#dc322f,#eee8d5,#dc322f,#fdf6e3"
157 +
            , "-color-window", "#111,#555"
158 +
            , "-font", "Fira Code 13"
159 +
            , "-hide-scrollbar"
160 +
            , "-levenshtein-sort"
161 +
            , "-lines", "7"
162 +
            , "-matching", "fuzzy"
163 +
            , "-padding", "10"
164 +
            , "-separator-style", "none"
165 +
            , "-width", "30"
166 +
            ])
167 +
168 +
runExecutable :: X ()
169 +
runExecutable = rofi "run" []
170 +
171 +
switchWindow :: X ()
172 +
switchWindow = rofi "window" ["-width", "50", "-lines", "14"]