diff --git a/install.sh b/install.sh index f9c969f3..373722d0 100755 --- a/install.sh +++ b/install.sh @@ -461,7 +461,7 @@ if [[ ${main_menu[@]} =~ 1 ]]; then # DWM sudo nala install libgcr-3-dev libglib2.0-0 libgtk-3-0 libwebkit2gtk-4.0-dev compile() { - cd suckless/$1 + cd programs/$1 sudo rm -rf config.h sudo make clean install cd ../.. diff --git a/suckless/VERSIONS b/programs/VERSIONS similarity index 80% rename from suckless/VERSIONS rename to programs/VERSIONS index 3bf33b0c..c0b5608f 100644 --- a/suckless/VERSIONS +++ b/programs/VERSIONS @@ -5,3 +5,4 @@ slstatus - 1.0 slock - 1.5 surf - 2.1 tabbed - 0.8 +herbe - GIT 06/06/24 diff --git a/suckless/dmenu/LICENSE b/programs/dmenu/LICENSE similarity index 100% rename from suckless/dmenu/LICENSE rename to programs/dmenu/LICENSE diff --git a/suckless/dmenu/Makefile b/programs/dmenu/Makefile similarity index 100% rename from suckless/dmenu/Makefile rename to programs/dmenu/Makefile diff --git a/suckless/dmenu/README b/programs/dmenu/README similarity index 100% rename from suckless/dmenu/README rename to programs/dmenu/README diff --git a/suckless/dmenu/arg.h b/programs/dmenu/arg.h similarity index 100% rename from suckless/dmenu/arg.h rename to programs/dmenu/arg.h diff --git a/suckless/dmenu/config.def.h b/programs/dmenu/config.def.h similarity index 100% rename from suckless/dmenu/config.def.h rename to programs/dmenu/config.def.h diff --git a/suckless/dmenu/config.h b/programs/dmenu/config.h similarity index 100% rename from suckless/dmenu/config.h rename to programs/dmenu/config.h diff --git a/suckless/dmenu/config.mk b/programs/dmenu/config.mk similarity index 100% rename from suckless/dmenu/config.mk rename to programs/dmenu/config.mk diff --git a/programs/dmenu/dmenu b/programs/dmenu/dmenu new file mode 100755 index 00000000..bbd35b79 Binary files /dev/null and b/programs/dmenu/dmenu differ diff --git a/suckless/dmenu/dmenu.1 b/programs/dmenu/dmenu.1 similarity index 100% rename from suckless/dmenu/dmenu.1 rename to programs/dmenu/dmenu.1 diff --git a/suckless/dmenu/dmenu.c b/programs/dmenu/dmenu.c similarity index 100% rename from suckless/dmenu/dmenu.c rename to programs/dmenu/dmenu.c diff --git a/suckless/dmenu/dmenu_path b/programs/dmenu/dmenu_path similarity index 100% rename from suckless/dmenu/dmenu_path rename to programs/dmenu/dmenu_path diff --git a/suckless/dmenu/dmenu_run b/programs/dmenu/dmenu_run similarity index 100% rename from suckless/dmenu/dmenu_run rename to programs/dmenu/dmenu_run diff --git a/suckless/dmenu/drw.c b/programs/dmenu/drw.c similarity index 100% rename from suckless/dmenu/drw.c rename to programs/dmenu/drw.c diff --git a/suckless/dmenu/drw.h b/programs/dmenu/drw.h similarity index 100% rename from suckless/dmenu/drw.h rename to programs/dmenu/drw.h diff --git a/suckless/dmenu/patches/dmenu-gruvbox-20210329-9ae8ea5.diff b/programs/dmenu/patches/dmenu-gruvbox-20210329-9ae8ea5.diff similarity index 100% rename from suckless/dmenu/patches/dmenu-gruvbox-20210329-9ae8ea5.diff rename to programs/dmenu/patches/dmenu-gruvbox-20210329-9ae8ea5.diff diff --git a/programs/dmenu/stest b/programs/dmenu/stest new file mode 100755 index 00000000..99a49856 Binary files /dev/null and b/programs/dmenu/stest differ diff --git a/suckless/dmenu/stest.1 b/programs/dmenu/stest.1 similarity index 100% rename from suckless/dmenu/stest.1 rename to programs/dmenu/stest.1 diff --git a/suckless/dmenu/stest.c b/programs/dmenu/stest.c similarity index 100% rename from suckless/dmenu/stest.c rename to programs/dmenu/stest.c diff --git a/suckless/dmenu/util.c b/programs/dmenu/util.c similarity index 100% rename from suckless/dmenu/util.c rename to programs/dmenu/util.c diff --git a/suckless/dmenu/util.h b/programs/dmenu/util.h similarity index 100% rename from suckless/dmenu/util.h rename to programs/dmenu/util.h diff --git a/suckless/dwm/LICENSE b/programs/dwm/LICENSE similarity index 100% rename from suckless/dwm/LICENSE rename to programs/dwm/LICENSE diff --git a/suckless/dwm/Makefile b/programs/dwm/Makefile similarity index 100% rename from suckless/dwm/Makefile rename to programs/dwm/Makefile diff --git a/suckless/dwm/README b/programs/dwm/README similarity index 100% rename from suckless/dwm/README rename to programs/dwm/README diff --git a/suckless/dwm/config.def.h b/programs/dwm/config.def.h similarity index 100% rename from suckless/dwm/config.def.h rename to programs/dwm/config.def.h diff --git a/suckless/dwm/config.h b/programs/dwm/config.h similarity index 100% rename from suckless/dwm/config.h rename to programs/dwm/config.h diff --git a/suckless/dwm/config.mk b/programs/dwm/config.mk similarity index 100% rename from suckless/dwm/config.mk rename to programs/dwm/config.mk diff --git a/suckless/dwm/drw.c b/programs/dwm/drw.c similarity index 100% rename from suckless/dwm/drw.c rename to programs/dwm/drw.c diff --git a/suckless/dwm/drw.h b/programs/dwm/drw.h similarity index 100% rename from suckless/dwm/drw.h rename to programs/dwm/drw.h diff --git a/programs/dwm/dwm b/programs/dwm/dwm new file mode 100755 index 00000000..166dbb1b Binary files /dev/null and b/programs/dwm/dwm differ diff --git a/suckless/dwm/dwm.1 b/programs/dwm/dwm.1 similarity index 100% rename from suckless/dwm/dwm.1 rename to programs/dwm/dwm.1 diff --git a/suckless/dwm/dwm.c b/programs/dwm/dwm.c similarity index 100% rename from suckless/dwm/dwm.c rename to programs/dwm/dwm.c diff --git a/suckless/dwm/dwm.png b/programs/dwm/dwm.png similarity index 100% rename from suckless/dwm/dwm.png rename to programs/dwm/dwm.png diff --git a/suckless/dwm/exitdwm.c b/programs/dwm/exitdwm.c similarity index 100% rename from suckless/dwm/exitdwm.c rename to programs/dwm/exitdwm.c diff --git a/suckless/dwm/patches/dwm-autoresize-6.1.diff b/programs/dwm/patches/dwm-autoresize-6.1.diff similarity index 100% rename from suckless/dwm/patches/dwm-autoresize-6.1.diff rename to programs/dwm/patches/dwm-autoresize-6.1.diff diff --git a/suckless/dwm/patches/dwm-centerfirstwindow-6.2.diff b/programs/dwm/patches/dwm-centerfirstwindow-6.2.diff similarity index 100% rename from suckless/dwm/patches/dwm-centerfirstwindow-6.2.diff rename to programs/dwm/patches/dwm-centerfirstwindow-6.2.diff diff --git a/suckless/dwm/patches/dwm-exitmenu-6.3.diff b/programs/dwm/patches/dwm-exitmenu-6.3.diff similarity index 100% rename from suckless/dwm/patches/dwm-exitmenu-6.3.diff rename to programs/dwm/patches/dwm-exitmenu-6.3.diff diff --git a/suckless/dwm/patches/dwm-restartsig-20180523-6.2.diff b/programs/dwm/patches/dwm-restartsig-20180523-6.2.diff similarity index 100% rename from suckless/dwm/patches/dwm-restartsig-20180523-6.2.diff rename to programs/dwm/patches/dwm-restartsig-20180523-6.2.diff diff --git a/suckless/dwm/patches/dwm-systray-20230922-9f88553.diff b/programs/dwm/patches/dwm-systray-20230922-9f88553.diff similarity index 100% rename from suckless/dwm/patches/dwm-systray-20230922-9f88553.diff rename to programs/dwm/patches/dwm-systray-20230922-9f88553.diff diff --git a/suckless/dwm/patches/dwm-titlecolor-20210815-ed3ab6b4.diff b/programs/dwm/patches/dwm-titlecolor-20210815-ed3ab6b4.diff similarity index 100% rename from suckless/dwm/patches/dwm-titlecolor-20210815-ed3ab6b4.diff rename to programs/dwm/patches/dwm-titlecolor-20210815-ed3ab6b4.diff diff --git a/suckless/dwm/transient.c b/programs/dwm/transient.c similarity index 100% rename from suckless/dwm/transient.c rename to programs/dwm/transient.c diff --git a/suckless/dwm/util.c b/programs/dwm/util.c similarity index 100% rename from suckless/dwm/util.c rename to programs/dwm/util.c diff --git a/suckless/dwm/util.h b/programs/dwm/util.h similarity index 100% rename from suckless/dwm/util.h rename to programs/dwm/util.h diff --git a/programs/herbe/Makefile b/programs/herbe/Makefile new file mode 100644 index 00000000..3225e36f --- /dev/null +++ b/programs/herbe/Makefile @@ -0,0 +1,24 @@ +CFLAGS = -Wall -Wextra -pedantic -lX11 -lXft -I/usr/include/freetype2 -pthread + +PREFIX ?= /usr/local +CC ?= cc + +all: herbe + +config.h: config.def.h + cp config.def.h config.h + +herbe: herbe.c config.h + $(CC) herbe.c $(CFLAGS) -o herbe + +install: herbe + mkdir -p ${DESTDIR}${PREFIX}/bin + cp -f herbe ${DESTDIR}${PREFIX}/bin + +uninstall: + rm -f ${DESTDIR}${PREFIX}/bin/herbe + +clean: + rm -f herbe + +.PHONY: all install uninstall clean diff --git a/programs/herbe/README.md b/programs/herbe/README.md new file mode 100644 index 00000000..25eb20c8 --- /dev/null +++ b/programs/herbe/README.md @@ -0,0 +1,139 @@ +# 🌱 herbe +> Daemon-less notifications without D-Bus. Minimal and lightweight. + +

