diff --git a/README.MD b/README.MD index a70dbc1..48f584d 100755 --- a/README.MD +++ b/README.MD @@ -26,11 +26,16 @@ The next two do not work with `rofi` unless you have `alias dmenu=rofi` set, but - `cmd_wrappurr` inspired by passmenu_wrapper, 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? +This is something I was inspired to do after writing `clipurr`… "purr", like a cat... see? +So I thought I'd rename everything else to conform to this amazing naming convention… cool eh‽ + + ### Example in `dmenu`: ![dmenu_tools](https://user-images.githubusercontent.com/31094984/167123173-ee8092a2-d5ab-47b4-b207-ced328072cc0.gif) -### Example of `command_wrapper` with `clipmenu` +### Example of `cmd_wrappurr` with `clipmenu` ![command_wrap](https://user-images.githubusercontent.com/31094984/167122436-eea0be88-a929-46e8-9b4d-cb677dcb129c.gif) diff --git a/batturry/batturry.nimble b/batturry/batturry.nimble index d48f910..ab08cdb 100644 --- a/batturry/batturry.nimble +++ b/batturry/batturry.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Shows battery percentage using dmenu" license = "MIT" srcDir = "src" -bin = @["battery"] +bin = @["batturry"] # Dependencies diff --git a/brightnurrs/brightnurrs.nimble b/brightnurrs/brightnurrs.nimble index 3698d8c..383c086 100644 --- a/brightnurrs/brightnurrs.nimble +++ b/brightnurrs/brightnurrs.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Shows and controls laptop brightness" license = "MIT" srcDir = "src" -bin = @["brightness"] +bin = @["brightnurrs"] # Dependencies diff --git a/calculaturr/calculaturr.nimble b/calculaturr/calculaturr.nimble index c8075e9..638d262 100644 --- a/calculaturr/calculaturr.nimble +++ b/calculaturr/calculaturr.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "A simple dmenu calculator" license = "MIT" srcDir = "src" -bin = @["calculate"] +bin = @["calculaturr"] # Dependencies diff --git a/calendurr/calendurr.nimble b/calendurr/calendurr.nimble index f48c806..ce853ed 100644 --- a/calendurr/calendurr.nimble +++ b/calendurr/calendurr.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Displays the date in dmenu" license = "MIT" srcDir = "src" -bin = @["show_date"] +bin = @["calendurr"] # Dependencies diff --git a/cmd_wrappurr/cmd_wrappurr.nimble b/cmd_wrappurr/cmd_wrappurr.nimble index 0e711eb..1ee8a92 100644 --- a/cmd_wrappurr/cmd_wrappurr.nimble +++ b/cmd_wrappurr/cmd_wrappurr.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "A Command wrapper thing - i.e. run clipmenu/passmenu into dmenu with styling, sucks really" license = "MIT" srcDir = "src" -bin = @["command_wrapper"] +bin = @["cmd_wrappurr"] # Dependencies diff --git a/cmd_wrappurr/src/cmd_wrappurr.nim b/cmd_wrappurr/src/cmd_wrappurr.nim index 95334c3..15855c1 100644 --- a/cmd_wrappurr/src/cmd_wrappurr.nim +++ b/cmd_wrappurr/src/cmd_wrappurr.nim @@ -9,7 +9,7 @@ proc main() = return if isMainModule: - base.command_wrapper = true + globurrl.wrappurr = true for idx, arg in args: case arg: of "-r", "--run": diff --git a/emurrji/emurrji.nimble b/emurrji/emurrji.nimble index 6a79d40..a77390a 100644 --- a/emurrji/emurrji.nimble +++ b/emurrji/emurrji.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "An emoji picker for dmenu/rofi" license = "MIT" srcDir = "src" -bin = @["emoji"] +bin = @["emurrji"] # Dependencies diff --git a/furrytime/furrytime.nimble b/furrytime/furrytime.nimble index 3647fea..19e9556 100644 --- a/furrytime/furrytime.nimble +++ b/furrytime/furrytime.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Displays the fuzzy time in dmenu" license = "MIT" srcDir = "src" -bin = @["fuzzytime"] +bin = @["furrytime"] # Dependencies diff --git a/globurrl.nim b/globurrl.nim index bd3eaac..0b43702 100644 --- a/globurrl.nim +++ b/globurrl.nim @@ -63,8 +63,7 @@ const WL_ROFI = "wofi --dmenu" var loop* = false var stoploop* = true var tool* = "dmenu" -var passmenu* = false -var command_wrapper* = false +var wrappurr* = false var run_command* = "" var wayland* = false @@ -119,9 +118,7 @@ proc newDmenuConfig(cmd: string = "dmenu"): Menu = return menu proc newMenu(): Menu = - if passmenu: - return newDmenuConfig("passmenu") - elif command_wrapper: + if wrappurr: return newDmenuConfig(run_command) elif tool == "rofi": return newRofiConfig() @@ -286,8 +283,5 @@ for idx, arg in args: of "rofi": stoploop = true tool = "rofi" - of ["pass","passmenu"]: - passmenu = true - break diff --git a/i3_wurrkspaces/i3_wurrkspaces.nimble b/i3_wurrkspaces/i3_wurrkspaces.nimble index 38c0251..48bc5f0 100644 --- a/i3_wurrkspaces/i3_wurrkspaces.nimble +++ b/i3_wurrkspaces/i3_wurrkspaces.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Displays open windows in i3 workspaces" license = "MIT" srcDir = "src" -bin = @["i3_workspaces"] +bin = @["i3_wurrkspaces"] # Dependencies diff --git a/netwurrk/netwurrk.nimble b/netwurrk/netwurrk.nimble index d49ca6e..8eee83b 100644 --- a/netwurrk/netwurrk.nimble +++ b/netwurrk/netwurrk.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Display NIC IP address and link to manage NICs" license = "GPL-3.0-or-later" srcDir = "src" -bin = @["nic"] +bin = @["netwurrk"] # Dependencies diff --git a/noteurr/noteurr.nimble b/noteurr/noteurr.nimble index 69711d5..ec61332 100644 --- a/noteurr/noteurr.nimble +++ b/noteurr/noteurr.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "A notes app for dmenu" license = "GPL-3.0-or-later" srcDir = "src" -bin = @["notes"] +bin = @["noteurr"] # Dependencies diff --git a/pingclurrk/pingclurrk.nimble b/pingclurrk/pingclurrk.nimble index 6d8d20e..2cd8f46 100644 --- a/pingclurrk/pingclurrk.nimble +++ b/pingclurrk/pingclurrk.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "A ping clock - display current ping time" license = "GPL-3.0-or-later" srcDir = "src" -bin = @["pingclock"] +bin = @["pingclurrk"] # Dependencies diff --git a/remmina_choosurr/remmina_choosurr.nimble b/remmina_choosurr/remmina_choosurr.nimble index 3a16881..5faaf0b 100644 --- a/remmina_choosurr/remmina_choosurr.nimble +++ b/remmina_choosurr/remmina_choosurr.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "A Remmina client tool and opener" license = "GPL-3.0-or-later" srcDir = "src" -bin = @["remmina"] +bin = @["remmina_choosurr"] # Dependencies diff --git a/screenshuurt/screenshuurt.nimble b/screenshuurt/screenshuurt.nimble index aef1cb2..5f18bf3 100644 --- a/screenshuurt/screenshuurt.nimble +++ b/screenshuurt/screenshuurt.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "A screenshot client, works on both X11 and Wayland" license = "GPL-3.0-or-later" srcDir = "src" -bin = @["screenshot"] +bin = @["screenshurrt"] # Dependencies diff --git a/temperaturr/temperaturr.nimble b/temperaturr/temperaturr.nimble index 51ad626..dccea68 100644 --- a/temperaturr/temperaturr.nimble +++ b/temperaturr/temperaturr.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Display temp in dmenu" license = "GPL-3.0-or-later" srcDir = "src" -bin = @["temperature"] +bin = @["temperaturr"] # Dependencies diff --git a/tideurrl/tideurrl.nimble b/tideurrl/tideurrl.nimble index 78276fb..150b81b 100644 --- a/tideurrl/tideurrl.nimble +++ b/tideurrl/tideurrl.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Display local tides in dmenu" license = "GPL-3.0-or-later" srcDir = "src" -bin = @["tides"] +bin = @["tideurrl"] # Dependencies diff --git a/translaturr/translaturr.nimble b/translaturr/translaturr.nimble index 69bff6f..b597250 100644 --- a/translaturr/translaturr.nimble +++ b/translaturr/translaturr.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Query libretranslate with dmenu" license = "GPL-3.0-or-later" srcDir = "src" -bin = @["translate"] +bin = @["translaturr"] # Dependencies diff --git a/wirelurrs/wirelurrs.nimble b/wirelurrs/wirelurrs.nimble index 4f45963..3d4a27f 100644 --- a/wirelurrs/wirelurrs.nimble +++ b/wirelurrs/wirelurrs.nimble @@ -5,7 +5,7 @@ author = "Paul Wilde" description = "Display and control WLAN state with dmenu" license = "GPL-3.0-or-later" srcDir = "src" -bin = @["wlan"] +bin = @["wirelurrs"] # Dependencies