Fix kitty fonts and add dmenu for nm

.config/kitty/fontawesome.generate.py

@@ -22,7 +22,7 @@ for icon, data in obj.items():
     points.append(ufmt)
 
 pointsfmt = ",".join(points)
-configline = "symbol_map {} Font Awesome 5 Pro".format(pointsfmt)
+configline = "symbol_map {} Font Awesome 5 Free Solid".format(pointsfmt)
 
 pointsfmt_brands = ",".join(points_brands)
 configline_brands = "symbol_map {} Font Awesome 5 Brands".format(pointsfmt_brands)

.config/networkmanager-dmenu/config.ini

@@ -0,0 +1,26 @@
+[dmenu]
+dmenu_command = /usr/bin/wofi -dmenu
+# # Note that dmenu_command can contain arguments as well like:
+# # `dmenu_command = rofi -dmenu -i -theme nmdm`
+# # `dmenu_command = rofi -dmenu -width 30 -i`
+# # `dmenu_command = dmenu -i -l 25 -b -nb #909090 -nf #303030`
+# rofi_highlight = <True or False> # (Default: False) use rofi highlighting instead of '=='
+# compact = <True or False> # (Default: False). Remove extra spacing from display
+# pinentry = <Pinentry command>  # (Default: None) e.g. `pinentry-gtk`
+# wifi_chars = <string of 4 unicode characters representing 1-4 bars strength>
+# wifi_chars = ▂▄▆█
+# list_saved = <True or False> # (Default: False) list saved connections
+
+[dmenu_passphrase]
+# # Uses the -password flag for Rofi, -x for bemenu. For dmenu, sets -nb and
+# # -nf to the same color or uses -P if the dmenu password patch is applied
+# # https://tools.suckless.org/dmenu/patches/password/
+# obscure = True
+# obscure_color = #222222
+
+[editor]
+# terminal = <name of terminal program>
+# gui_if_available = <True or False> (Default: True)
+
+[nmdm]
+# rescan_delay = <seconds>  # (seconds to wait after a wifi rescan before redisplaying the results)

.config/sway/config

@@ -375,7 +375,7 @@ exec mako
 #
 # Enable blueman tray icon:
 #
-exec blueman-tray
+exec blueman-applet
 
 ### Setup-specific configuration
 #

.config/sway/work

@@ -32,8 +32,8 @@ for_window [instance="google-chrome" title="apps"] move container to workspace 1
 #
 # Shortcuts
 #
-bindsym XF86Favorites exec google-chrome --new-window $MICROSEC_DAILY
-bindsym $mod+Shift+Control+a exec google-chrome --new-window $MICROSEC_PAGES
+bindsym XF86Favorites exec google-chrome --password-store=gnome --new-window $MICROSEC_DAILY
+bindsym $mod+Shift+Control+a exec google-chrome --password-store=gnome --new-window $MICROSEC_PAGES
 
 #
 # Display controls:

.config/waybar/config

@@ -6,7 +6,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/mode", "custom/media", "sway/window"],
     "modules-center": [],
-    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "battery", "clock", "tray"],
+    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "sway/language", "battery", "clock", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -23,9 +23,25 @@
     //         "default": ""
     //     }
     // },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{icon} {name}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
+    "sway/scratchpad": {
+        "format": "{icon} {count}",
+        "show-empty": false,
+        "format-icons": ["", ""],
+        "tooltip": true,
+        "tooltip-format": "{app}: {title}"
+    },
     "mpd": {
         "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
         "format-disconnected": "Disconnected ",
@@ -66,30 +82,31 @@
     "clock": {
         // "timezone": "America/New_York",
         "tooltip-format": "<big>{:%Y %B %e}</big>\n<tt><small>{calendar}</small></tt>",
-		"format": "{:%H:%M}",
-        "format-alt": "{:%Y-%m-%d %H:%M}"
+        "format": "{:%Y-%m-%d %H:%M}",
+        "format-alt": "{:%H:%M}"
     },
     "cpu": {
-        "format": "{usage}% ",
+        "format": " {usage}%",
         "format-alt": "{usage}%"
     },
     "memory": {
-        "format": "{}% ",
+        "tooltip-format": "Free: {avail}Gi\nUsed: {used}Gi/{total}Gi\nSwap Free: {swapAvail}Gi\nSwap Used: {swapUsed}Gi/{swapTotal}Gi",
+        "format": " {}%",
         "format-alt": "{}%"
     },
     "temperature": {
         // "thermal-zone": 2,
         // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-        "critical-threshold": 75,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""],
-        "format-alt": "{temperatureC}°C"
+        "critical-threshold": 80,
+        // "format-critical": "{icon} {temperatureC}",
+        "format": "{icon} {temperatureC}",
+        "format-icons": ["", "", "", "", "", "", "", "", "", ""],
+        "format-alt": "{temperatureC}"
     },
     "backlight": {
         // "device": "acpi_video1",
-        "format": "{percent}% {icon}",
-        "format-icons": ["", ""]
+        "format": "{icon} {percent}%",
+        "format-icons": ["", ""]
     },
     "battery": {
         "states": {
@@ -97,10 +114,10 @@
             "warning": 30,
             "critical": 15
         },
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-alt": "{time} {icon}",
+        "format": "{icon} {capacity}%",
+        "format-charging": " {capacity}%",
+        "format-plugged": " {capacity}%",
+        "format-alt": "{icon} {time}",
         // "format-good": "", // An empty format will hide the module
         // "format-full": "",
         "format-icons": ["", "", "", "", ""]
@@ -109,26 +126,23 @@
         "bat": "BAT2"
     },
     "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        //"format-wifi": "{essid} ({signalStrength}%) ",
-        //"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
-        //"format-linked": "{ifname} (No IP) ",
-        //"format-disconnected": "Disconnected ⚠",
-        "format-wifi": "{essid} ({signalStrength}%)",
-        "format-ethernet": "{ipaddr}/{cidr}",
-        "format-linked": "{ifname} (No IP)",
-        "format-disconnected": "⚠",
-        "format-alt": "{ipaddr}",
-		"tooltip-format": "{ifname}: {ipaddr}/{cidr}"
+        "format-wifi": " {signalStrength}%",
+        "format-ethernet": " <small>{ipaddr}</small>",
+        "format-linked": " <small>(No IP)</small>",
+        "format-disconnected": "",
+        "format-alt": "<small>{ipaddr}/{cidr}</small> {bandwidthUpBits} {bandwidthDownBits}",
+        "tooltip-format": "Wireless: {essid} ({signalStrength}%)\nInterface: {ifname}\nNetwork: {ipaddr}/{cidr} via {gwaddr}",
+		"on-click-right": "networkmanager_dmenu"
     },
     "pulseaudio": {
         "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon} {format_source}",
-        "format-bluetooth": "{volume}% {icon}  {format_source}",
-        "format-bluetooth-muted": " {icon}  {format_source}",
-        "format-muted": "muted  {format_source}",
-        "format-source": "",
-        "format-source-muted": "",
+		"tooltip-format": "Output: {desc} {volume}\nSource: {source_desc} {source_volume}",
+        "format": "{icon} {volume}% {format_source}",
+        "format-bluetooth": "{icon} {volume}% {format_source}",
+        "format-bluetooth-muted": "{icon}  {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "",
+        "format-source-muted": "",
         "format-icons": {
             "headphone": "",
             "hands-free": "",
@@ -149,7 +163,7 @@
             "default": "🎜"
         },
         "escape": true,
-        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
-        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+		// Script in resources folder
+        "exec": "/usr/bin/python3 $HOME/.config/waybar/mediaplayer.py 2> /dev/null"
     }
 }