+ +

+ +## Features +* Under 200 lines of code +* Doesn't run in the background, just displays the notification and exits +* No external dependencies except Xlib and Xft +* Configurable through `config.h` or Xresources ([using this patch](https://github.com/dudik/herbe/pull/11)) +* [Actions support](#actions) +* Extensible through [patches](https://github.com/dudik/herbe/pulls?q=is%3Aopen+is%3Apr+label%3Apatch) + +## Table of contents + +* [Usage](#usage) + * [Patches](#patches) + * [Dismiss a notification](#dismiss-a-notification) + * [Actions](#actions) + * [Newlines](#newlines) + * [Multiple notifications](#multiple-notifications) + * [Notifications don't show up](#notifications-dont-show-up) +* [Installation](#installation) + * [Packages](#packages) + * [Dependencies](#dependencies) + * [Build](#build) +* [Configuration](#configuration) +* [Contribute](#contribute) + +## Usage + +### Patches +[List of available patches](https://github.com/dudik/herbe/pulls?q=is%3Aopen+is%3Apr+label%3Apatch) + +To create a new patch you'll have to open a pull request with your changes. Append `.diff` to the pull request URL to get a downloadable diff file. Don't forget to prefix the title with `patch:` and to apply the `patch` label to it. For inspiration, look at [my Xresources patch](https://github.com/dudik/herbe/pull/11). Thank you. + +_Note: This patching method was heavily inspired by [dylan's sowm](https://github.com/dylanaraps/sowm)._ + +### Dismiss a notification +A notification can be dismissed either by clicking on it with `DISMISS_BUTTON` (set in config.h, defaults to left mouse button) or sending a `SIGUSR1` signal to it: +```shell +$ pkill -SIGUSR1 herbe +``` +Dismissed notifications return exit code 2. + +### Actions +Action is a piece of shell code that runs when a notification gets accepted. Accepting a notification is the same as dismissing it, but you have to use either `ACTION_BUTTON` (defaults to right mouse button) or the `SIGUSR2` signal. +An accepted notification always returns exit code 0. To specify an action: +```shell +$ herbe "Notification body" && echo "This is an action" +``` +Where everything after `&&` is the action and will get executed after the notification gets accepted. + +### Newlines +Every command line argument gets printed on a separate line by default e.g.: +```shell +$ herbe "First line" "Second line" "Third line" ... +``` +You can also use `\n` e.g. in `bash`: +```shell +$ herbe $'First line\nSecond line\nThird line' +``` +But by default `herbe` prints `\n` literally: +```shell +$ herbe "First line\nStill the first line" +``` +Output of other programs will get printed correctly, just make sure to escape it (so you don't end up with every word on a separate line): +```shell +$ herbe "$(ps axch -o cmd:15,%cpu --sort=-%cpu | head)" +``` + +### Multiple notifications +Notifications are put in a queue and shown one after another in order of creation (first in, first out). They don't overlap and each one is shown for its entire duration. + +### Notifications don't show up +Most likely a running notification got terminated forcefully (SIGKILL or any uncaught signal) which caused the semaphore not getting unlocked. First, kill any `herbe` instance that is stuck: +```shell +$ pkill -SIGKILL herbe +``` +Then just call `herbe` without any arguments: +```shell +$ herbe +``` +Notifications should now show up as expected. + +Don't ever send any signals to `herbe` except these: +```shell +# same as pkill -SIGTERM herbe, terminates every running herbe process +$ pkill herbe + +$ pkill -SIGUSR1 herbe +$ pkill -SIGUSR2 herbe +``` +And you should be fine. That's all you really need to interact with `herbe`. + +## Installation +### Packages +[![Packaging status](https://repology.org/badge/vertical-allrepos/herbe.svg)](https://repology.org/project/herbe/versions) + +[OpenBSD patch](https://github.com/dudik/herbe/pull/4) + +[FreeBSD patch](https://github.com/dudik/herbe/pull/16) + +[Wayland port](https://github.com/muevoid/Wayherb) by [muevoid](https://github.com/muevoid) + +**Only the [herbe-git AUR package](https://aur.archlinux.org/packages/herbe-git/) is maintained by me.** + +### Dependencies +* X11 (Xlib) +* Xft + +The names of packages are different depending on which distribution you use. +For example, if you use [Void Linux](https://voidlinux.org/) you will have to install these dependencies: +```shell +sudo xbps-install base-devel libX11-devel libXft-devel +``` + +### Build +```shell +git clone https://github.com/dudik/herbe +cd herbe +sudo make install +``` +`make install` requires root privileges because it copies the resulting binary to `/usr/local/bin`. This makes `herbe` accessible globally. + +You can also use `make clean` to remove the binary from the build folder, `sudo make uninstall` to remove the binary from `/usr/local/bin` or just `make` to build the binary locally. + +## Configuration +herbe is configured at compile-time by editing `config.h`. Every option should be self-explanatory. There is no `height` option because height is determined by font size and text padding. + +[Xresources patch](https://github.com/dudik/herbe/pull/11) + +## Contribute +If you want to report a bug or you have a feature request, feel free to [open an issue](https://github.com/dudik/herbe/issues). + +## Projects with herbe integration +- [qutebrowser](https://qutebrowser.org/) supports showing web notifications via herbe, via the `content.notifications.presenter` setting. diff --git a/programs/herbe/config.def.h b/programs/herbe/config.def.h new file mode 100644 index 00000000..49b161a2 --- /dev/null +++ b/programs/herbe/config.def.h @@ -0,0 +1,19 @@ +static const char *background_color = "#3e3e3e"; +static const char *border_color = "#ececec"; +static const char *font_color = "#ececec"; +static const char *font_pattern = "JetBrainsMono NF:size=10"; +static const unsigned line_spacing = 5; +static const unsigned int padding = 15; + +static const unsigned int width = 450; +static const unsigned int border_size = 2; +static const unsigned int pos_x = 30; +static const unsigned int pos_y = 60; + +enum corners { TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT }; +enum corners corner = TOP_RIGHT; + +static const unsigned int duration = 5; /* in seconds */ + +#define DISMISS_BUTTON Button1 +#define ACTION_BUTTON Button3 diff --git a/programs/herbe/herbe.c b/programs/herbe/herbe.c new file mode 100644 index 00000000..51d39904 --- /dev/null +++ b/programs/herbe/herbe.c @@ -0,0 +1,220 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "config.h" + +#define EXIT_ACTION 0 +#define EXIT_FAIL 1 +#define EXIT_DISMISS 2 + +Display *display; +Window window; +int exit_code = EXIT_DISMISS; + +static void die(const char *format, ...) +{ + va_list ap; + va_start(ap, format); + vfprintf(stderr, format, ap); + fprintf(stderr, "\n"); + va_end(ap); + exit(EXIT_FAIL); +} + +int get_max_len(char *string, XftFont *font, int max_text_width) +{ + int eol = strlen(string); + XGlyphInfo info; + XftTextExtentsUtf8(display, font, (FcChar8 *)string, eol, &info); + + if (info.width > max_text_width) + { + eol = max_text_width / font->max_advance_width; + info.width = 0; + + while (info.width < max_text_width) + { + eol++; + XftTextExtentsUtf8(display, font, (FcChar8 *)string, eol, &info); + } + + eol--; + } + + for (int i = 0; i < eol; i++) + if (string[i] == '\n') + { + string[i] = ' '; + return ++i; + } + + if (info.width <= max_text_width) + return eol; + + int temp = eol; + + while (string[eol] != ' ' && eol) + --eol; + + if (eol == 0) + return temp; + else + return ++eol; +} + +void expire(int sig) +{ + XEvent event; + event.type = ButtonPress; + event.xbutton.button = (sig == SIGUSR2) ? (ACTION_BUTTON) : (DISMISS_BUTTON); + XSendEvent(display, window, 0, 0, &event); + XFlush(display); +} + +int main(int argc, char *argv[]) +{ + if (argc == 1) + { + sem_unlink("/herbe"); + die("Usage: %s body", argv[0]); + } + + struct sigaction act_expire, act_ignore; + + act_expire.sa_handler = expire; + act_expire.sa_flags = SA_RESTART; + sigemptyset(&act_expire.sa_mask); + + act_ignore.sa_handler = SIG_IGN; + act_ignore.sa_flags = 0; + sigemptyset(&act_ignore.sa_mask); + + sigaction(SIGALRM, &act_expire, 0); + sigaction(SIGTERM, &act_expire, 0); + sigaction(SIGINT, &act_expire, 0); + + sigaction(SIGUSR1, &act_ignore, 0); + sigaction(SIGUSR2, &act_ignore, 0); + + if (!(display = XOpenDisplay(0))) + die("Cannot open display"); + + int screen = DefaultScreen(display); + Visual *visual = DefaultVisual(display, screen); + Colormap colormap = DefaultColormap(display, screen); + + int screen_width = DisplayWidth(display, screen); + int screen_height = DisplayHeight(display, screen); + + XSetWindowAttributes attributes; + attributes.override_redirect = True; + XftColor color; + XftColorAllocName(display, visual, colormap, background_color, &color); + attributes.background_pixel = color.pixel; + XftColorAllocName(display, visual, colormap, border_color, &color); + attributes.border_pixel = color.pixel; + + int num_of_lines = 0; + int max_text_width = width - 2 * padding; + int lines_size = 5; + char **lines = malloc(lines_size * sizeof(char *)); + if (!lines) + die("malloc failed"); + + XftFont *font = XftFontOpenName(display, screen, font_pattern); + + for (int i = 1; i < argc; i++) + { + for (unsigned int eol = get_max_len(argv[i], font, max_text_width); eol; argv[i] += eol, num_of_lines++, eol = get_max_len(argv[i], font, max_text_width)) + { + if (lines_size <= num_of_lines) + { + lines = realloc(lines, (lines_size += 5) * sizeof(char *)); + if (!lines) + die("realloc failed"); + } + + lines[num_of_lines] = malloc((eol + 1) * sizeof(char)); + if (!lines[num_of_lines]) + die("malloc failed"); + + strncpy(lines[num_of_lines], argv[i], eol); + lines[num_of_lines][eol] = '\0'; + } + } + + unsigned int x = pos_x; + unsigned int y = pos_y; + unsigned int text_height = font->ascent - font->descent; + unsigned int height = (num_of_lines - 1) * line_spacing + num_of_lines * text_height + 2 * padding; + + if (corner == TOP_RIGHT || corner == BOTTOM_RIGHT) + x = screen_width - width - border_size * 2 - pos_x; + + if (corner == BOTTOM_LEFT || corner == BOTTOM_RIGHT) + y = screen_height - height - border_size * 2 - pos_y; + + window = XCreateWindow(display, RootWindow(display, screen), x, y, width, height, border_size, DefaultDepth(display, screen), + CopyFromParent, visual, CWOverrideRedirect | CWBackPixel | CWBorderPixel, &attributes); + + XftDraw *draw = XftDrawCreate(display, window, visual, colormap); + XftColorAllocName(display, visual, colormap, font_color, &color); + + XSelectInput(display, window, ExposureMask | ButtonPress); + XMapWindow(display, window); + + sem_t *mutex = sem_open("/herbe", O_CREAT, 0644, 1); + sem_wait(mutex); + + sigaction(SIGUSR1, &act_expire, 0); + sigaction(SIGUSR2, &act_expire, 0); + + if (duration != 0) + alarm(duration); + + for (;;) + { + XEvent event; + XNextEvent(display, &event); + + if (event.type == Expose) + { + XClearWindow(display, window); + for (int i = 0; i < num_of_lines; i++) + XftDrawStringUtf8(draw, &color, font, padding, line_spacing * i + text_height * (i + 1) + padding, + (FcChar8 *)lines[i], strlen(lines[i])); + } + else if (event.type == ButtonPress) + { + if (event.xbutton.button == DISMISS_BUTTON) + break; + else if (event.xbutton.button == ACTION_BUTTON) + { + exit_code = EXIT_ACTION; + break; + } + } + } + + sem_post(mutex); + sem_close(mutex); + + for (int i = 0; i < num_of_lines; i++) + free(lines[i]); + + free(lines); + XftDrawDestroy(draw); + XftColorFree(display, visual, colormap, &color); + XftFontClose(display, font); + XCloseDisplay(display); + + return exit_code; +} \ No newline at end of file diff --git a/suckless/slock/LICENSE b/programs/slock/LICENSE similarity index 100% rename from suckless/slock/LICENSE rename to programs/slock/LICENSE diff --git a/suckless/slock/Makefile b/programs/slock/Makefile similarity index 100% rename from suckless/slock/Makefile rename to programs/slock/Makefile diff --git a/suckless/slock/README b/programs/slock/README similarity index 100% rename from suckless/slock/README rename to programs/slock/README diff --git a/suckless/slock/arg.h b/programs/slock/arg.h similarity index 100% rename from suckless/slock/arg.h rename to programs/slock/arg.h diff --git a/suckless/slock/config.def.h b/programs/slock/config.def.h similarity index 100% rename from suckless/slock/config.def.h rename to programs/slock/config.def.h diff --git a/suckless/slock/config.h b/programs/slock/config.h similarity index 100% rename from suckless/slock/config.h rename to programs/slock/config.h diff --git a/suckless/slock/config.mk b/programs/slock/config.mk similarity index 100% rename from suckless/slock/config.mk rename to programs/slock/config.mk diff --git a/suckless/slock/explicit_bzero.c b/programs/slock/explicit_bzero.c similarity index 100% rename from suckless/slock/explicit_bzero.c rename to programs/slock/explicit_bzero.c diff --git a/suckless/slock/patches/slock-dpms-20231017-4f04554.diff b/programs/slock/patches/slock-dpms-20231017-4f04554.diff similarity index 100% rename from suckless/slock/patches/slock-dpms-20231017-4f04554.diff rename to programs/slock/patches/slock-dpms-20231017-4f04554.diff diff --git a/suckless/slock/patches/slock-squares-1.5.diff b/programs/slock/patches/slock-squares-1.5.diff similarity index 100% rename from suckless/slock/patches/slock-squares-1.5.diff rename to programs/slock/patches/slock-squares-1.5.diff diff --git a/programs/slock/slock b/programs/slock/slock new file mode 100755 index 00000000..ccd356fc Binary files /dev/null and b/programs/slock/slock differ diff --git a/suckless/slock/slock.1 b/programs/slock/slock.1 similarity index 100% rename from suckless/slock/slock.1 rename to programs/slock/slock.1 diff --git a/suckless/slock/slock.c b/programs/slock/slock.c similarity index 100% rename from suckless/slock/slock.c rename to programs/slock/slock.c diff --git a/suckless/slock/util.h b/programs/slock/util.h similarity index 100% rename from suckless/slock/util.h rename to programs/slock/util.h diff --git a/suckless/slstatus/LICENSE b/programs/slstatus/LICENSE similarity index 100% rename from suckless/slstatus/LICENSE rename to programs/slstatus/LICENSE diff --git a/suckless/slstatus/Makefile b/programs/slstatus/Makefile similarity index 100% rename from suckless/slstatus/Makefile rename to programs/slstatus/Makefile diff --git a/suckless/slstatus/README b/programs/slstatus/README similarity index 100% rename from suckless/slstatus/README rename to programs/slstatus/README diff --git a/suckless/slstatus/arg.h b/programs/slstatus/arg.h similarity index 100% rename from suckless/slstatus/arg.h rename to programs/slstatus/arg.h diff --git a/suckless/slstatus/components/battery.c b/programs/slstatus/components/battery.c similarity index 100% rename from suckless/slstatus/components/battery.c rename to programs/slstatus/components/battery.c diff --git a/suckless/slstatus/components/cat.c b/programs/slstatus/components/cat.c similarity index 100% rename from suckless/slstatus/components/cat.c rename to programs/slstatus/components/cat.c diff --git a/suckless/slstatus/components/cpu.c b/programs/slstatus/components/cpu.c similarity index 100% rename from suckless/slstatus/components/cpu.c rename to programs/slstatus/components/cpu.c diff --git a/suckless/slstatus/components/datetime.c b/programs/slstatus/components/datetime.c similarity index 100% rename from suckless/slstatus/components/datetime.c rename to programs/slstatus/components/datetime.c diff --git a/suckless/slstatus/components/disk.c b/programs/slstatus/components/disk.c similarity index 100% rename from suckless/slstatus/components/disk.c rename to programs/slstatus/components/disk.c diff --git a/suckless/slstatus/components/entropy.c b/programs/slstatus/components/entropy.c similarity index 100% rename from suckless/slstatus/components/entropy.c rename to programs/slstatus/components/entropy.c diff --git a/suckless/slstatus/components/hostname.c b/programs/slstatus/components/hostname.c similarity index 100% rename from suckless/slstatus/components/hostname.c rename to programs/slstatus/components/hostname.c diff --git a/suckless/slstatus/components/ip.c b/programs/slstatus/components/ip.c similarity index 100% rename from suckless/slstatus/components/ip.c rename to programs/slstatus/components/ip.c diff --git a/suckless/slstatus/components/kernel_release.c b/programs/slstatus/components/kernel_release.c similarity index 100% rename from suckless/slstatus/components/kernel_release.c rename to programs/slstatus/components/kernel_release.c diff --git a/suckless/slstatus/components/keyboard_indicators.c b/programs/slstatus/components/keyboard_indicators.c similarity index 100% rename from suckless/slstatus/components/keyboard_indicators.c rename to programs/slstatus/components/keyboard_indicators.c diff --git a/suckless/slstatus/components/keymap.c b/programs/slstatus/components/keymap.c similarity index 100% rename from suckless/slstatus/components/keymap.c rename to programs/slstatus/components/keymap.c diff --git a/suckless/slstatus/components/load_avg.c b/programs/slstatus/components/load_avg.c similarity index 100% rename from suckless/slstatus/components/load_avg.c rename to programs/slstatus/components/load_avg.c diff --git a/suckless/slstatus/components/netspeeds.c b/programs/slstatus/components/netspeeds.c similarity index 100% rename from suckless/slstatus/components/netspeeds.c rename to programs/slstatus/components/netspeeds.c diff --git a/suckless/slstatus/components/num_files.c b/programs/slstatus/components/num_files.c similarity index 100% rename from suckless/slstatus/components/num_files.c rename to programs/slstatus/components/num_files.c diff --git a/suckless/slstatus/components/ram.c b/programs/slstatus/components/ram.c similarity index 100% rename from suckless/slstatus/components/ram.c rename to programs/slstatus/components/ram.c diff --git a/suckless/slstatus/components/run_command.c b/programs/slstatus/components/run_command.c similarity index 100% rename from suckless/slstatus/components/run_command.c rename to programs/slstatus/components/run_command.c diff --git a/suckless/slstatus/components/swap.c b/programs/slstatus/components/swap.c similarity index 100% rename from suckless/slstatus/components/swap.c rename to programs/slstatus/components/swap.c diff --git a/suckless/slstatus/components/temperature.c b/programs/slstatus/components/temperature.c similarity index 100% rename from suckless/slstatus/components/temperature.c rename to programs/slstatus/components/temperature.c diff --git a/suckless/slstatus/components/uptime.c b/programs/slstatus/components/uptime.c similarity index 100% rename from suckless/slstatus/components/uptime.c rename to programs/slstatus/components/uptime.c diff --git a/suckless/slstatus/components/user.c b/programs/slstatus/components/user.c similarity index 100% rename from suckless/slstatus/components/user.c rename to programs/slstatus/components/user.c diff --git a/suckless/slstatus/components/volume.c b/programs/slstatus/components/volume.c similarity index 100% rename from suckless/slstatus/components/volume.c rename to programs/slstatus/components/volume.c diff --git a/suckless/slstatus/components/wifi.c b/programs/slstatus/components/wifi.c similarity index 100% rename from suckless/slstatus/components/wifi.c rename to programs/slstatus/components/wifi.c diff --git a/suckless/slstatus/config.def.h b/programs/slstatus/config.def.h similarity index 100% rename from suckless/slstatus/config.def.h rename to programs/slstatus/config.def.h diff --git a/suckless/slstatus/config.h b/programs/slstatus/config.h similarity index 100% rename from suckless/slstatus/config.h rename to programs/slstatus/config.h diff --git a/suckless/slstatus/config.mk b/programs/slstatus/config.mk similarity index 100% rename from suckless/slstatus/config.mk rename to programs/slstatus/config.mk diff --git a/programs/slstatus/slstatus b/programs/slstatus/slstatus new file mode 100755 index 00000000..cf817490 Binary files /dev/null and b/programs/slstatus/slstatus differ diff --git a/suckless/slstatus/slstatus.1 b/programs/slstatus/slstatus.1 similarity index 100% rename from suckless/slstatus/slstatus.1 rename to programs/slstatus/slstatus.1 diff --git a/suckless/slstatus/slstatus.c b/programs/slstatus/slstatus.c similarity index 100% rename from suckless/slstatus/slstatus.c rename to programs/slstatus/slstatus.c diff --git a/suckless/slstatus/slstatus.h b/programs/slstatus/slstatus.h similarity index 100% rename from suckless/slstatus/slstatus.h rename to programs/slstatus/slstatus.h diff --git a/suckless/slstatus/util.c b/programs/slstatus/util.c similarity index 100% rename from suckless/slstatus/util.c rename to programs/slstatus/util.c diff --git a/suckless/slstatus/util.h b/programs/slstatus/util.h similarity index 100% rename from suckless/slstatus/util.h rename to programs/slstatus/util.h diff --git a/suckless/st/FAQ b/programs/st/FAQ similarity index 100% rename from suckless/st/FAQ rename to programs/st/FAQ diff --git a/suckless/st/LEGACY b/programs/st/LEGACY similarity index 100% rename from suckless/st/LEGACY rename to programs/st/LEGACY diff --git a/suckless/st/LICENSE b/programs/st/LICENSE similarity index 100% rename from suckless/st/LICENSE rename to programs/st/LICENSE diff --git a/suckless/st/Makefile b/programs/st/Makefile similarity index 100% rename from suckless/st/Makefile rename to programs/st/Makefile diff --git a/suckless/st/README b/programs/st/README similarity index 100% rename from suckless/st/README rename to programs/st/README diff --git a/suckless/st/TODO b/programs/st/TODO similarity index 100% rename from suckless/st/TODO rename to programs/st/TODO diff --git a/suckless/st/arg.h b/programs/st/arg.h similarity index 100% rename from suckless/st/arg.h rename to programs/st/arg.h diff --git a/suckless/st/boxdraw.c b/programs/st/boxdraw.c similarity index 100% rename from suckless/st/boxdraw.c rename to programs/st/boxdraw.c diff --git a/suckless/st/boxdraw_data.h b/programs/st/boxdraw_data.h similarity index 100% rename from suckless/st/boxdraw_data.h rename to programs/st/boxdraw_data.h diff --git a/suckless/st/config.def.h b/programs/st/config.def.h similarity index 100% rename from suckless/st/config.def.h rename to programs/st/config.def.h diff --git a/suckless/st/config.h b/programs/st/config.h similarity index 100% rename from suckless/st/config.h rename to programs/st/config.h diff --git a/suckless/st/config.mk b/programs/st/config.mk similarity index 100% rename from suckless/st/config.mk rename to programs/st/config.mk diff --git a/suckless/st/patches/st-anysize-20220718-baa9357.diff b/programs/st/patches/st-anysize-20220718-baa9357.diff similarity index 100% rename from suckless/st/patches/st-anysize-20220718-baa9357.diff rename to programs/st/patches/st-anysize-20220718-baa9357.diff diff --git a/suckless/st/patches/st-boxdraw_v2-0.8.5.diff b/programs/st/patches/st-boxdraw_v2-0.8.5.diff similarity index 100% rename from suckless/st/patches/st-boxdraw_v2-0.8.5.diff rename to programs/st/patches/st-boxdraw_v2-0.8.5.diff diff --git a/suckless/st/patches/st-desktopentry-0.8.5.diff b/programs/st/patches/st-desktopentry-0.8.5.diff similarity index 100% rename from suckless/st/patches/st-desktopentry-0.8.5.diff rename to programs/st/patches/st-desktopentry-0.8.5.diff diff --git a/suckless/st/patches/st-gruvbox-dark-0.8.5.diff b/programs/st/patches/st-gruvbox-dark-0.8.5.diff similarity index 100% rename from suckless/st/patches/st-gruvbox-dark-0.8.5.diff rename to programs/st/patches/st-gruvbox-dark-0.8.5.diff diff --git a/programs/st/st b/programs/st/st new file mode 100755 index 00000000..60cfb31e Binary files /dev/null and b/programs/st/st differ diff --git a/suckless/st/st.1 b/programs/st/st.1 similarity index 100% rename from suckless/st/st.1 rename to programs/st/st.1 diff --git a/suckless/st/st.c b/programs/st/st.c similarity index 100% rename from suckless/st/st.c rename to programs/st/st.c diff --git a/suckless/st/st.desktop b/programs/st/st.desktop similarity index 100% rename from suckless/st/st.desktop rename to programs/st/st.desktop diff --git a/suckless/st/st.h b/programs/st/st.h similarity index 100% rename from suckless/st/st.h rename to programs/st/st.h diff --git a/suckless/st/st.info b/programs/st/st.info similarity index 100% rename from suckless/st/st.info rename to programs/st/st.info diff --git a/suckless/st/win.h b/programs/st/win.h similarity index 100% rename from suckless/st/win.h rename to programs/st/win.h diff --git a/suckless/st/x.c b/programs/st/x.c similarity index 100% rename from suckless/st/x.c rename to programs/st/x.c diff --git a/suckless/surf/LICENSE b/programs/surf/LICENSE similarity index 100% rename from suckless/surf/LICENSE rename to programs/surf/LICENSE diff --git a/suckless/surf/Makefile b/programs/surf/Makefile similarity index 100% rename from suckless/surf/Makefile rename to programs/surf/Makefile diff --git a/suckless/surf/README b/programs/surf/README similarity index 100% rename from suckless/surf/README rename to programs/surf/README diff --git a/suckless/surf/TODO.md b/programs/surf/TODO.md similarity index 100% rename from suckless/surf/TODO.md rename to programs/surf/TODO.md diff --git a/suckless/surf/arg.h b/programs/surf/arg.h similarity index 100% rename from suckless/surf/arg.h rename to programs/surf/arg.h diff --git a/suckless/surf/common.h b/programs/surf/common.h similarity index 100% rename from suckless/surf/common.h rename to programs/surf/common.h diff --git a/suckless/surf/config.def.h b/programs/surf/config.def.h similarity index 100% rename from suckless/surf/config.def.h rename to programs/surf/config.def.h diff --git a/suckless/surf/config.h b/programs/surf/config.h similarity index 100% rename from suckless/surf/config.h rename to programs/surf/config.h diff --git a/suckless/surf/config.mk b/programs/surf/config.mk similarity index 100% rename from suckless/surf/config.mk rename to programs/surf/config.mk diff --git a/programs/surf/surf b/programs/surf/surf new file mode 100755 index 00000000..0d1ba2e1 Binary files /dev/null and b/programs/surf/surf differ diff --git a/suckless/surf/surf-open.sh b/programs/surf/surf-open.sh similarity index 100% rename from suckless/surf/surf-open.sh rename to programs/surf/surf-open.sh diff --git a/suckless/surf/surf.1 b/programs/surf/surf.1 similarity index 100% rename from suckless/surf/surf.1 rename to programs/surf/surf.1 diff --git a/suckless/surf/surf.c b/programs/surf/surf.c similarity index 100% rename from suckless/surf/surf.c rename to programs/surf/surf.c diff --git a/suckless/surf/surf.png b/programs/surf/surf.png similarity index 100% rename from suckless/surf/surf.png rename to programs/surf/surf.png diff --git a/suckless/surf/webext-surf.c b/programs/surf/webext-surf.c similarity index 100% rename from suckless/surf/webext-surf.c rename to programs/surf/webext-surf.c diff --git a/suckless/tabbed/LICENSE b/programs/tabbed/LICENSE similarity index 100% rename from suckless/tabbed/LICENSE rename to programs/tabbed/LICENSE diff --git a/suckless/tabbed/Makefile b/programs/tabbed/Makefile similarity index 100% rename from suckless/tabbed/Makefile rename to programs/tabbed/Makefile diff --git a/suckless/tabbed/README b/programs/tabbed/README similarity index 100% rename from suckless/tabbed/README rename to programs/tabbed/README diff --git a/suckless/tabbed/arg.h b/programs/tabbed/arg.h similarity index 100% rename from suckless/tabbed/arg.h rename to programs/tabbed/arg.h diff --git a/suckless/tabbed/config.def.h b/programs/tabbed/config.def.h similarity index 100% rename from suckless/tabbed/config.def.h rename to programs/tabbed/config.def.h diff --git a/suckless/tabbed/config.h b/programs/tabbed/config.h similarity index 100% rename from suckless/tabbed/config.h rename to programs/tabbed/config.h diff --git a/programs/tabbed/tabbed b/programs/tabbed/tabbed new file mode 100755 index 00000000..bc8c96cd Binary files /dev/null and b/programs/tabbed/tabbed differ diff --git a/suckless/tabbed/tabbed.1 b/programs/tabbed/tabbed.1 similarity index 100% rename from suckless/tabbed/tabbed.1 rename to programs/tabbed/tabbed.1 diff --git a/suckless/tabbed/tabbed.c b/programs/tabbed/tabbed.c similarity index 100% rename from suckless/tabbed/tabbed.c rename to programs/tabbed/tabbed.c diff --git a/suckless/tabbed/xembed b/programs/tabbed/xembed similarity index 100% rename from suckless/tabbed/xembed rename to programs/tabbed/xembed diff --git a/suckless/tabbed/xembed.1 b/programs/tabbed/xembed.1 similarity index 100% rename from suckless/tabbed/xembed.1 rename to programs/tabbed/xembed.1 diff --git a/suckless/tabbed/xembed.c b/programs/tabbed/xembed.c similarity index 100% rename from suckless/tabbed/xembed.c rename to programs/tabbed/xembed.c