install.sh

@@ -24,7 +24,5 @@ do
 	ln -sf "$PWD/$item" "$XDG_CONFIG_HOME/$inst_path"
 done
 
-ln -sf "$PWD/$MACHINE/functions" "$HOME/.functions"
-ln -sf "$PWD/$MACHINE/profile" "$HOME/.profile"
-ln -sf "$PWD/$MACHINE/zprofile" "$HOME/.zprofile"
 ln -sf "$PWD/$MACHINE/zshrc" "$HOME/.zshrc"
+ln -sf "$PWD/$MACHINE/profile" "$HOME/.profile"

noire-carnation/config/cargo/config.toml

@@ -1,6 +1,3 @@
-[net]
-git-fetch-with-cli = true
-
 [target.x86_64-unknown-linux-gnu]
 linker = "gcc"
 rustflags = ["-C", "link-arg=-fuse-ld=mold"]

noire-carnation/config/fuzzel/fuzzel.ini

@@ -1,8 +0,0 @@
-font=Ubuntu Mono
-icons-enabled=false
-
-[colors]
-background=2d353bff
-selection=a7c080ff
-text=d3c6aaff
-selection-text=2d353bff

noire-carnation/config/pacman/makepkg.conf

@@ -23,7 +23,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
-VCSCLIENTS=('bzr::breezy'
+VCSCLIENTS=('bzr::bzr'
             'fossil::fossil'
             'git::git'
             'hg::mercurial'

noire-carnation/config/sway/config

@@ -104,12 +104,12 @@ bindsym $mod+Shift+space floating toggle
 bindsym $mod+space focus mode_toggle
 
 # lock screen
-bindsym --release $mod+escape exec swaylock-blur
+# bindsym --release $mod+Shift+l exec swaylock
 
 # tools
 bindsym $mod+t exec kitty
-bindsym $mod+d exec fuzzel 
-bindsym $mod+w exec clipman pick --tool=CUSTOM --tool-args="fuzzel -d -w 60"
+bindsym $mod+d exec wofi
+bindsym $mod+w exec clipman pick -t wofi
 
 # change focus
 bindsym $mod+h focus left
@@ -200,6 +200,6 @@ exec discord
 exec ibus-daemon -rxR
 
 # window rules
-
 for_window [app_id="org.kde.polkit-kde-authentication-agent-1"] floating enable
 for_window [app_id="org.freedesktop.impl.portal.desktop.kde"] floating enable
+for_window [title="meower"] floating enable; resize set 600 450;

noire-carnation/functions

@@ -1,75 +0,0 @@
-#!/bin/sh 
-
-bmv() {
-	if test -z "$1"; then
-		printf "Usage: %s [files pattern]...\n" "$0" 1>&2
-		return 64 # sysexits.h(3) EX_USAGE
-	fi
-
-	while test -n "$2"; do
-		for file in $1; do
-			mv "$file" "$(printf "%s" "$file" | sed "s/\$2//g")"
-		done
-
-		shift 2
-	done
-}
-
-ix() {
-	curl -F 'f:1=<-' ix.io
-}
-
-myip() {
-	curl icanhazip.com
-}
-
-paclean() {
-	for package in `pacman -Qtq`; do
-		pacman -Qi "$package"
-
-		printf "Uninstall? [y/N] "
-		read resp
-
-		# TODO: Add undo
-		if [ "$resp" != "y" ] && [ "$resp" != "Y" ]; then
-			printf "Skipped %s.\n\n" "$package" 1>&2
-		else
-			printf "Queued %s for uninstall.\n\n" "$package" 1>&2
-			packages="$packages$package "
-		fi
-	done
-	su -c "pacman -Rns $packages"
-}
-
-
-sc() {
-	if test -z "$1"; then
-		printf "Usage: %s URI...\n" "$0" 1>&2
-		return 64 # sysexits.h(3) EX_USAGE
-	fi
-
-	while "$1"; do
-		scdl --original-name --debug -l "$1" >> log 2>&1
-	done
-}
-
-up() { # updates everything on the system
-    command -v apk >/dev/null && su -c 'apk update' 
-    command -v cargo-install-update >/dev/null && cargo install-update --all --git
-    command -v kiss >/dev/null && su -c 'kiss u' && su -c 'kiss U'
-    command -v nvim >/dev/null && nvim +PlugUpdate -c x -c x
-    if command -v paru >/dev/null; then paru
-    elif command -v pacman >/dev/null; then su -c 'pacman -Syyu'; fi
-
-    CWD="$PWD"
-
-    command -v git >/dev/null && \
-    for dir in $HOME/.local/src/git/*/*/*/
-    do
-        printf '%s\n' "$dir"
-        cd "$dir"
-        git pull --all
-    done
-
-    cd "$CWD"
-}

noire-carnation/profile

@@ -43,6 +43,74 @@ GTK_IM_MODULE=ibus; export GTK_IM_MODULE
 QT_IM_MODULE=ibus; export QT_IM_MODULE
 XMODIFIERS=@im=ibus; export XMODIFIERS
 
+# functions
+bmv() {
+	if test -z "$1"; then
+		printf "Usage: %s [files pattern]...\n" "$0" 1>&2
+		return 64 # sysexits.h(3) EX_USAGE
+	fi
+
+	while test -n "$2"; do
+		for file in $1; do
+			mv "$file" "$(printf "%s" "$file" | sed "s/\$2//g")"
+		done
+
+		shift 2
+	done
+}
+
+ix() {
+	curl -F 'f:1=<-' ix.io
+}
+
+myip() {
+	curl icanhazip.com
+}
+
+paclean() {
+	for package in `pacman -Qtq`; do
+		pacman -Qi "$package"
+
+		printf "Uninstall? [y/N] "
+		read resp
+
+		# TODO: Add undo
+		if [ "$resp" != "y" ] && [ "$resp" != "Y" ]; then
+			printf "Skipped %s.\n\n" "$package" 1>&2
+		else
+			printf "Queued %s for uninstall.\n\n" "$package" 1>&2
+			packages="$packages$package "
+		fi
+	done
+	su -c "pacman -Rns $packages"
+}
+
+
+sc() {
+	if test -z "$1"; then
+		printf "Usage: %s URI...\n" "$0" 1>&2
+		return 64 # sysexits.h(3) EX_USAGE
+	fi
+
+	while "$1"; do
+		scdl --original-name --debug -l "$1" >> log 2>&1
+	done
+}
+
+yt() {
+	if test -z "$1"; then
+		printf "Usage: %s URI...\n" "$0" 1>&2
+		return 64 # sysexits.h(3) EX_USAGE
+	fi
+
+	while "$1"; do
+		yt-dlp -vx --split-chapters -o \
+			"chapter:%(fulltitle)s - %(section_number)s %(section_title)s.%(ext)s" \
+			"$1" --audio-quality 0 >> log 2>&1
+		shift
+	done
+}
+
 # aliases
 alias weather="curl 'wttr.in/?0'"
 alias vi="busybox vi"
@@ -53,4 +121,54 @@ case "$SHELL" in
 		set -o vi
 		PS1='$ '
 		;;
+
+	*/zsh )
+		HISTFILE="$XDG_DATA_HOME/zsh/histfile"
+		HISTSIZE=999999999
+		SAVEHIST="$HISTSIZE"
+
+		unsetopt autocd
+		bindkey -v
+		zstyle :compinstall filename "$HOME/.zshrc"
+		autoload -Uz compinit
+		compinit -u -d "$XDG_CACHE_HOME/zsh/zcompdump"
+		setopt rmstarsilent
+
+		# Key (zshmisc(1)):
+		#
+		# '%F{$color}$x%f': Change foreground color of $x to $color
+		# '%B$x%b': Make $x bold
+		# '%n': $USER
+		# '%M': $HOST
+		# '%1~': $PWD, but shows '~' if at $HOME
+		# '%(?.#.%?)':
+		# '%n(x.true.false)' evaluates ternary expression for condition x, where n
+		# is an integer, by default '0':
+		# '?': If the last command’s exit status was 0, true
+		# '#': Prints literal '#' to the prompt
+		# '[%?]': Prints the last exit status with literal brackets surrounding it
+
+		ERR='[%f%F{green}%?%f%F{blue}]%f'
+		ERR_LINE="%(?.#.$ERR)"
+
+		LINE1='%F{blue}╭%f %B%F{blue}%n%f@%F{magenta}%M%f%b'
+		LINE2='%F{blue}│%f %F{green}%B%0~%b%f'
+		LINE3="%F{blue}╰─$ERR_LINE%f "
+
+		PS1="$(printf "%s\n%s\n%s" "$LINE1" "$LINE2" "$LINE3")"; export PS1
+
+		plugindir="/usr/share/zsh/plugins"
+		for plugin in \
+			"$plugindir/zsh-autosuggestions/zsh-autosuggestions.zsh" \
+			"$plugindir/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh" \
+			"$plugindir/zsh-history-substring-search/zsh-history-substring-search.zsh"
+		do
+			source "$plugin"
+		done
+
+		bindkey -a 'k' history-substring-search-up
+		bindkey -a 'j' history-substring-search-down
+
+		alias which="$HOME/.local/bin/which"
+		;;
 esac

noire-carnation/zprofile

@@ -1 +0,0 @@
-test -e "$HOME/.profile" && source "$HOME/.profile"

noire-carnation/zshrc

@@ -1,22 +1 @@
-test -e "$HOME/.functions" && source "$HOME/.functions"
-
-unsetopt autocd
-bindkey -v
-zstyle :compinstall filename "$HOME/.zshrc"
-autoload -Uz compinit
-compinit -u -d "$XDG_CACHE_HOME/zsh/zcompdump"
-setopt rmstarsilent
-
-plugindir="/usr/share/zsh/plugins"
-for plugin in \
-	"$plugindir/zsh-autosuggestions/zsh-autosuggestions.zsh" \
-	"$plugindir/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh" \
-	"$plugindir/zsh-history-substring-search/zsh-history-substring-search.zsh"
-do
-	source "$plugin"
-done
-
-bindkey -a 'k' history-substring-search-up
-bindkey -a 'j' history-substring-search-down
-
-alias which="$HOME/.local/bin/which"
+source "$HOME/.profile"