Purge dmenu

diff --git a/states/qutebrowser/files/config.py b/states/qutebrowser/files/config.py
index 50900b15470f977df7a2e3825992e8dcf5acd4e7..63cf090522ddda09ab96e0304e3a50d4a9bd75bd 100644 (file)
--- a/states/qutebrowser/files/config.py
+++ b/states/qutebrowser/files/config.py
@@ -26,15 +26,15 @@ c.content.headers.user_agent = 'Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/2
 c.content.headers.custom = {'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'}
 {% endif %}
 
-config.bind(',zl', "spawn --userscript qute-pass --dmenu-invocation 'wofi --dmenu'")
-config.bind(',zul', "spawn --userscript qute-pass --dmenu-invocation 'wofi --dmenu' --username-only")
-config.bind(',zpl', "spawn --userscript qute-pass --dmenu-invocation 'wofi --dmenu' --password-only")
-config.bind(',zol', "spawn --userscript qute-pass --dmenu-invocation 'wofi --dmenu' --otp-only")
-
-config.bind(',bl', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation wofi --dmenu')
-config.bind(',bul', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation wofi --dmenu --username-only')
-config.bind(',bpl', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation wofi --dmenu --password-only')
-config.bind(',bol', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation wofi --dmenu --totp-only')
+config.bind(',zl', "spawn --userscript qute-pass --dmenu-invocation 'rofi -dmenu'")
+config.bind(',zul', "spawn --userscript qute-pass --dmenu-invocation 'rofi -dmenu' --username-only")
+config.bind(',zpl', "spawn --userscript qute-pass --dmenu-invocation 'rofi -dmenu' --password-only")
+config.bind(',zol', "spawn --userscript qute-pass --dmenu-invocation 'rofi -dmenu' --otp-only")
+
+config.bind(',bl', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation rofi -dmenu')
+config.bind(',bul', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation rofi -dmenu --username-only')
+config.bind(',bpl', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation rofi -dmenu --password-only')
+config.bind(',bol', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation rofi -dmenu --totp-only')
 
 
 

diff --git a/states/sway/arch.sls b/states/sway/arch.sls
index 1d370f44cae43c9d523165b90cb6be8116b1d654..92195cc2eaea9213d6bb72cb18877435bd78e495 100644 (file)
--- a/states/sway/arch.sls
+++ b/states/sway/arch.sls
@@ -8,15 +8,3 @@ install sway:
       - rofi-lbonn-wayland
       - mako
       - libnotify
-      - dmenu
-
-ensure dmenu-wl wrapper:
-  file.managed:
-    - name: {{ grains['homedir'] }}/.local/bin/dmenu_run
-    - mode: 750
-    - owner: {{ grains['user'] }}
-    - group: {{ grains['user'] }}
-    - contents:
-      - "#!/bin/sh"
-      - "active_monitor=$(swaymsg -t get_outputs | jq -r '.[map(.focused) | index(true)].name')"
-      - '/usr/bin/dmenu_run -m "${active_monitor}" "$@"'

diff --git a/states/sway/files/config.jinja.old b/states/sway/files/config.jinja.old
deleted file mode 100644 (file)
index e53526a..0000000
--- a/states/sway/files/config.jinja.old
+++ /dev/null
@@ -1,239 +0,0 @@
-{% set host = grains['host'] %}
-# Colors
-set $black #000000
-set $black_super #555555
-
-set $red #f92672
-set $red_super #dd4278
-
-set $green #74e22e
-set $green_super #9dc54b
-
-set $yellow #e6db74
-set $yellow_super #d1ca89
-
-set $blue #66d9ef
-set $blue_super #7accda
-
-set $magenta #ae81ff
-set $magenta_super #b392ef
-
-set $cyan #00d9d9
-set $cyan_super #c8f0f0
-
-set $white #f5deb3
-set $white_super #ffffff
-
-client.focused $black $yellow_super $black $black $black
-client.focused_inactive $black $black_super $white $black $black 
-
-
-set $mod Mod4
-
-# Slight gaps around windows
-gaps inner 6
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-bindsym Control+t mode "$ratpoison"
-
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
-set $music "Music"
-set $chat "Chat"
-
-mode "$ratpoison" {
-# All/most commands in this mode should revert to the default mode on comleption.
-# We are emulating ratpoison (kinda) here
-
-# Moving to workspaces
-#  bindsym n workspace next mode "default"
-#    bindsym Shift+n workspace prev mode "default"
-
-    bindsym 1 exec 'swaymsg mode "default"; swaymsg workspace $ws1'
-    bindsym 2 exec 'swaymsg mode "default"; swaymsg workspace $ws2'
-    bindsym 3 exec 'swaymsg mode "default"; swaymsg workspace $ws3'
-    bindsym 4 exec 'swaymsg mode "default"; swaymsg workspace $ws4'
-    bindsym 5 exec 'swaymsg mode "default"; swaymsg workspace $ws5'
-    bindsym 6 exec 'swaymsg mode "default"; swaymsg workspace $ws6'
-    bindsym 7 exec 'swaymsg mode "default"; swaymsg workspace $ws7'
-    bindsym 8 exec 'swaymsg mode "default"; swaymsg workspace $ws8'
-    bindsym 9 exec 'swaymsg mode "default"; swaymsg workspace $ws9'
-    bindsym 0 exec 'swaymsg mode "default"; swaymsg workspace $ws10'
-    bindsym m exec 'swaymsg mode "default"; swaymsg workspace $music'
-    bindsym a exec 'swaymsg mode "default"; swaymsg workspace $chat'
-
-
-    bindsym Shift+1 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws1'
-    bindsym Shift+2 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws2'
-    bindsym Shift+3 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws3'
-    bindsym Shift+4 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws4'
-    bindsym Shift+5 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws5'
-    bindsym Shift+6 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws6'
-    bindsym Shift+7 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws7'
-    bindsym Shift+8 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws8'
-    bindsym Shift+9 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws9'
-    bindsym Shift+0 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws10'
-    bindsym Shift+m exec 'swaymsg mode "default"; swaymsg move container to workspace $music'
-    bindsym Shift+a exec 'swaymsg mode "default"; swaymsg move container to workspace $chat'
-
-# Moving focus
-#    bindsym Tab focus right mode "default"
-#    bindsym Shift+Tab focus left mode "default"
-
-    bindsym h exec 'swaymsg mode "default"; swaymsg focus left'
-    bindsym j exec 'swaymsg mode "default"; swaymsg focus down' 
-    bindsym k exec 'swaymsg mode "default"; swaymsg focus up' 
-    bindsym l exec 'swaymsg mode "default"; swaymsg focus right' 
-
-
-# Moving windows
-    bindsym Shift+h exec 'swaymsg mode "default"; swaymsg move left'
-    bindsym Shift+j exec 'swaymsg mode "default"; swaymsg move down'
-    bindsym Shift+k exec 'swaymsg mode "default"; swaymsg move up'
-    bindsym Shift+l exec 'swaymsg mode "default"; swaymsg move right'
-
-# Changing split modes
-    bindsym v exec 'swaymsg mode "default"; swaymsg split v'
-    bindsym o exec 'swaymsg mode "default"; swaymsg split h'
-
-
-    bindsym c exec 'swaymsg mode "default"; swaymsg exec termite'
-    bindsym q exec 'swaymsg mode "default"; swaymsg kill'
-
-    bindsym Shift+e exec 'swaymsg mode "default"; swaymsg exec dmenu_run'
-
-    bindsym $mod+l exec 'swaymsg mode "default"; "lock.nosmartcard"' 
-    bindsym Escape mode "default"
-}
-
-
-
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-
-# enter fullscreen mode for the focused container
-bindsym $mod+t fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+r layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+f layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-#reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-# These bindings trigger as soon as you enter the resize mode
-
-# Pressing left will shrink the window’s width.
-# Pressing right will grow the window’s width.
-# Pressing up will shrink the window’s height.
-# Pressing down will grow the window’s height.
-  bindsym h resize shrink width 10 px or 10 ppt
-    bindsym j resize grow height 10 px or 10 ppt
-    bindsym k resize shrink height 10 px or 10 ppt
-    bindsym l resize grow width 10 px or 10 ppt
-
-# same bindings, but for the arrow keys
-    bindsym Left resize shrink width 10 px or 10 ppt
-    bindsym Down resize grow height 10 px or 10 ppt
-    bindsym Up resize shrink height 10 px or 10 ppt
-    bindsym Right resize grow width 10 px or 10 ppt
-
-# back to normal: Enter or Escape or $mod+r
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-    bindsym $mod+p mode "default"
-}
-
-bindsym $mod+p mode "resize"
-
-bindsym XF86MonBrightnessUp exec "brightnessctl set +100"
-bindsym XF86MonBrightnessDown exec "brightnessctl set 100-"
-
-bindsym XF86ScreenSaver exec "lock.nosmartcard"
-
-hide_edge_borders both 
-
-focus_follows_mouse no
-
-focus_on_window_activation urgent
-
-for_window [class="^rdesktop"] move workspace number 9; floating disable
-for_window [class="Pinentry"] floating enable
-
-{% set lockcmd = "swaylock -e -f -i ~/Pictures/lockscreen_1080_1.png" %}
-
-exec swayidle -w \
-timeout 300 "{{lockcmd}}" \
-  timeout 600 'systemctl suspend' \
-    before-sleep "{{lockcmd}}"
-
-# This keyboard has this layout on all machines:
-input 1241:36:HOLDCHIP_USB_Keyboard {
-  xkb_layout us
-  xkb_variant colemak
-  xkb_options ctrl:nocaps
-}
-
-input 16700:8455:DELL_Dell_USB_Entry_Keyboard {
-  xkb_layout gb
-  xkb_variant colemak
-  xkb_options ctrl:nocaps
-}
-
-input 7504:24616:unspecified_ErgoDox_ergonomic_keyboard {
-  xkb_layout gb
-}
-
-input 9494:21:CM_Storm_Quickfire_Pro_Ultimate_6_key {
-  xkb_layout gb
-  xkb_variant colemak
-  xkb_options ctrl:nocaps
-}
-
-input 1:1:AT_Translated_Set_2_keyboard {
-  xkb_layout gb
-  xkb_variant colemak
-  xkb_options ctrl:nocaps
-}
-
-input 9610:4102:Gaming_KB__Gaming_KB {
-  xkb_layout gb
-  xkb_variant colemak
-  xkb_options ctrl:nocaps
-}
-
-# host specific section
-{%- do salt.log.error('sway/files/' + host) -%}
-{% include 'sway/files/' + host %}