From 3756444021d8a1354136b653fecd5061b9c1d732 Mon Sep 17 00:00:00 2001
From: Paul Wilde <paul@wilde.cloud>
Date: Wed, 20 Jul 2022 09:18:57 +0100
Subject: [PATCH] readme changes, added passwurrd to readme

---
 README.MD                             | 24 +++++++++++-------------
 i3_wurrkspaces/src/i3_wurrkspaces.nim | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/README.MD b/README.MD
index 7ddfc47..7ff96df 100755
--- a/README.MD
+++ b/README.MD
@@ -5,25 +5,23 @@ about system status in dmenu. Some of them i.e. `volurrme` have options (up, dow
 which are selectable options in dmenu.  
 
 ## Tools
-- `pingclurrk`        performs a single `ping` to a server and returns the response time
-- `batturry`          shows the current battery level
-- `brightnurrs`       shows the current backlight level and gives options to adjust it
+- `pingclurrk`         performs a single `ping` to a server and returns the response time
+- `batturry`           shows the current battery level
+- `brightnurrs`        shows the current backlight level and gives options to adjust it
 - `volurrme`           shows the current volume level and gives options to adjust and manage it
-- `calendurr`        shows the date
-- `furrytime`        shows the fuzzytime clock
-- `wirelurrs`             shows the state of the wireless network interface. SSID connected to and signal level.
-- `netwurrk`              shows the status and/or the ip address of the network interface card
-- `temperaturr`      shows the current CPU temperature
+- `calendurr`          shows the date
+- `furrytime`          shows the fuzzytime clock
+- `wirelurrs`          shows the state of the wireless network interface. SSID connected to and signal level.
+- `netwurrk`           shows the status and/or the ip address of the network interface card
+- `temperaturr`        shows the current CPU temperature
 - `noteurr`            a simple one liner note taking tool, displaying notes in `dmenu`/`rofi`  
 - `calculaturr`        a calculator, utilising `qalculate` - inspired by [@fedops](https://codeberg.org/fedops/scripts)
 - `emurrji`            an emoji picker
-- `remmina_choosurr`          reads the files in your remmina config directory and allows you to connect to and edit them
+- `remmina_choosurr`   reads the files in your remmina config directory and allows you to connect to and edit them
 - `translaturr`        utilises libretranslate (you'll need and API key or your own instance) to translate test. Prefix the text with `en>de`, `de>en`, `en>fr`, etc. as you need. Must be compiled with `-d:ssl`
 - `clipurr`            clipboard manager
-
-The next two do not work with `rofi` unless you have `alias dmenu=rofi` set, but they're pretty nice tools  
-
-- `cmd_wrappurr`  inspired by passmenu_wrapper, a basic tool to run other `dmenu` related tools with uniform styling. 
+- `passwuurd`          a passmenu clone, that works in rofi too
+- `cmd_wrappurr`  a basic tool to run other `dmenu` related tools with uniform styling. 
   - For example: `dmenu_run`, `clipmenu`, `passmenu` etc.
 
 ### Why do all the tools have "urr" in them?
diff --git a/i3_wurrkspaces/src/i3_wurrkspaces.nim b/i3_wurrkspaces/src/i3_wurrkspaces.nim
index 9da8c46..35368d4 100644
--- a/i3_wurrkspaces/src/i3_wurrkspaces.nim
+++ b/i3_wurrkspaces/src/i3_wurrkspaces.nim
@@ -2,7 +2,11 @@ import ../../globurrl
 import std/[osproc,json,strutils]
 
 const I3_WORKSPACES = "i3-msg -t get_workspaces"
+const SWAY_WORKSPACES = "swaymsg -t get_workspaces"
+let WORKSPACES = if wayland: SWAY_WORKSPACES else: I3_WORKSPACES
 const I3_TREE = "i3-msg -t get_tree"
+const SWAY_TREE = "swaymsg -t get_tree"
+let TREE = if wayland: SWAY_TREE else: I3_TREE
 const VISIBLE = "#"
 const URGENT = "!"
 const FOCUSED = "%"
@@ -64,8 +68,12 @@ proc switchWorkspace(workspace: string) =
   let ws = findWorkspace(workspace)
   if ws.num == current_workspace:
     return
-  let cmd = "i3-msg workspace " & $ws.num
-  discard execCmd(cmd)
+  if wayland:
+    let cmd = "swaymsg workspace " & $ws.num
+    discard execCmd(cmd)
+  else:
+    let cmd = "i3-msg workspace " & $ws.num
+    discard execCmd(cmd)
   showWorkspaces()
 
 # proc getApplications(node: JsonNode): (seq[string],bool) =
@@ -159,14 +167,14 @@ proc findWorkspacesTree(node: JsonNode, parent: Workspace = Workspace()) =
   return
 
 proc getTree() =
-  let cur_workspaces = execCmdEx(I3_TREE)
+  let cur_workspaces = execCmdEx(TREE)
   if cur_workspaces.output != "":
     let root = parseJson(cur_workspaces.output)
     findWorkspacesTree(root)
   return 
 
 proc getWorkspaces(): seq[Workspace] =
-  let cur_workspaces = execCmdEx(I3_WORKSPACES)
+  let cur_workspaces = execCmdEx(WORKSPACES)
   if cur_workspaces.output != "":
     let ws = parseJson(cur_workspaces.output)
     for w in ws: