updated for newest changes

install.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+test -n "$DEBUG" && set -x
+
 if test -z "$1"; then
 	printf "Usage: %s machine\n" "$0" 1>&2
 	exit 64 # sysexits.h(3) EX_USAGE
@@ -18,11 +20,19 @@ esac
 
 for item in "$MACHINE"/config/*
 do
-	inst_path="$(printf "%s\n" "$item" | sed "s/$MACHINE\/config\///g")"
+	name="$(printf "%s\n" "$item" | sed "s;$MACHINE/config/;;g")"
+	echo $name
 
-	printf "Creating symlink from %s to %s\n" "$PWD/$item" "$XDG_CONFIG_HOME/$inst_path" 1>&2
-	ln -sf "$PWD/$item" "$XDG_CONFIG_HOME/$inst_path"
+	printf "Creating symlink from %s to %s\n" \
+		"$PWD/$item" "$XDG_CONFIG_HOME/$name" 1>&2
+
+	if test -n "$DEBUG"; then continue; fi
+
+	rm "$XDG_CONFIG_HOME/$name" || true
+	ln -s "$PWD/$item" "$XDG_CONFIG_HOME/$name"
 done
 
-ln -sf "$PWD/$MACHINE/zshrc" "$HOME/.zshrc"
+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"

noire-carnation/config/cargo/config.toml

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

noire-carnation/config/foot/everforest-dark-hard.ini

@@ -0,0 +1,22 @@
+# -*- conf -*-
+# Everforest
+
+[colors]
+background=272e33
+foreground=d3c6aa
+regular0=343f44
+regular1=e67e80
+regular2=a7c080
+regular3=dbbc7f
+regular4=7fbbb3
+regular5=d699b6
+regular6=83c092
+regular7=859289
+bright0=3d484d
+bright1=e67e80
+bright2=a7c080
+bright3=dbbc7f
+bright4=7fbbb3
+bright5=d699b6
+bright6=83c092
+bright7=9da9a0

noire-carnation/config/foot/foot.ini

@@ -0,0 +1,34 @@
+dpi-aware=yes
+font=Ubuntu Mono:size=22
+pad=6x6
+
+[cursor]
+blink=yes
+style=underline
+underline-thickness=3px
+
+[mouse]
+hide-when-typing=yes
+
+[scrollback]
+indicator-position=none
+
+[colors] # Everforest Dark Hard
+background=272e33
+foreground=d3c6aa
+regular0=343f44
+regular1=e67e80
+regular2=a7c080
+regular3=dbbc7f
+regular4=7fbbb3
+regular5=d699b6
+regular6=83c092
+regular7=859289
+bright0=3d484d
+bright1=e67e80
+bright2=a7c080
+bright3=dbbc7f
+bright4=7fbbb3
+bright5=d699b6
+bright6=83c092
+bright7=9da9a0

noire-carnation/config/fuzzel/fuzzel.ini

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

noire-carnation/config/git/config

@@ -1,7 +1,7 @@
 [user]
 	name = emma
 	email = emma@tebibyte.media
-	signingkey = 6D661C738815E7DD
+	signingkey = 06FA419A1698C270
 [init]
 	defaultBranch = main
 [core]

noire-carnation/config/kitty/current-theme.conf

@@ -1,70 +0,0 @@
-# vim:ft=kitty
-## name: Everforest Dark Hard
-## author: Sainnhe Park
-## license: MIT
-## upstream: https://github.com/ewal/kitty-everforest/blob/master/themes/everforest_dark_hard.conf
-## blurb: A green based color scheme designed to be warm and soft
-
-foreground                      #d3c6aa
-background                      #272e33
-selection_foreground            #9da9a0
-selection_background            #4c3743
-
-cursor                          #d3c6aa
-cursor_text_color               #2e383c
-
-url_color                       #7fbbb3
-
-active_border_color             #a7c080
-inactive_border_color           #4f5b58
-bell_border_color               #e69875
-visual_bell_color               none
-
-wayland_titlebar_color          system
-macos_titlebar_color            system
-
-active_tab_background           #272e33
-active_tab_foreground           #d3c6aa
-inactive_tab_background         #374145
-inactive_tab_foreground         #9da9a0
-tab_bar_background              #2e383c
-tab_bar_margin_color            none
-
-mark1_foreground                #272e33
-mark1_background                #7fbbb3
-mark2_foreground                #272e33
-mark2_background                #d3c6aa
-mark3_foreground                #272e33
-mark3_background                #d699b6
-
-#: black
-color0                          #343f44
-color8                          #3d484d
-
-#: red
-color1                          #e67e80
-color9                          #e67e80
-
-#: green
-color2                          #a7c080
-color10                         #a7c080
-
-#: yellow
-color3                          #dbbc7f
-color11                         #dbbc7f
-
-#: blue
-color4                          #7fbbb3
-color12                         #7fbbb3
-
-#: magenta
-color5                          #d699b6
-color13                         #d699b6
-
-#: cyan
-color6                          #83c092
-color14                         #83c092
-
-#: white
-color7                          #859289
-color15                         #9da9a0

noire-carnation/config/kitty/kitty.conf

@@ -1,18 +0,0 @@
-font_family Ubuntu Mono
-bold_font auto
-italic_font auto
-bold_italic_font auto
-
-cursor_shape underline
-cursor_underline_thickness 1
-cursor_blink_interval -1
-
-enable_audio_bell no
-tab_bar_style	separator
-
-window_padding_width 5
-
-# BEGIN_KITTY_THEME
-# Everforest Dark Hard
-include current-theme.conf
-# END_KITTY_THEME

noire-carnation/config/mpv/mpv.conf

@@ -2,6 +2,7 @@
 border=no
 osc=no
 save-position-on-quit
+volume=50
 
 # subs
 embeddedfonts=no
@@ -17,7 +18,7 @@ hwdec=auto
 profile=gpu-hq
 # scale=ewa_lanczossharp
 # cscale=ewa_lanczossoft
-video-sync=display-resample
+# video-sync=display-resample
 linear-downscaling=no
 framedrop=no
 

noire-carnation/config/nvim/init.vim

@@ -6,6 +6,21 @@ set ruler
 set colorcolumn=80
 set nowrap
 set tabstop=2
+set shiftwidth=2
+set noexpandtab
+
+" Override ftplugins so nvim respects noexpandtab
+augroup GlobalOverrides
+  autocmd!
+  autocmd FileType * setlocal noexpandtab tabstop=2 shiftwidth=2
+augroup END
+
+
+" Run rust-analyzer(1) for singular Rust files
+augroup RustOverrides
+	autocmd!
+	autocmd FileType rust RustStartStandaloneServerForBuffer
+augroup END
 
 call plug#begin('~/.config/nvim/plugged')
 
@@ -14,18 +29,17 @@ Plug 'neovim/nvim-lspconfig'
 Plug 'vim-airline/vim-airline'
 Plug 'lervag/vimtex'
 Plug 'ap/vim-css-color'
-Plug 'rust-lang/rust.vim'
 Plug 'kyazdani42/nvim-web-devicons'
 Plug 'simrat39/rust-tools.nvim'
-Plug 'sheerun/vim-polyglot'
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-Plug 'onsails/lspkind-nvim'
 Plug 'editorconfig/editorconfig-vim'
 Plug 'williamboman/mason.nvim', { 'do': ':MasonUpdate' }
 Plug 'williamboman/mason-lspconfig.nvim'
+Plug 'lukas-reineke/indent-blankline.nvim'
 
 call plug#end()
 
+lua require("ibl").setup()
 lua require("mason").setup()
 
 >

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::bzr'
+VCSCLIENTS=('bzr::breezy'
             'fossil::fossil'
             'git::git'
             'hg::mercurial'
@@ -38,9 +38,7 @@ CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection -fuse-ld=mold"
+#CFLAGS=""
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"

noire-carnation/config/paru/paru.conf

@@ -18,7 +18,7 @@ BottomUp
 RemoveMake
 SudoLoop = true
 #UseAsk
-#SaveChanges
+SaveChanges
 CombinedUpgrade
 CleanAfter
 #UpgradeMenu

noire-carnation/config/sway/config

@@ -30,25 +30,25 @@ bar {
 }
 
 exec /usr/lib/xdg-desktop-portal -r &
-exec /usr/lib/xdg-desktop-portal-kde;
+exec /usr/lib/xdg-desktop-portal-kde
+exec /usr/lib/xdg-desktop-portal-wlr
 
 exec /usr/lib/polkit-kde-authentication-agent-1
 
 exec wl-paste -t text --watch clipman store
-exec wl-paste -p -t text --watch clipman store -P --histpath="$XDG_DATA_DIR/clipman-primary.json"
+exec wl-paste -p -t text --watch clipman store -P --histpath="$XDG_DATA_HOME/clipman-primary.json"
 
 exec pipewire &
-exec libinput-gestures
 exec mako
 
 exec swayflashy
+exec autotiling-rs
 
 # swayidle timeout 30 "makoctl set-mode away" resume "makoctl set-mode default"
 
 exec eval (ssh-agent -c)
 
 # set wallpaper
-exec wal -i $XDG_PICTURES_DIR/wallpapers/73085922_p0.jpg
 exec swaybg -i $XDG_PICTURES_DIR/wallpapers/73085922_p0.jpg
 
 # set pactl to adjust volume in pipewire-pulse
@@ -62,10 +62,6 @@ bindsym XF86AudioPause exec playerctl play-pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
-# increase and decrease screen brightness
-bindsym XF86MonBrightnessUp exec light -T 1.25
-bindsym XF86MonBrightnessDown exec light -T 0.75
-
 # screenshot with grim
 bindsym $mod+Print mode "screenshot"; exec killall swayflashy
 
@@ -104,12 +100,12 @@ bindsym $mod+Shift+space floating toggle
 bindsym $mod+space focus mode_toggle
 
 # lock screen
-# bindsym --release $mod+Shift+l exec swaylock
+bindsym --release $mod+escape exec swaylock --screenshots --effect-blur 7x7
 
 # tools
-bindsym $mod+t exec kitty
-bindsym $mod+d exec wofi
-bindsym $mod+w exec clipman pick -t wofi
+bindsym $mod+t exec foot
+bindsym $mod+d exec fuzzel 
+bindsym $mod+w exec clipman pick --tool=CUSTOM --tool-args="fuzzel -d -w 60"
 
 # change focus
 bindsym $mod+h focus left
@@ -123,7 +119,6 @@ bindsym $mod+Shift+j move down
 bindsym $mod+Shift+k move up
 bindsym $mod+Shift+l move right
 
-
 # workspaces
 
 set $ws1 "1"
@@ -200,6 +195,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/config/waybar/style.css

@@ -1,5 +1,3 @@
-@import "/home/emma/.cache/wal/colors-waybar.css";
-
 /*
  ********************************************
  *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*

noire-carnation/config/wofi/config

@@ -1,4 +0,0 @@
-gtk_dark=true
-show=run
-run-always_parse_args=true
-term=kitty

noire-carnation/functions

@@ -0,0 +1,84 @@
+#!/bin/sh 
+
+bmv() {
+	if test -z "$1"; then
+		printf "Usage: %s pattern pattern1 [pattern2]\n" "$0" 1>&2
+		return 64 # sysexits.h(3) EX_USAGE
+	fi
+
+	for file in $1; do
+		newfile="$(printf '%s\n' "$file" | sed "s;$2;$3;g")"
+
+		if [ "$file" != "$newfile" ]
+		then
+			mv "$file" "$newfile"
+		fi
+	done
+}
+
+ix() {
+	curl -F 'f:1=<-' ix.io
+}
+
+myip() {
+	curl icanhazip.com
+}
+
+honse() {
+	if test -z "$2"; then
+		printf "Usage: %s season episode\n" "$0"
+		return 64 # syexits.h(3) EX_USAGE
+	else
+		mpv "https://ypdl.gdn/files/YP-1S-$1x$2.mkv"
+	fi
+}
+
+#TODO: Really needs fixed
+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
+
+	scdl --original-name --debug -l "$1" >> log 2>&1
+}
+
+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
+	command -v rustup >/dev/null && rustup update
+
+	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

@@ -2,12 +2,21 @@
 
 ## system
 BROWSER=firefox; export BROWSER
-CC=cc; export CC
 EDITOR=nvim; export EDITOR
-LD_LIBRARY_PATH="$HOME/.local/lib:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH
 PAGER=less; export PAGER
 PATH="$HOME/.local/bin:$HOME/.local/games:$PATH"; export PATH
 
+### compilation
+CC=cc; export CC
+CFLAGS="-march=native -mtune=native -O2 -pipe -fno-plt -fexceptions \
+	-Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+	-fstack-clash-protection -fcf-protection -fuse-ld=mold"
+export CFLAGS
+LD_LIBRARY_PATH="$HOME/.local/lib:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH
+RUSTFLAGS="-Clink-arg=-fuse-ld=mold -Copt-level=z -Ccodegen-units=1 \
+	-Cpanic=abort -Clto=y -Cstrip=symbols -Ctarget-cpu=native -Cembed-bitcode=yes"
+export RUSTFLAGS
+
 ## XDG
 XDG_CACHE_HOME="$HOME/.var/cache"; export XDG_CACHE_HOME
 XDG_CONFIG_HOME="$HOME/.local/etc"; export XDG_CONFIG_HOME
@@ -42,78 +51,15 @@ QT_QPA_PLATFORMTHEME=qt5ct; export QT_QPA_PLATFORMTHEME
 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
-}
+YTPICK="fuzzel --dmenu -w 80"; export YTPICK
+YT_PL_DIR="$XDG_DATA_HOME/yt"; export YT_PL_DIR
+PLAYER=mpv; export PLAYER
 
 # aliases
+alias ffmpreg='ffmpeg'
+alias tar='bsdtar'
+alias vi='ovi'
 alias weather="curl 'wttr.in/?0'"
-alias vi="busybox vi"
 
 # zsh configuration settings
 case "$SHELL" in
@@ -121,54 +67,4 @@ 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

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

noire-carnation/zshenv

@@ -0,0 +1,28 @@
+HISTFILE="$XDG_DATA_HOME/zsh/histfile"
+HISTSIZE=999999999
+SAVEHIST="$HISTSIZE"
+
+# 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
+
+GPG_TTY="$(tty)"; export GPG_TTY

noire-carnation/zshrc

@@ -1 +1,26 @@
-source "$HOME/.profile"
+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
+
+# aliases
+alias weather="curl 'wttr.in/?0'"
+alias vi="busybox vi"
+alias tar="bsdtar"
+alias which="$HOME/.local/bin/which"