bin/xmobar.hs

@@ -14,7 +14,6 @@ import Data.Internal.XIO
 import GHC.Enum (enumFrom)
 import Options.Applicative
 import RIO hiding (hFlush)
-import RIO.FilePath
 import RIO.List
 import qualified RIO.NonEmpty as NE
 import qualified RIO.Text as T
@@ -164,7 +163,7 @@ config bf ifs ios br confDir =
     , pickBroadest = False
     , persistent = True
     , -- store the icons with the xmonad/xmobar stack project
-      iconRoot = confDir </> "assets" </> "icons"
+      iconRoot = confDir ++ "/icons"
     , commands = csRunnable <$> concatRegions br
     }
 

bin/xmonad.hs

@@ -832,9 +832,8 @@ externalBindings runIO cleanup db =
       , -- M-<F1> reserved for showing the keymap
         KeyBinding "M-<F2>" "restart xmonad" restartf
       , KeyBinding "M-<F3>" "recompile xmonad" recompilef
-      , KeyBinding "M-<F7>" "select autorandr profile" $ Left $ toX runAutorandrMenu
+      , KeyBinding "M-<F8>" "select autorandr profile" $ Left $ toX runAutorandrMenu
-      , KeyBinding "M-<F8>" "toggle wifi" $ Left $ toX runToggleWifi
+      , KeyBinding "M-<F9>" "toggle ethernet" $ Left $ toX runToggleEthernet
-      , KeyBinding "M-<F9>" "toggle network" $ Left $ toX runToggleNetworking
       , KeyBinding "M-<F10>" "toggle bluetooth" $ Left $ toX $ runToggleBluetooth sys
       , KeyBinding "M-<F11>" "toggle screensaver" $ Left $ toX $ callToggle ses
       , KeyBinding "M-<F12>" "switch gpu" $ Left runOptimusPrompt

lib/Data/Internal/XIO.hs

@@ -468,8 +468,6 @@ data XPFeatures = XPFeatures
   , xpfIntelBacklight :: Bool
   , xpfClevoBacklight :: Bool
   , xpfBattery :: Bool
-  , xpfEthPrefix :: Maybe Text
-  , xpfWifiPrefix :: Maybe Text
   }
 
 instance FromJSON XPFeatures where
@@ -495,10 +493,6 @@ instance FromJSON XPFeatures where
       .:+ "clevo_backlight"
       <*> o
       .:+ "battery"
-      <*> o
-      .:? "ethPrefix"
-      <*> o
-      .:? "wifiPrefix"
 
 defParams :: XParams
 defParams =
@@ -521,8 +515,6 @@ defXPFeatures =
     , xpfIntelBacklight = False
     , xpfClevoBacklight = False
     , xpfBattery = False
-    , xpfEthPrefix = Nothing
-    , xpfWifiPrefix = Nothing
     }
 
 type XPQuery = XPFeatures -> Bool
@@ -833,16 +825,16 @@ testFont fam = maybe pass (Left . (: [])) <$> shellTest "fc-list" args msg
 -- start with "en" and wireless interfaces always start with "wl"
 
 readEthernet :: IODependency T.Text
-readEthernet = readInterface "get ethernet interface" (fromMaybe "en" . xpfEthPrefix)
+readEthernet = readInterface "get ethernet interface" isEthernet
 
 readWireless :: IODependency T.Text
-readWireless = readInterface "get wireless interface" (fromMaybe "wl" . xpfWifiPrefix)
+readWireless = readInterface "get wireless interface" isWireless
 
--- isWireless :: T.Text -> Bool
+isWireless :: T.Text -> Bool
--- isWireless = T.isPrefixOf "wl"
+isWireless = T.isPrefixOf "wl"
 
--- isEthernet :: T.Text -> Bool
+isEthernet :: T.Text -> Bool
--- isEthernet = T.isPrefixOf "en"
+isEthernet = T.isPrefixOf "en"
 
 listInterfaces :: MonadUnliftIO m => m [T.Text]
 listInterfaces =
