Sfoglia il codice sorgente

Move menu system to saturnin's new 'menu' subcommad

saturnin v0.0.21+ adds new flexible menu handler so we don't need to
keep long pipes around in i3/config
Alois Mahdal 9 anni fa
parent
commit
0bfd3421bc
3 ha cambiato i file con 43 aggiunte e 13 eliminazioni
  1. 5
    5
      dotfiles/i3/config
  2. 0
    8
      dotfiles/saturnin/dmenu.ini
  3. 38
    0
      dotfiles/saturnin/menu.ini

+ 5
- 5
dotfiles/i3/config Vedi File

@@ -188,8 +188,8 @@ bindsym $mod+Return         exec "urxvt"
188 188
 bindsym $mod+Shift+Return   exec "xfce4-terminal"
189 189
 bindsym $mod+b              exec "saturnin www -1 | head -1 | uba -a"
190 190
 bindsym $mod+Shift+b        exec "saturnin www -1 | uba"
191
-bindsym $mod+i              exec "saturnin conf -j -S www.ini | saturnin dmenu -l 20 --split = | uba"
192
-bindsym $mod+Shift+i        exec "tac .local/share/uzbl/history | uniq | saturnin dmenu -l 20 --split-field 3 | uba"
191
+bindsym $mod+i              exec "saturnin menu www"
192
+bindsym $mod+Shift+i        exec "saturnin menu www_hist"
193 193
 bindsym $mod+c              exec "saturnin clip save"
194 194
 bindsym $mod+Shift+c        exec "saturnin clip load"
195 195
 bindsym $mod+Shift+f        exec thunar
@@ -200,10 +200,10 @@ bindsym $mod+Shift+d        exec xbacklight -inc 10
200 200
 bindsym $mod+Escape         exec "saturnin iam afk"
201 201
 bindsym $mod+Shift+Escape   exec "saturnin iam gone"
202 202
 
203
-bindsym $mod+m              exec "saturnin conf -j -S -s dmenu.item | saturnin dmenu --split = | bash -"
203
+bindsym $mod+m              exec "saturnin menu status"
204 204
 bindsym $mod+Shift+m        exec "i3-dmenu-desktop --dmenu='saturnin dmenu'"
205
-bindsym $mod+p              exec "dmenu_path | saturnin dmenu | bash -"
206
-bindsym $mod+Shift+p        exec "tac .dmenu_history | awk '!seen[$0]++' | saturnin dmenu | tee -a .dmenu_history | bash -"
205
+bindsym $mod+p              exec "saturnin menu run"
206
+bindsym $mod+Shift+p        exec "saturnin menu run_hist"
207 207
 
208 208
 bindsym $mod+n              exec "saturnin kb next"
209 209
 bindsym $mod+Shift+n        exec "saturnin kb home"

+ 0
- 8
dotfiles/saturnin/dmenu.ini Vedi File

@@ -1,8 +0,0 @@
1
-[dmenu.item]
2
-    iam:AFK         = saturnin iam afk
3
-    iam:GONE        = saturnin iam gone
4
-    iam:BACK        = saturnin iam back
5
-    iam:UNDOCKING   = saturnin iam undocking
6
-    iam:ZLEEPING    = xfce4-terminal -T 'iam:ZLEEPING' -e 'saturnin iam zleeping'
7
-    kb:us           = setxkbmap us
8
-    kb:cz           = setxkbmap cz

+ 38
- 0
dotfiles/saturnin/menu.ini Vedi File

@@ -0,0 +1,38 @@
1
+[menu._default_]
2
+
3
+    name        = status
4
+    selector    = saturnin dmenu
5
+
6
+[menu.www]
7
+
8
+    generator   = saturnin conf -j -S www.ini
9
+    select_args = -l 20 --split =
10
+    consumer    = uba
11
+
12
+[menu.www_hist]
13
+
14
+    generator   = tac .local/share/uzbl/history | uniq
15
+    select_args = -l 20 --split-field 3
16
+    consumer    = uba
17
+
18
+[menu.status]
19
+
20
+    item        = iam:AFK         = saturnin iam afk
21
+    item        = iam:GONE        = saturnin iam gone
22
+    item        = iam:BACK        = saturnin iam back
23
+    item        = iam:UNDOCKING   = saturnin iam undocking
24
+    item        = iam:ZLEEPING    = xfce4-terminal -T 'iam:ZLEEPING' -e 'saturnin iam zleeping'
25
+    item        = kb:us           = setxkbmap us
26
+    item        = kb:cz           = setxkbmap cz
27
+    select_args = --split =
28
+    consumer    = bash -
29
+
30
+[menu.run]
31
+
32
+    generator   = dmenu_path
33
+    consumer    = bash -
34
+
35
+[menu.run_hist]
36
+
37
+    generator   = tac .saturnin-dmenu.log | awk '!seen[$0]++'
38
+    consumer    = tee -a .saturnin-dmenu.log | bash -