From 626ea0517c7124c0ec4d6ae9683b0c18e10621c5 Mon Sep 17 00:00:00 2001 From: DarthMooMancer Date: Wed, 10 Sep 2025 14:25:34 -0400 Subject: [PATCH] wip --- .bashrc | 2 +- .config/suckless/dmenu/Makefile | 13 +++++++------ .config/suckless/dmenu/config.mk | 9 --------- .config/suckless/dmenu/dmenu.c | 5 +---- .local/bin/audio_output.sh | 13 ------------- .local/bin/tmux-sessionizer | 16 ---------------- .local/bin/tmux-windowizer | 19 ------------------- env.sh | 6 ++---- 8 files changed, 11 insertions(+), 72 deletions(-) delete mode 100644 .config/suckless/dmenu/config.mk delete mode 100755 .local/bin/audio_output.sh delete mode 100755 .local/bin/tmux-sessionizer delete mode 100755 .local/bin/tmux-windowizer diff --git a/.bashrc b/.bashrc index db66855..8f5dc34 100644 --- a/.bashrc +++ b/.bashrc @@ -5,4 +5,4 @@ fi alias ls="ls -a --color" alias comp="make && doas make install && make clean && pkill dwm" alias update_world="doas emerge --ask --update --newuse --deep @world" -alias env="sh /home/andrew/dotfiles/env.sh" +alias env="sh /home/andrew/personal/dotfiles/env.sh" diff --git a/.config/suckless/dmenu/Makefile b/.config/suckless/dmenu/Makefile index a9abe04..29f64cd 100644 --- a/.config/suckless/dmenu/Makefile +++ b/.config/suckless/dmenu/Makefile @@ -1,17 +1,18 @@ -# dmenu - dynamic menu -# See LICENSE file for copyright and license details. +PREFIX = /usr/local -include config.mk +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L +CFLAGS = -std=c99 -pedantic -Wall -Os -I/usr/X11R6/include -I/usr/include/freetype2 $(CPPFLAGS) +LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft + +CC = gcc SRC = drw.c dmenu.c util.c OBJ = $(SRC:.c=.o) -all: dmenu - .c.o: $(CC) -c $(CFLAGS) $< -$(OBJ): arg.h config.h config.mk drw.h +$(OBJ): arg.h config.h drw.h dmenu: dmenu.o drw.o util.o $(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS) diff --git a/.config/suckless/dmenu/config.mk b/.config/suckless/dmenu/config.mk deleted file mode 100644 index 733ea1a..0000000 --- a/.config/suckless/dmenu/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -VERSION = 5.4 - -PREFIX = /usr/local - -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" -CFLAGS = -std=c99 -pedantic -Wall -Os -I/usr/X11R6/include -I/usr/include/freetype2 $(CPPFLAGS) -LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft - -CC = gcc diff --git a/.config/suckless/dmenu/dmenu.c b/.config/suckless/dmenu/dmenu.c index 6fa0a8c..a723d34 100644 --- a/.config/suckless/dmenu/dmenu.c +++ b/.config/suckless/dmenu/dmenu.c @@ -686,10 +686,7 @@ main(int argc, char *argv[]) for (i = 1; i < argc; i++) /* these options take no arguments */ - if (!strcmp(argv[i], "-v")) { /* prints version information */ - puts("dmenu-"VERSION); - exit(0); - } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */ + if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */ topbar = 0; else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ fast = 1; diff --git a/.local/bin/audio_output.sh b/.local/bin/audio_output.sh deleted file mode 100755 index 81d3592..0000000 --- a/.local/bin/audio_output.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -# Changes the audio output device with dmenu -SPEAKER="Speaker" -HEADPHONES="Headphones" - -OUTPUT="$(echo -e "${SPEAKER}\n${HEADPHONES}" | dmenu -l 2)" - -if [[ ${OUTPUT} == ${SPEAKER} ]]; then - wpctl set-default 52 -elif [[ ${OUTPUT} == ${HEADPHONES} ]]; then - wpctl set-default 53 -fi diff --git a/.local/bin/tmux-sessionizer b/.local/bin/tmux-sessionizer deleted file mode 100755 index 3296679..0000000 --- a/.local/bin/tmux-sessionizer +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -selected="${1:-$(find ~/* ~/dotfiles/*/ ~/personal/*/*/ ~/personal -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sort -u | fzf)}" -[[ -z $selected ]] && exit 0 - -session_name=$(basename "$selected" | tr . _) - -if ! tmux has-session -t "$session_name" 2>/dev/null; then - tmux new-session -d -s "$session_name" -c "$selected" -fi - -if [[ -z $TMUX ]]; then - exec tmux attach -t "$session_name" -else - tmux switch-client -t "$session_name" -fi diff --git a/.local/bin/tmux-windowizer b/.local/bin/tmux-windowizer deleted file mode 100755 index 1526053..0000000 --- a/.local/bin/tmux-windowizer +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -selected="${1:-$(find ~/* ~/dotfiles/*/ ~/personal/*/*/ ~/personal -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sort -u | fzf)}" -[[ -z $selected ]] && exit 0 - -# Create a new window in the current tmux session -tmux new-window -c "$selected" - -# Hydrate with sessionizer if it exists -for file in "$selected/.tmux-sessionizer" "$HOME/.tmux-sessionizer"; do - [[ -f $file ]] && tmux send-keys -t "$(tmux display-message -p '#S')" "source $file" C-m && break -done - -# Attach or switch to the tmux session -if [[ -z $TMUX ]]; then - exec tmux attach-session -else - tmux switch-client -fi diff --git a/env.sh b/env.sh index bc1f1d3..a7c4937 100755 --- a/env.sh +++ b/env.sh @@ -4,7 +4,7 @@ GREEN='\033[0;32m' YELLOW='\033[0;33m' RESET='\033[0m' -DOTFILES_HOME="/home/andrew/dotfiles/" +DOTFILES_HOME="/home/andrew/personal/dotfiles/" DOTFILES_CONFIG="${DOTFILES_HOME}.config/" DOTFILES_LOCAL="${DOTFILES_HOME}.local/" @@ -16,7 +16,6 @@ ORIGINAL_DOTS=( "${DOTFILES_CONFIG}suckless/" "${DOTFILES_CONFIG}nvim/" "${DOTFILES_CONFIG}dunst/" - "${DOTFILES_CONFIG}tmux/" "${DOTFILES_CONFIG}picom.conf" "${DOTFILES_LOCAL}bin/" "${DOTFILES_LOCAL}share/fonts/" @@ -27,7 +26,6 @@ COPY_DOTS=( "${CONFIG}suckless/" "${CONFIG}nvim/" "${CONFIG}dunst/" - "${CONFIG}tmux/" "${CONFIG}picom.conf" "${LOCAL}bin/" "${LOCAL}share/fonts/" @@ -53,7 +51,7 @@ done echo -e "${GREEN}Rebuilding Suckless Software${RESET}" for x in "${CONFIG}suckless"/*/; do [[ -d "${x}" ]] || continue - cd "${x}" && make && doas make install && make clean + cd "${x}" && make && doas make install && make clean && pkill dwm done echo -e "${GREEN}Re-caching fonts${RESET}"