@@ -854,12 +846,11 @@ sysfsNet = "/sys/class/net"
 
 -- ASSUME there are no (non-base) packages required to make these interfaces
 -- work (all at the kernel level)
-readInterface :: T.Text -> (XPFeatures -> Text) -> IODependency T.Text
+readInterface :: T.Text -> (T.Text -> Bool) -> IODependency T.Text
 readInterface n f = IORead n [] go
   where
-    go = do
+    go = io $ do
-      p <- asks (f . xpFeatures . xParams)
+      ns <- filter f <$> listInterfaces
-      ns <- filter (T.isPrefixOf p) <$> listInterfaces
       case ns of
         [] -> return $ Left [Msg LevelError "no interfaces found"]
         (x : xs) -> do

lib/XMonad/Internal/Command/Desktop.hs

@@ -19,8 +19,7 @@ module XMonad.Internal.Command.Desktop
   , runVolumeUp
   , runVolumeMute
   , runToggleBluetooth
-  , runToggleNetworking
+  , runToggleEthernet
-  , runToggleWifi
   , runRestart
   , runRecompile
   , runAreaCapture
@@ -59,13 +58,13 @@ import XMonad.Operations
 -- My Executables
 
 myTerm :: FilePath
-myTerm = "alacritty"
+myTerm = "urxvt"
 
 myCalc :: FilePath
 myCalc = "bc"
 
 myBrowser :: FilePath
-myBrowser = "firefox"
+myBrowser = "brave"
 
 myEditor :: FilePath
 myEditor = "emacsclient"
@@ -93,7 +92,8 @@ myNotificationCtrl = "dunstctl"
 
 myTermPkgs :: [Fulfillment]
 myTermPkgs =