.config/yadm/bootstrap

@@ -473,7 +473,7 @@ if $desktopbase && $desktop; then
 
 	case $ID in
 		alpine|fedora) packages_add mako;;
-		debian|ubuntu) packages_add mako-notifier;;
+		debian|ubuntu) packages_add mako-notifier libappindicator3-1 gir1.2-playerctl-2.0;;
 	esac
 
 	case $ID in

.dockerignore

@@ -29,6 +29,7 @@
 !.config/kitty
 .config/kitty/colorscheme.conf
 !.config/mako
+!.config/networkmanager-dmenu
 !.config/nvim
 .config/nvim/*
 !.config/nvim/colors
@@ -42,8 +43,7 @@
 !.config/waybar
 !.config/wofi
 !.config/yabai
-!.config/yadm/*
-.config/yadm/repo.git
+!.config/yadm
 .deno/bin
 .docker/.buildNodeID
 .docker/.token_seed*

.gitignore

@@ -29,6 +29,7 @@
 !.config/kitty
 .config/kitty/colorscheme.conf
 !.config/mako
+!.config/networkmanager-dmenu
 !.config/nvim
 .config/nvim/*
 !.config/nvim/colors
@@ -42,8 +43,7 @@
 !.config/waybar
 !.config/wofi
 !.config/yabai
-!.config/yadm/*
-.config/yadm/repo.git
+!.config/yadm
 .deno/bin
 .docker/.buildNodeID
 .docker/.token_seed*

.local/bin/networkmanager_dmenu

@@ -0,0 +1,927 @@
+#!/usr/bin/env python3
+# encoding:utf8
+
+# Downloaded from https://github.com/firecat53/networkmanager-dmenu
+
+"""NetworkManager command line dmenu script.
+
+To add new connections or enable/disable networking requires policykit
+permissions setup per:
+https://wiki.archlinux.org/index.php/NetworkManager#Set_up_PolicyKit_permissions
+
+OR running the script as root
+
+Add dmenu options and default terminal if desired to
+~/.config/networkmanager-dmenu/config.ini
+
+"""
+import pathlib
+import struct
+import configparser
+import locale
+import os
+from os.path import expanduser
+import shlex
+from shutil import which
+import sys
+from time import sleep
+import uuid
+import subprocess
+
+# pylint: disable=import-error
+import gi
+gi.require_version('NM', '1.0')
+from gi.repository import GLib, NM  # noqa pylint: disable=wrong-import-position
+# pylint: enable=import-error
+
+ENV = os.environ.copy()
+ENV['LC_ALL'] = 'C'
+ENC = locale.getpreferredencoding()
+
+CONF = configparser.ConfigParser()
+CONF.read(expanduser("~/.config/networkmanager-dmenu/config.ini"))
+
+
+def cli_args():
+    """ Don't override dmenu_cmd function arguments with CLI args. Removes -l
+    and -p if those are passed on the command line.
+
+    Exception: if -l is passed and dmenu_command is not defined, assume that the
+    user wants to switch dmenu to the vertical layout and include -l.
+
+        Returns: List of additional CLI arguments
+
+    """
+    args = sys.argv[1:]
+    cmd = CONF.get('dmenu', 'dmenu_command', fallback=False)
+    if "-l" in args or "-p" in args:
+        for nope in ['-l', '-p'] if cmd is not False else ['-p']:
+            try:
+                nope_idx = args.index(nope)
+                del args[nope_idx]
+                del args[nope_idx]
+            except ValueError:
+                pass
+    return args
+
+
+def dmenu_pass(command, color):
+    """Check if dmenu passphrase patch is applied and return the correct command
+    line arg list
+
+    Args: command - string
+          color - obscure color string
+    Returns: list or None
+
+    """
+    if command != 'dmenu':
+        return None
+    try:
+        # Check for dmenu password patch
+        dm_patch = b'P' in subprocess.run(["dmenu", "-h"],
+                                          capture_output=True,
+                                          check=False).stderr
+    except FileNotFoundError:
+        dm_patch = False
+    return ["-P"] if dm_patch else ["-nb", color, "-nf", color]
+
+
+def dmenu_cmd(num_lines, prompt="Networks", active_lines=None):
+    """Parse config.ini for menu options
+
+    Args: args - num_lines: number of lines to display
+                 prompt: prompt to show
+                 active_lines: list of line numbers to tag as active
+    Returns: command invocation (as a list of strings) for example
+                ["dmenu", "-l", "<num_lines>", "-p", "<prompt>", "-i"]
+
+    """
+    # Create command string
+    commands = {"dmenu": ["-p", str(prompt)],
+                "rofi": ["-dmenu", "-p", str(prompt), "-l", str(num_lines)],
+                "bemenu": ["-p", str(prompt)],
+                "wofi": ["-p", str(prompt)]}
+    command = shlex.split(CONF.get('dmenu', 'dmenu_command', fallback="dmenu"))
+    command.extend(cli_args())
+    command.extend(commands.get(command[0], []))
+    # Rofi Highlighting
+    rofi_highlight = CONF.getboolean('dmenu', 'rofi_highlight', fallback=False)
+    if rofi_highlight is True and command[0] == "rofi" and active_lines:
+        command.extend(["-a", ",".join([str(num) for num in active_lines])])
+    # Passphrase prompts
+    obscure = CONF.getboolean('dmenu_passphrase', 'obscure', fallback=False)
+    if prompt == "Passphrase" and obscure is True:
+        obscure_color = CONF.get('dmenu_passphrase', 'obscure_color', fallback='#222222')
+        pass_prompts = {"dmenu": dmenu_pass(command[0], obscure_color),
+                        "rofi": ['-password'],
+                        "bemenu": ['-x'],
+                        "wofi": ['-P']}
+        command.extend(pass_prompts.get(command[0], []))
+    return command
+
+
+def choose_adapter(client):
+    """If there is more than one wifi adapter installed, ask which one to use
+
+    """
+    devices = client.get_devices()
+    devices = [i for i in devices if i.get_device_type() == NM.DeviceType.WIFI]
+    if not devices:
+        return None
+    if len(devices) == 1:
+        return devices[0]
+    device_names = "\n".join([d.get_iface() for d in devices])
+    sel = subprocess.run(dmenu_cmd(len(devices), "CHOOSE ADAPTER:"),
+                         capture_output=True,
+                         check=False,
+                         env=ENV,
+                         input=device_names,
+                         encoding=ENC).stdout
+    if not sel.strip():
+        sys.exit()
+    devices = [i for i in devices if i.get_iface() == sel.strip()]
+    assert len(devices) == 1
+    return devices[0]
+
+
+def is_installed(cmd):
+    """Check if a utility is installed"""
+    return which(cmd) is not None
+
+
+def bluetooth_get_enabled():
+    """Check if bluetooth is enabled via rfkill.
+
+    Returns None if no bluetooth device was found.
+    """
+    # See https://www.kernel.org/doc/Documentation/ABI/stable/sysfs-class-rfkill
+    for path in pathlib.Path('/sys/class/rfkill/').glob('rfkill*'):
+        if (path / 'type').read_text().strip() == 'bluetooth':
+            return (path / 'soft').read_text().strip() == '0'
+    return None
+
+
+def create_other_actions(client):
+    """Return list of other actions that can be taken
+
+    """
+    networking_enabled = client.networking_get_enabled()
+    networking_action = "Disable" if networking_enabled else "Enable"
+
+    wifi_enabled = client.wireless_get_enabled()
+    wifi_action = "Disable" if wifi_enabled else "Enable"
+
+    bluetooth_enabled = bluetooth_get_enabled()
+    bluetooth_action = "Disable" if bluetooth_enabled else "Enable"
+
+    actions = [Action(f"{wifi_action} Wifi", toggle_wifi,
+                      not wifi_enabled),
+               Action(f"{networking_action} Networking",
+                      toggle_networking, not networking_enabled)]
+    if bluetooth_enabled is not None:
+        actions.append(Action(f"{bluetooth_action} Bluetooth",
+                              toggle_bluetooth, not bluetooth_enabled))
+    actions += [Action("Launch Connection Manager", launch_connection_editor),
+                Action("Delete a Connection", delete_connection)]
+    if wifi_enabled:
+        actions.append(Action("Rescan Wifi Networks", rescan_wifi))
+    return actions
+
+
+def rescan_wifi():
+    """
+    Rescan Wifi Access Points
+    """
+    delay = CONF.getint('nmdm', 'rescan_delay', fallback=5)
+    for dev in CLIENT.get_devices():
+        if gi.repository.NM.DeviceWifi == type(dev):
+            try:
+                dev.request_scan_async(None, rescan_cb, None)
+                LOOP.run()
+                sleep(delay)
+                notify("Wifi scan complete")
+                main()
+            except gi.repository.GLib.Error as err:
+                # Too frequent rescan error
+                notify("Wifi rescan failed", urgency="critical")
+                if not err.code == 6:  # pylint: disable=no-member
+                    raise err
+
+
+def rescan_cb(dev, res, data):
+    """Callback for rescan_wifi. Just for notifications
+
+    """
+    if dev.request_scan_finish(res) is True:
+        notify("Wifi scan running...")
+    else:
+        notify("Wifi scan failed", urgency="critical")
+    LOOP.quit()
+
+
+def ssid_to_utf8(nm_ap):
+    """ Convert binary ssid to utf-8 """
+    ssid = nm_ap.get_ssid()
+    if not ssid:
+        return ""
+    ret = NM.utils_ssid_to_utf8(ssid.get_data())
+    return ret
+
+
+def prompt_saved(saved_cons):
+    """Prompt for a saved connection."""
+    actions = create_saved_actions(saved_cons)
+    sel = get_selection(actions)
+    sel()
+
+
+def ap_security(nm_ap):
+    """Parse the security flags to return a string with 'WPA2', etc. """
+    flags = nm_ap.get_flags()
+    wpa_flags = nm_ap.get_wpa_flags()
+    rsn_flags = nm_ap.get_rsn_flags()
+    sec_str = ""
+    if ((flags & getattr(NM, '80211ApFlags').PRIVACY) and
+            (wpa_flags == 0) and (rsn_flags == 0)):
+        sec_str = " WEP"
+    if wpa_flags:
+        sec_str = " WPA1"
+    if rsn_flags & getattr(NM, '80211ApSecurityFlags').KEY_MGMT_PSK:
+        sec_str += " WPA2"
+    if rsn_flags & getattr(NM, '80211ApSecurityFlags').KEY_MGMT_SAE:
+        sec_str += " WPA3"
+    if ((wpa_flags & getattr(NM, '80211ApSecurityFlags').KEY_MGMT_802_1X) or
+            (rsn_flags & getattr(NM, '80211ApSecurityFlags').KEY_MGMT_802_1X)):
+        sec_str += " 802.1X"
+    if ((wpa_flags & getattr(NM, '80211ApSecurityFlags').KEY_MGMT_OWE) or
+            (rsn_flags & getattr(NM, '80211ApSecurityFlags').KEY_MGMT_OWE)):
+        sec_str += " OWE"
+
+    # If there is no security use "--"
+    if sec_str == "":
+        sec_str = "--"
+    return sec_str.lstrip()
+
+
+class Action():  # pylint: disable=too-few-public-methods
+    """Helper class to execute functions from a string variable"""
+    def __init__(self,
+                 name,
+                 func,
+                 args=None,
+                 active=False):
+        self.name = name
+        self.func = func
+        self.is_active = active
+        if args is None:
+            self.args = None
+        elif isinstance(args, list):
+            self.args = args
+        else:
+            self.args = [args]
+
+    def __str__(self):
+        return self.name
+
+    def __call__(self):
+        if self.args is None:
+            self.func()
+        else:
+            self.func(*self.args)
+
+
+def conn_matches_adapter(conn, adapter):
+    """Return True if the connection is applicable for the given adapter.
+
+    There seem to be two ways for a connection specify what interface it belongs
+    to:
+
+    - By setting 'mac-address' in [wifi] to the adapter's MAC
+    - By setting 'interface-name` in [connection] to the adapter's name.
+
+    Depending on how the connection was added, it seems like either
+    'mac-address', 'interface-name' or neither of both is set.
+    """
+    # [wifi] mac-address
+    setting_wireless = conn.get_setting_wireless()
+    mac = setting_wireless.get_mac_address()
+    if mac is not None:
+        return mac == adapter.get_permanent_hw_address()
+
+    # [connection] interface-name
+    setting_connection = conn.get_setting_connection()
+    interface = setting_connection.get_interface_name()
+    if interface is not None:
+        return interface == adapter.get_iface()
+
+    # Neither is set, let's assume this connection is for multiple/all adapters.
+    return True
+
+
+def process_ap(nm_ap, is_active, adapter):
+    """Activate/Deactivate a connection and get password if required"""
+    if is_active:
+        CLIENT.deactivate_connection_async(nm_ap, None, deactivate_cb, nm_ap)
+        LOOP.run()
+    else:
+        conns_cur = [i for i in CONNS if
+                     i.get_setting_wireless() is not None and
+                     conn_matches_adapter(i, adapter)]
+        con = nm_ap.filter_connections(conns_cur)
+        if len(con) > 1:
+            raise ValueError("There are multiple connections possible")
+
+        if len(con) == 1:
+            CLIENT.activate_connection_async(con[0], adapter, nm_ap.get_path(),
+                                             None, activate_cb, nm_ap)
+            LOOP.run()
+        else:
+            if ap_security(nm_ap) != "--":
+                password = get_passphrase()
+            else:
+                password = ""
+            set_new_connection(nm_ap, password, adapter)
+
+
+def activate_cb(dev, res, data):
+    """Notification if activate connection completed successfully
+
+    """
+    try:
+        conn = dev.activate_connection_finish(res)
+    except GLib.Error:
+        conn = None
+    if conn is not None:
+        notify(f"Activated {conn.get_id()}")
+    else:
+        notify(f"Problem activating {data.get_id()}", urgency="critical")
+    LOOP.quit()
+
+
+def deactivate_cb(dev, res, data):
+    """Notification if deactivate connection completed successfully
+
+    """
+    if dev.deactivate_connection_finish(res) is True:
+        notify(f"Deactivated {data.get_id()}")
+    else:
+        notify(f"Problem deactivating {data.get_id()}", urgency="critical")
+    LOOP.quit()
+
+
+def process_vpngsm(con, activate):
+    """Activate/deactive VPN or GSM connections"""
+    if activate:
+        CLIENT.activate_connection_async(con, None, None,
+                                         None, activate_cb, con)
+    else:
+        CLIENT.deactivate_connection_async(con, None, deactivate_cb, con)
+    LOOP.run()
+
+
+def create_ap_actions(aps, active_ap, active_connection, adapter):  # noqa pylint: disable=too-many-locals,line-too-long
+    """For each AP in a list, create the string and its attached function
+    (activate/deactivate)
+
+    """
+    active_ap_bssid = active_ap.get_bssid() if active_ap is not None else ""
+
+    names = [ssid_to_utf8(ap) for ap in aps]
+    max_len_name = max([len(name) for name in names]) if names else 0
+    secs = [ap_security(ap) for ap in aps]
+    max_len_sec = max([len(sec) for sec in secs]) if secs else 0
+
+    ap_actions = []
+
+    for nm_ap, name, sec in zip(aps, names, secs):
+        bars = NM.utils_wifi_strength_bars(nm_ap.get_strength())
+        wifi_chars = CONF.get("dmenu", "wifi_chars", fallback=False)
+        if wifi_chars:
+            bars = "".join([wifi_chars[i] for i, j in enumerate(bars) if j == '*'])
+        is_active = nm_ap.get_bssid() == active_ap_bssid
+        compact = CONF.getboolean("dmenu", "compact", fallback=False)
+        if compact:
+            action_name = f"{name}  {sec}  {bars}"
+        else:
+            action_name = f"{name:<{max_len_name}s}  {sec:<{max_len_sec}s} {bars:>4}"
+        if is_active:
+            ap_actions.append(Action(action_name, process_ap,
+                                     [active_connection, True, adapter],
+                                     active=True))
+        else:
+            ap_actions.append(Action(action_name, process_ap,
+                                     [nm_ap, False, adapter]))
+    return ap_actions
+
+
+def create_vpn_actions(vpns, active):
+    """Create the list of strings to display with associated function
+    (activate/deactivate) for VPN connections.
+
+    """
+    active_vpns = [i for i in active if i.get_vpn()]
+    return _create_vpngsm_actions(vpns, active_vpns, "VPN")
+
+
+def create_wireguard_actions(wgs, active):
+    """Create the list of strings to display with associated function
+    (activate/deactivate) for Wireguard connections.
+
+    """
+    active_wgs = [i for i in active if i.get_connection_type() == "wireguard"]
+    return _create_vpngsm_actions(wgs, active_wgs, "Wireguard")
+
+
+def create_eth_actions(eths, active):
+    """Create the list of strings to display with associated function
+    (activate/deactivate) for Ethernet connections.
+
+    """
+    active_eths = [i for i in active if 'ethernet' in i.get_connection_type()]
+    return _create_vpngsm_actions(eths, active_eths, "Eth")
+
+
+def create_gsm_actions(gsms, active):
+    """Create the list of strings to display with associated function
+    (activate/deactivate) GSM connections."""
+    active_gsms = [i for i in active if
+                   i.get_connection() is not None and
+                   i.get_connection().is_type(NM.SETTING_GSM_SETTING_NAME)]
+    return _create_vpngsm_actions(gsms, active_gsms, "GSM")
+
+
+def create_blue_actions(blues, active):
+    """Create the list of strings to display with associated function
+    (activate/deactivate) Bluetooth connections."""
+    active_blues = [i for i in active if
+                    i.get_connection() is not None and
+                    i.get_connection().is_type(NM.SETTING_BLUETOOTH_SETTING_NAME)]
+    return _create_vpngsm_actions(blues, active_blues, "Bluetooth")
+
+
+def create_saved_actions(saved):
+    """Create the list of strings to display with associated function
+    (activate/deactivate) for VPN connections.
+
+    """
+    return _create_vpngsm_actions(saved, [], "SAVED")
+
+
+def _create_vpngsm_actions(cons, active_cons, label):
+    active_con_ids = [a.get_id() for a in active_cons]
+    actions = []
+    for con in cons:
+        is_active = con.get_id() in active_con_ids
+        action_name = f"{con.get_id()}:{label}"
+        if is_active:
+            active_connection = [a for a in active_cons
+                                 if a.get_id() == con.get_id()]
+            if len(active_connection) != 1:
+                raise ValueError(f"Multiple active connections match {con.get_id()}")
+            active_connection = active_connection[0]
+
+            actions.append(Action(action_name, process_vpngsm,
+                                  [active_connection, False], active=True))
+        else:
+            actions.append(Action(action_name, process_vpngsm,
+                                  [con, True]))
+    return actions
+
+
+def create_wwan_actions(client):
+    """Create WWWAN actions
+
+    """
+    wwan_enabled = client.wwan_get_enabled()
+    wwan_action = "Disable" if wwan_enabled else "Enable"
+    return [Action(f"{wwan_action} WWAN", toggle_wwan, not wwan_enabled)]
+
+
+def combine_actions(eths, aps, vpns, wgs, gsms, blues, wwan, others, saved):
+    # pylint: disable=too-many-arguments
+    """Combine all given actions into a list of actions.
+
+    Args: args - eths: list of Actions
+                 aps: list of Actions
+                 vpns: list of Actions
+                 gsms: list of Actions
+                 blues: list of Actions
+                 wwan: list of Actions
+                 others: list of Actions
+    """
+    compact = CONF.getboolean("dmenu", "compact", fallback=False)
+    empty_action = [Action('', None)] if not compact else []
+    all_actions = []
+    all_actions += eths + empty_action if eths else []
+    all_actions += aps + empty_action if aps else []
+    all_actions += vpns + empty_action if vpns else []
+    all_actions += wgs + empty_action if wgs else []
+    all_actions += gsms + empty_action if (gsms and wwan) else []
+    all_actions += blues + empty_action if blues else []
+    all_actions += wwan + empty_action if wwan else []
+    all_actions += others + empty_action if others else []
+    all_actions += saved + empty_action if saved else []
+    return all_actions
+
+
+def get_selection(all_actions):
+    """Spawn dmenu for selection and execute the associated action."""
+    rofi_highlight = CONF.getboolean('dmenu', 'rofi_highlight', fallback=False)
+    inp = []
+
+    if rofi_highlight is True:
+        inp = [str(action) for action in all_actions]
+    else:
+        inp = [('== ' if action.is_active else '   ') + str(action)
+               for action in all_actions]
+    active_lines = [index for index, action in enumerate(all_actions)
+                    if action.is_active]
+
+    command = dmenu_cmd(len(inp), active_lines=active_lines)
+    sel = subprocess.run(command,
+                         capture_output=True,
+                         check=False,
+                         input="\n".join(inp),
+                         encoding=ENC,
+                         env=ENV).stdout
+
+    if not sel.rstrip():
+        sys.exit()
+
+    if rofi_highlight is False:
+        action = [i for i in all_actions
+                  if ((str(i).strip() == str(sel.strip())
+                       and not i.is_active) or
+                      ('== ' + str(i) == str(sel.rstrip('\n'))
+                       and i.is_active))]
+    else:
+        action = [i for i in all_actions if str(i).strip() == sel.strip()]
+    assert len(action) == 1, f"Selection was ambiguous: '{str(sel.strip())}'"
+    return action[0]
+
+
+def toggle_networking(enable):
+    """Enable/disable networking
+
+    Args: enable - boolean
+
+    """
+    toggle = GLib.Variant.new_tuple(GLib.Variant.new_boolean(enable))
+    try:
+        CLIENT.dbus_call(NM.DBUS_PATH, NM.DBUS_INTERFACE, "Enable", toggle,
+                         None, -1, None, None, None)
+    except AttributeError:
+        # Workaround for older versions of python-gobject
+        CLIENT.networking_set_enabled(enable)
+    notify(f"Networking {'enabled' if enable is True else 'disabled'}")
+
+
+def toggle_wifi(enable):
+    """Enable/disable Wifi
+
+    Args: enable - boolean
+
+    """
+    toggle = GLib.Variant.new_boolean(enable)
+    try:
+        CLIENT.dbus_set_property(NM.DBUS_PATH, NM.DBUS_INTERFACE, "WirelessEnabled", toggle,
+                                 -1, None, None, None)
+    except AttributeError:
+        # Workaround for older versions of python-gobject
+        CLIENT.wireless_set_enabled(enable)
+    notify(f"Wifi {'enabled' if enable is True else 'disabled'}")
+
+
+def toggle_wwan(enable):
+    """Enable/disable WWAN
+
+    Args: enable - boolean
+
+    """
+    toggle = GLib.Variant.new_boolean(enable)
+    try:
+        CLIENT.dbus_set_property(NM.DBUS_PATH, NM.DBUS_INTERFACE, "WwanEnabled", toggle,
+                                 -1, None, None, None)
+    except AttributeError:
+        # Workaround for older versions of python-gobject
+        CLIENT.wwan_set_enabled(enable)
+    notify(f"Wwan {'enabled' if enable is True else 'disabled'}")
+
+
+def toggle_bluetooth(enable):
+    """Enable/disable Bluetooth
+
+    Args: enable - boolean
+
+    References:
+    https://github.com/blueman-project/blueman/blob/master/blueman/plugins/mechanism/RfKill.py
+    https://www.kernel.org/doc/html/latest/driver-api/rfkill.html
+    https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/include/uapi/linux/rfkill.h?h=v5.8.9
+
+    """
+    type_bluetooth = 2
+    op_change_all = 3
+    idx = 0
+    soft_state = 0 if enable else 1
+    hard_state = 0
+
+    data = struct.pack("IBBBB", idx, type_bluetooth, op_change_all,
+                       soft_state, hard_state)
+
+    try:
+        with open('/dev/rfkill', 'r+b', buffering=0) as rff:
+            rff.write(data)
+    except PermissionError:
+        notify("Lacking permission to write to /dev/rfkill.",
+               "Check README for configuration options.",
+               urgency="critical")
+    else:
+        notify(f"Bluetooth {'enabled' if enable else 'disabled'}")
+
+
+def launch_connection_editor():
+    """Launch nmtui or the gui nm-connection-editor
+
+    """
+    terminal = CONF.get("editor", "terminal", fallback="xterm")
+    gui_if_available = CONF.getboolean("editor", "gui_if_available", fallback=True)
+    guis = ["gnome-control-center", "nm-connection-editor"]
+    if gui_if_available is True:
+        for gui in guis:
+            if is_installed(gui):
+                subprocess.run(gui, check=False)
+                return
+    if is_installed("nmtui"):
+        subprocess.run([terminal, "-e", "nmtui"], check=False)
+        return
+    notify("No network connection editor installed", urgency="critical")
+
+
+def get_passphrase():
+    """Get a password
+
+    Returns: string
+
+    """
+    pinentry = CONF.get("dmenu", "pinentry", fallback=None)
+    if pinentry:
+        pin = ""
+        out = subprocess.run(pinentry,
+                             capture_output=True,
+                             check=False,
+                             encoding=ENC,
+                             input='setdesc Get network password\ngetpin\n').stdout
+        if out:
+            res = out.split("\n")[2]
+            if res.startswith("D "):
+                pin = res.split("D ")[1]
+        return pin
+    return subprocess.run(dmenu_cmd(0, "Passphrase"),
+                          stdin=subprocess.DEVNULL,
+                          capture_output=True,
+                          check=False,
+                          encoding=ENC).stdout
+
+
+def delete_connection():
+    """Display list of NM connections and delete the selected one
+
+    """
+    conn_acts = [Action(i.get_id(), i.delete_async, args=[None, delete_cb, None]) for i in CONNS]
+    conn_names = "\n".join([str(i) for i in conn_acts])
+    sel = subprocess.run(dmenu_cmd(len(conn_acts), "CHOOSE CONNECTION TO DELETE:"),
+                         capture_output=True,
+                         check=False,
+                         input=conn_names,
+                         encoding=ENC,
+                         env=ENV).stdout
+    if not sel.strip():
+        sys.exit()
+    action = [i for i in conn_acts if str(i) == sel.rstrip("\n")]
+    assert len(action) == 1, f"Selection was ambiguous: {str(sel)}"
+    action[0]()
+    LOOP.run()
+
+
+def delete_cb(dev, res, data):
+    """Notification if delete completed successfully
+
+    """
+    if dev.delete_finish(res) is True:
+        notify(f"Deleted {dev.get_id()}")
+    else:
+        notify(f"Problem deleting {dev.get_id()}", urgency="critical")
+    LOOP.quit()
+
+
+def set_new_connection(nm_ap, nm_pw, adapter):
+    """Setup a new NetworkManager connection
+
+    Args: ap - NM.AccessPoint
+          pw - string
+
+    """
+    nm_pw = str(nm_pw).strip()
+    profile = create_wifi_profile(nm_ap, nm_pw, adapter)
+    CLIENT.add_and_activate_connection_async(profile, adapter, nm_ap.get_path(),
+                                             None, verify_conn, profile)
+    LOOP.run()
+
+
+def create_wifi_profile(nm_ap, password, adapter):
+    # pylint: disable=line-too-long
+    # noqa From https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/examples/python/gi/add_connection.py
+    # noqa and https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/examples/python/dbus/add-wifi-psk-connection.py
+    # pylint: enable=line-too-long
+    """Create the NM profile given the AP and passphrase"""
+    ap_sec = ap_security(nm_ap)
+    profile = NM.SimpleConnection.new()
+
+    s_con = NM.SettingConnection.new()
+    s_con.set_property(NM.SETTING_CONNECTION_ID, ssid_to_utf8(nm_ap))
+    s_con.set_property(NM.SETTING_CONNECTION_UUID, str(uuid.uuid4()))
+    s_con.set_property(NM.SETTING_CONNECTION_TYPE, "802-11-wireless")
+    profile.add_setting(s_con)
+
+    s_wifi = NM.SettingWireless.new()
+    s_wifi.set_property(NM.SETTING_WIRELESS_SSID, nm_ap.get_ssid())
+    s_wifi.set_property(NM.SETTING_WIRELESS_MODE, 'infrastructure')
+    s_wifi.set_property(NM.SETTING_WIRELESS_MAC_ADDRESS, adapter.get_permanent_hw_address())
+    profile.add_setting(s_wifi)
+
+    s_ip4 = NM.SettingIP4Config.new()
+    s_ip4.set_property(NM.SETTING_IP_CONFIG_METHOD, "auto")
+    profile.add_setting(s_ip4)
+
+    s_ip6 = NM.SettingIP6Config.new()
+    s_ip6.set_property(NM.SETTING_IP_CONFIG_METHOD, "auto")
+    profile.add_setting(s_ip6)
+
+    if ap_sec != "--":
+        s_wifi_sec = NM.SettingWirelessSecurity.new()
+        if "WPA" in ap_sec:
+            if "WPA3" in ap_sec:
+                s_wifi_sec.set_property(NM.SETTING_WIRELESS_SECURITY_KEY_MGMT,
+                                        "sae")
+            else:
+                s_wifi_sec.set_property(NM.SETTING_WIRELESS_SECURITY_KEY_MGMT,
+                                        "wpa-psk")
+            s_wifi_sec.set_property(NM.SETTING_WIRELESS_SECURITY_AUTH_ALG,
+                                    "open")
+            s_wifi_sec.set_property(NM.SETTING_WIRELESS_SECURITY_PSK, password)
+        elif "WEP" in ap_sec:
+            s_wifi_sec.set_property(NM.SETTING_WIRELESS_SECURITY_KEY_MGMT,
+                                    "None")
+            s_wifi_sec.set_property(NM.SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE,
+                                    NM.WepKeyType.PASSPHRASE)
+            s_wifi_sec.set_wep_key(0, password)
+        profile.add_setting(s_wifi_sec)
+
+    return profile
+
+
+def verify_conn(client, result, data):
+    """Callback function for add_and_activate_connection_async
+
+    Check if connection completes successfully. Delete the connection if there
+    is an error.
+
+    """
+    try:
+        act_conn = client.add_and_activate_connection_finish(result)
+        conn = act_conn.get_connection()
+        if not all([conn.verify(),
+                    conn.verify_secrets(),
+                    data.verify(),
+                    data.verify_secrets()]):
+            raise GLib.Error
+        notify(f"Added {conn.get_id()}")
+    except GLib.Error:
+        try:
+            notify(f"Connection to {conn.get_id()} failed",
+                   urgency="critical")
+            conn.delete_async(None, None, None)
+        except UnboundLocalError:
+            pass
+    finally:
+        LOOP.quit()
+
+
+def create_ap_list(adapter, active_connections):
+    """Generate list of access points. Remove duplicate APs , keeping strongest
+    ones and the active AP
+
+    Args: adapter
+          active_connections - list of all active connections
+    Returns: aps - list of access points
+             active_ap - active AP
+             active_ap_con - active Connection
+             adapter
+
+    """
+    aps = []
+    ap_names = []
+    active_ap = adapter.get_active_access_point()
+    aps_all = sorted(adapter.get_access_points(),
+                     key=lambda a: a.get_strength(), reverse=True)
+    conns_cur = [i for i in CONNS if
+                 i.get_setting_wireless() is not None and
+                 conn_matches_adapter(i, adapter)]
+    try:
+        ap_conns = active_ap.filter_connections(conns_cur)
+        active_ap_name = ssid_to_utf8(active_ap)
+        active_ap_con = [active_conn for active_conn in active_connections
+                         if active_conn.get_connection() in ap_conns]
+    except AttributeError:
+        active_ap_name = None
+        active_ap_con = []
+    if len(active_ap_con) > 1:
+        raise ValueError("Multiple connection profiles match"
+                         " the wireless AP")
+    active_ap_con = active_ap_con[0] if active_ap_con else None
+    for nm_ap in aps_all:
+        ap_name = ssid_to_utf8(nm_ap)
+        if nm_ap != active_ap and ap_name == active_ap_name:
+            # Skip adding AP if it's not active but same name as active AP
+            continue
+        if ap_name not in ap_names:
+            ap_names.append(ap_name)
+            aps.append(nm_ap)
+    return aps, active_ap, active_ap_con, adapter
+
+
+def notify(message, details=None, urgency="low"):
+    """Use notify-send if available for notifications
+
+    """
+    delay = CONF.getint('nmdm', 'rescan_delay', fallback=5)
+    args = ["-u", urgency, "-a", "networkmanager-dmenu",
+            "-t", str(delay * 1000), message]
+    if details is not None:
+        args.append(details)
+    if is_installed("notify-send"):
+        subprocess.run(["notify-send"] + args, check=False)
+
+
+def run():  # pylint: disable=too-many-locals
+    """Main script entrypoint"""
+    active = CLIENT.get_active_connections()
+    adapter = choose_adapter(CLIENT)
+    if adapter:
+        ap_actions = create_ap_actions(*create_ap_list(adapter, active))
+    else:
+        ap_actions = []
+
+    vpns = [i for i in CONNS if i.is_type(NM.SETTING_VPN_SETTING_NAME)]
+    try:
+        wgs = [i for i in CONNS if i.is_type(NM.SETTING_WIREGUARD_SETTING_NAME)]
+    except AttributeError:
+        # Workaround for older versions of python-gobject with no wireguard support
+        wgs = []
+    eths = [i for i in CONNS if i.is_type(NM.SETTING_WIRED_SETTING_NAME)]
+    blues = [i for i in CONNS if i.is_type(NM.SETTING_BLUETOOTH_SETTING_NAME)]
+
+    vpn_actions = create_vpn_actions(vpns, active)
+    wg_actions = create_wireguard_actions(wgs, active)
+    eth_actions = create_eth_actions(eths, active)
+    blue_actions = create_blue_actions(blues, active)
+    other_actions = create_other_actions(CLIENT)
+    wwan_installed = is_installed("ModemManager")
+    if wwan_installed:
+        gsms = [i for i in CONNS if i.is_type(NM.SETTING_GSM_SETTING_NAME)]
+        gsm_actions = create_gsm_actions(gsms, active)
+        wwan_actions = create_wwan_actions(CLIENT)
+    else:
+        gsm_actions = []
+        wwan_actions = []
+
+    list_saved = CONF.getboolean('dmenu', 'list_saved', fallback=False)
+    saved_cons = [i for i in CONNS if i not in vpns + wgs + eths + blues]
+    if list_saved:
+        saved_actions = create_saved_actions(saved_cons)
+    else:
+        saved_actions = [Action("Saved connections", prompt_saved, [saved_cons])]
+
+    actions = combine_actions(eth_actions, ap_actions, vpn_actions, wg_actions,
+                              gsm_actions, blue_actions, wwan_actions,
+                              other_actions, saved_actions)
+    sel = get_selection(actions)
+    sel()
+
+
+def main():
+    """Main. Enables script to be re-run after a wifi rescan
+
+    """
+    global CLIENT, CONNS, LOOP  # noqa pylint: disable=global-variable-undefined
+    CLIENT = NM.Client.new(None)
+    LOOP = GLib.MainLoop()
+    CONNS = CLIENT.get_connections()
+
+    run()
+
+
+if __name__ == '__main__':
+    main()
+
+# vim: set et ts=4 sw=4 :

.zshrc

@@ -536,7 +536,7 @@ function theme {
 			iterm_profile=Light
 			kitty_theme=${kitty_variation}light
 			export LIGHT=true
-			echo "LIGHT=true" > ~/.zshrc-theme
+			echo "export LIGHT=true" > ~/.zshrc-theme
 			gnome_theme=Adwaita
 			macos_theme=false
 		;;
@@ -544,7 +544,7 @@ function theme {
 			iterm_profile=Default
 			kitty_theme=${kitty_variation}dark
 			export LIGHT=false
-			echo "LIGHT=false" > ~/.zshrc-theme
+			echo "export LIGHT=false" > ~/.zshrc-theme
 			gnome_theme=Adwaita-dark
 			macos_theme=true
 		;;