Makefile

@@ -2,30 +2,24 @@
 .PHONY: lint
 lint: lint.py lint.sh
 
-msg = $(call tprint,{a.b_magenta}==>{a.end}{a.bold} $(1){a.end})
-
 ## lint.py | lint python files
 .PHONY: lint.py
-lint.py: info
+lint.py:
-	$(call msg,Linting Python Files)
+	black $(shell find -type f -name "*.py")
-	@black $(shell find -type f -name "*.py")
 
 ## lint.sh | lint shell files
 .PHONY: lint.sh
 lint.sh:
-	$(call msg,Linting Shell Files)
+	shfmt -s -w $(shell shfmt -f .)
-	@shfmt -s -w $(shell shfmt -f .)
 
 ## db, d-build | build docker image
 .PHONY: db d-build
 db d-build:
-	$(call msg,Building Docker Image)
+	docker build -f docker/Dockerfile -t dots .
-	@docker build -f docker/Dockerfile -t dots .
 
 ## dr, d-run | run docker image
 .PHONY: dr d-run
 dr d-run:
-	$(call msg,Running Docker Image)
 	docker run --rm -it dots
 
 .PHONY: dr-keep
@@ -35,6 +29,5 @@ dr-keep:
 .DEFAULT_GOAL = help
 GOAL_COLOR = b_magenta
 HELP_SEP = ->>
-USAGE = {a.italic}{a.b_cyan}Best Dots Around{a.end}\n
 -include .task.mk
 $(if $(wildcard .task.mk),,.task.mk: ; curl -fsSL https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk)

home/private_bin/executable_tools

@@ -89,9 +89,9 @@ get_days() {
 	now=$(date +'%s')
 	days=$(((now - install_date) / 86400))
 	if ((days > 60)); then
-		echo -e "${RED}$date_out${NORMAL}"
+		echo "${RED}$date_out${NORMAL}"
 	elif ((days > 30)); then
-		echo -e "${YELLOW}$date_out${NORMAL}"
+		echo "${YELLOW}$date_out${NORMAL}"
 	else
 		echo "$date_out"
 	fi
@@ -165,7 +165,7 @@ download() {
 
 download_all() {
 
-	echo -e "Downloading binaries to ${GREEN}$BIN_DIR${NORMAL}"
+	echo "Downloading binaries to ${GREEN}$BIN_DIR${NORMAL}"
 
 	deps_check
 
@@ -222,11 +222,11 @@ done
 # if no args, show help
 
 if [ -z "$args" ]; then
-	echo -e "${RED}No arguments supplied${NORMAL}"
+	echo "${RED}No arguments supplied${NORMAL}"
 	help
 	exit 0
 else
-	echo -e "Downloading binaries to ${GREEN}$BIN_DIR${NORMAL}"
+	echo "Downloading binaries to ${GREEN}$BIN_DIR${NORMAL}"
 	deps_check
 	for tool in "${args[@]}"; do
 		download "$tool"

info/tools.yml

@@ -31,7 +31,7 @@ gum:
   asset: linux_x86_64.tar.gz
   custom_flags: "--asset ^.sbom"
 
-# system monitoring
+  # system monitoring
 bottom:
   asset: x86_64-unknown-linux-gnu.tar.gz
   user: ClementTsang
@@ -61,11 +61,6 @@ sh:
   user: mvdan
   to: shfmt
 
-atuin:
-  user: ellie
-
-lazydocker:
-  user: jesseduffield
 
 # file management
 gdu:

lib/env.zsh

@@ -43,6 +43,10 @@ fi
 if [[ $PATH != *$HOME/.fzf/bin* ]]; then
 	export PATH="${PATH:+${PATH}:}$HOME/.fzf/bin"
 fi
+
+if is-executable fzf; then
+	source $DOTFILES_DIR/lib/fzf.zsh
+fi
 # ---------
 
 # Add lfcd command

lib/prompt.zsh

@@ -28,8 +28,3 @@ else
 fi
 
 zstyle ':completion::complete:make:*:targets' call-command true
-
-is-executable fzf && source $DOTFILES_DIR/lib/fzf.zsh
-
-# atuin must be loaded after to override zsh's ctrl+R completion
-is-executable atuin && eval "$(atuin init zsh)"