-  [ Package Official "alacritty"
+  [ Package Official "rxvt-unicode"
+  , Package Official "urxvt-perls"
   ]
 
 myEditorPkgs :: [Fulfillment]
@@ -108,9 +108,6 @@ bluetoothPkgs = [Package Official "bluez-utils"]
 networkManagerPkgs :: [Fulfillment]
 networkManagerPkgs = [Package Official "networkmanager"]
 
-nmcli :: IODependency_
-nmcli = sysExe networkManagerPkgs "nmcli"
-
 --------------------------------------------------------------------------------
 -- Misc constants
 
@@ -121,7 +118,7 @@ volumeChangeSound = "smb_fireball.wav"
 -- Some nice apps
 
 runTerm :: MonadUnliftIO m => Sometimes (m ())
-runTerm = sometimesExe "terminal" "alacritty" myTermPkgs True myTerm
+runTerm = sometimesExe "terminal" "urxvt" myTermPkgs True myTerm
 
 runTMux :: MonadUnliftIO m => Sometimes (m ())
 runTMux = sometimesIO_ "terminal multiplexer" "tmux" deps act
@@ -209,7 +206,7 @@ runStopPlay = runMultimediaIfInstalled "stop playback" "stop"
 -- Volume Commands
 
 soundDir :: FilePath
-soundDir = "assets" </> "sound"
+soundDir = "sound"
 
 playSound :: MonadIO m => FilePath -> m ()
 playSound file = do
@@ -279,12 +276,12 @@ runNotificationContext =
 --------------------------------------------------------------------------------
 -- System commands
 
--- needed to lookup/prompt for passwords/keys for wifi connections and some VPNs
+-- this is required for some vpn's to work properly with network-manager
 runNetAppDaemon :: Maybe NamedSysConnection -> Sometimes (XIO (P.Process () () ()))
 runNetAppDaemon cl =
   Sometimes
     "network applet"
-    (\x -> xpfVPN x || xpfWireless x)
+    xpfVPN
     [Subfeature (DBusRoot_ cmd tree cl) "NM-applet"]
   where
     tree = toAnd_ app $ Bus networkManagerPkgs networkManagerBus
@@ -308,35 +305,27 @@ runToggleBluetooth cl =
           #!>> fmtCmd myBluetooth ["power", "$a", ">", "/dev/null"]
           #!&& fmtNotifyCmd defNoteInfo {body = Just $ Text "bluetooth powered $a"}
 
-runToggleNetworking :: MonadUnliftIO m => Sometimes (m ())
+runToggleEthernet :: MonadUnliftIO m => Sometimes (m ())
-runToggleNetworking =
+runToggleEthernet =
   Sometimes
-    "network toggle"
+    "ethernet toggle"
-    (\x -> xpfEthernet x || xpfWireless x)
+    xpfEthernet
     [Subfeature root "nmcli"]
   where
-    root = IORoot_ cmd $ Only_ nmcli
+    root =
-    cmd =
+      IORoot cmd $
+        And1 (Only readEthernet) $
+          Only_ $
+            sysExe networkManagerPkgs "nmcli"
+    -- TODO make this less noisy
+    cmd iface =
       S.spawn $
-        fmtCmd "nmcli" ["networking"]
+        fmtCmd "nmcli" ["-g", "GENERAL.STATE", "device", "show", iface]
-          #!| "grep -q enabled"
+          #!| "grep -q disconnected"
-          #!&& "a=off"
+          #!&& "a=connect"
-          #!|| "a=on"
+          #!|| "a=disconnect"
-          #!>> fmtCmd "nmcli" ["networking", "$a"]
+          #!>> fmtCmd "nmcli" ["device", "$a", iface]
-          #!&& fmtNotifyCmd defNoteInfo {body = Just $ Text "networking switched $a"}
+          #!&& fmtNotifyCmd defNoteInfo {body = Just $ Text "ethernet \"$a\"ed"}
-
-runToggleWifi :: MonadUnliftIO m => Sometimes (m ())
-runToggleWifi = Sometimes "wifi toggle" xpfWireless [Subfeature root "nmcli"]
-  where
-    root = IORoot_ cmd $ Only_ nmcli
-    cmd =
-      S.spawn $
-        fmtCmd "nmcli" ["radio", "wifi"]
-          #!| "grep -q enabled"
-          #!&& "a=off"
-          #!|| "a=on"
-          #!>> fmtCmd "nmcli" ["radio", "wifi", "$a"]
-          #!&& fmtNotifyCmd defNoteInfo {body = Just $ Text "wifi switched $a"}
 
 --------------------------------------------------------------------------------
 -- Configuration commands

lib/Xmobar/Plugins/Common.hs

@@ -110,18 +110,14 @@ withDBusClientConnection cb n logfile f =
       logOpts <- setLogVerboseFormat True . setLogUseTime True <$> logOptionsHandle h False
       withLogFunc logOpts $ \lf -> do
         env <- mkSimpleApp lf Nothing
-        runRIO env $ displayMaybe' cb f =<< getDBusClient n
+        runRIO env $
+          bracket (getDBusClient n) (mapM (liftIO . disconnect . ncClient)) $
+            displayMaybe' cb f
 
--- | Run a plugin action with a new DBus client and logfile path. This is
+-- | Run a plugin action with a new DBus client and logfile path.
--- necessary for DBus callbacks which run in separate threads, which will
+-- This is necessary for DBus callbacks which run in separate threads, which
--- usually fire when the parent thread already exited and killed off its DBus
+-- will usually fire when the parent thread already exited and killed off its
--- connection and closed its logfile. NOTE: unlike 'withDBusClientConnection'
+-- DBus connection and closed its logfile.
--- this function will open and new logfile and client connection and close both
--- on completion. 'withDBusClientConnection' will only close the log file but
--- keep the client connection active upon termination; this client will only be
--- killed when the entire process is killed. This distinction is important
--- because callbacks only need ephemeral connections, while listeners (started
--- with 'withDBusClientConnection') need long-lasting connections.
 withNestedDBusClientConnection
   :: (MonadUnliftIO m, SafeClient c, MonadReader (PluginEnv s c) m)
   => Maybe BusName
@@ -132,9 +128,4 @@ withNestedDBusClientConnection n logfile f = do
   dpy <- asks plugDisplay
   s <- asks plugState
   cb <- asks plugCallback
-  let run h = do
+  withDBusClientConnection cb n logfile $ \c -> mapRIO (PluginEnv c s dpy cb) f
-        logOpts <- setLogVerboseFormat True . setLogUseTime True <$> logOptionsHandle h False
-        withLogFunc logOpts $ \lf -> do
-          env <- mkSimpleApp lf Nothing
-          runRIO env $ withDBusClient_ n $ \cl -> mapRIO (PluginEnv cl s dpy cb) f
-  maybe (run stderr) (`withLogFile` run) logfile

package.yaml

@@ -9,10 +9,9 @@ extra-source-files:
 - README.md
 - fourmolu.yaml
 - make_pkgs
-- runtime_pkgs
+- icons/*
-- assets/icons/*
-- assets/sound/*
 - scripts/*
+- sound/*
 
 default-extensions:
   - OverloadedStrings

scripts/screencap

@@ -1,22 +0,0 @@
-#! /bin/bash
-
-## capture a screenshot using scrot
-
-SS_DIR="$XDG_CACHE_HOME/screenshots"
-
-while getopts ":sw" opt; do
-	case ${opt} in
-		s)
-			scrot "$SS_DIR/desktop/%Y-%m-%d-%H:%M:%S_desktop.png"
-			notify-send "Screen captured"
-			;;
-		w)
-			scrot -u "$SS_DIR/window/%Y-%m-%d-%H:%M:%S-\$wx\$h.png"
-			notify-send "Window captured"
-			;;
-		\?)
-			echo "invalid option, read the code"
-			;;
-	esac
-done
-

scripts/screenlock

@@ -1,61 +0,0 @@
-#! /bin/bash
-
-## lock the screen using i3lock (and maybe suspend)
-
-## usage: screenlock [SUSPEND]
-
-# WORKAROUND make the date show up in the right place on 2+ monitor setups
-# I want it to only show up on the primary screen, so use xrandr to get the
-# dimensions and position of the primary monitor and calculate the date position
-# from that
-geometry=$(xrandr | sed -n 's/^.*primary \([0-9]*\)x[0-9]*+\([0-9]\)*+[0-9]* .*/\1 \2/p')
-width=$(echo "$geometry" | cut -f1 -d" ")
-xpos=$(echo "$geometry" | cut -f2 -d" ")
-xoffset=$(("$xpos" + "$width" / 2))
-datepos="$xoffset:600"
-
-# lock and fork so we can suspend with the screen locked
-i3lock --color=000000 \
-       --pass-media-keys \
-       --nofork \
-       --ignore-empty-password \
-       --screen=0 \
-       --indicator \
-       --inside-color=00000055 \
-       --insidever-color=00000055 \
-       --insidewrong-color=00000055 \
-       --ring-color=555555ff \
-       --ringwrong-color=ff3333ff \
-       --ringver-color=99ceffff \
-       --keyhl-color=99ceffff \
-       --bshl-color=9523ffff \
-       --line-color=00000000 \
-       --separator-color=00000000 \
-       --clock \
-       --verif-color=99ceffff \
-       --wrong-color=ff8282ff \
-       --time-color=ffffffff \
-       --time-size=72 \
-       --time-str="%H:%M" \
-       --date-color=ffffffff \
-       --date-size=42 \
-       --date-str="%b %d, %Y" \
-       --date-align 0 \
-       --date-pos="$datepos" \
-       --wrong-size=72 \
-       --verif-size=72 \
-       --radius=300 \
-       --ring-width=25 &
-
-# suspend if we want, and if this machine is currently using a battery
-batpath=/sys/class/power_supply/BAT0/status
-
-if [ -f "$batpath" ] && \
-       [ "$(cat $batpath)" == "Discharging" ] && \
-       [ "$1" == "true" ]; then
-    systemctl suspend
-fi
-
-# block until the screen is unlocked (since xss-lock expects the locker to exit
-# only when unlocked)
-wait