wip

.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"

.config/suckless/dmenu/Makefile

@@ -1,17 +1,18 @@
-# dmenu - dynamic menu
+PREFIX = /usr/local
-# See LICENSE file for copyright and license details.
 
-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)

.config/suckless/dmenu/config.mk

@@ -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

.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 */
+		if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
-			puts("dmenu-"VERSION);
-			exit(0);
-		} else 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;

.local/bin/audio_output.sh

@@ -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

.local/bin/tmux-sessionizer

@@ -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

.local/bin/tmux-windowizer

@@ -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

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}"