From 2f4b65e84b6af20b55c73d305461d40f90212c37 Mon Sep 17 00:00:00 2001
From: emma <emma@tebibyte.media>
Date: Mon, 18 Dec 2023 12:47:55 -0700
Subject: [PATCH] made more current

---
 noire-carnation/config/git/config     |  2 +-
 noire-carnation/config/mpv/mpv.conf   |  1 +
 noire-carnation/config/nvim/init.vim  | 13 ++++++++---
 noire-carnation/config/paru/paru.conf |  2 +-
 noire-carnation/config/sway/config    | 13 ++++-------
 noire-carnation/config/wofi/config    |  4 ----
 noire-carnation/functions             | 32 ++++++++++++++++++---------
 noire-carnation/profile               |  4 ++++
 noire-carnation/zshenv                | 28 +++++++++++++++++++++++
 noire-carnation/zshrc                 |  4 ++++
 10 files changed, 74 insertions(+), 29 deletions(-)
 delete mode 100644 noire-carnation/config/wofi/config
 create mode 100644 noire-carnation/zshenv

diff --git a/noire-carnation/config/git/config b/noire-carnation/config/git/config
index 2166ad2..46fc68b 100644
--- a/noire-carnation/config/git/config
+++ b/noire-carnation/config/git/config
@@ -1,7 +1,7 @@
 [user]
 	name = emma
 	email = emma@tebibyte.media
-	signingkey = 6D661C738815E7DD
+	signingkey = 06FA419A1698C270
 [init]
 	defaultBranch = main
 [core]
diff --git a/noire-carnation/config/mpv/mpv.conf b/noire-carnation/config/mpv/mpv.conf
index 54deb30..18e152e 100644
--- a/noire-carnation/config/mpv/mpv.conf
+++ b/noire-carnation/config/mpv/mpv.conf
@@ -2,6 +2,7 @@
 border=no
 osc=no
 save-position-on-quit
+volume=50
 
 # subs
 embeddedfonts=no
diff --git a/noire-carnation/config/nvim/init.vim b/noire-carnation/config/nvim/init.vim
index 08b2de5..238e32b 100644
--- a/noire-carnation/config/nvim/init.vim
+++ b/noire-carnation/config/nvim/init.vim
@@ -6,6 +6,14 @@ 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
 
 call plug#begin('~/.config/nvim/plugged')
 
@@ -14,18 +22,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()
 
 >
diff --git a/noire-carnation/config/paru/paru.conf b/noire-carnation/config/paru/paru.conf
index d9bb12d..b1d5cf4 100644
--- a/noire-carnation/config/paru/paru.conf
+++ b/noire-carnation/config/paru/paru.conf
@@ -18,7 +18,7 @@ BottomUp
 RemoveMake
 SudoLoop = true
 #UseAsk
-#SaveChanges
+SaveChanges
 CombinedUpgrade
 CleanAfter
 #UpgradeMenu
diff --git a/noire-carnation/config/sway/config b/noire-carnation/config/sway/config
index 296de45..34b0c9b 100644
--- a/noire-carnation/config/sway/config
+++ b/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
 
@@ -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"
diff --git a/noire-carnation/config/wofi/config b/noire-carnation/config/wofi/config
deleted file mode 100644
index 4c6d12c..0000000
--- a/noire-carnation/config/wofi/config
+++ /dev/null
@@ -1,4 +0,0 @@
-gtk_dark=true
-show=run
-run-always_parse_args=true
-term=kitty
diff --git a/noire-carnation/functions b/noire-carnation/functions
index 495ebc2..8f67cb3 100755
--- a/noire-carnation/functions
+++ b/noire-carnation/functions
@@ -1,18 +1,21 @@
 #!/bin/sh 
 
 bmv() {
+	set -x
 	if test -z "$1"; then
-		printf "Usage: %s [files pattern]...\n" "$0" 1>&2
+		printf "Usage: %s pattern pattern1 [pattern2]\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
+	for file in $1; do
+		newfile="$(printf '%s\n' "$file" | sed "s;$2;$3;g")"
 
-		shift 2
+		if [ "$file" != "$newfile" ]
+		then
+			mv "$file" "$newfile"
+		fi
 	done
+	set +x
 }
 
 ix() {
@@ -23,6 +26,16 @@ 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"
@@ -41,16 +54,13 @@ paclean() {
 	su -c "pacman -Rns $packages"
 }
 
-
 sc() {
 	if test -z "$1"; then
-		printf "Usage: %s URI...\n" "$0" 1>&2
+		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
+	scdl --original-name --debug -l "$1" >> log 2>&1
 }
 
 up() { # updates everything on the system
diff --git a/noire-carnation/profile b/noire-carnation/profile
index 0858d5c..0c0cde4 100644
--- a/noire-carnation/profile
+++ b/noire-carnation/profile
@@ -42,10 +42,14 @@ 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
+YTPICK="fuzzel --dmenu -w 80"; export YTPICK
+YT_PL_DIR="$XDG_DATA_HOME/yt"; export YT_PL_DIR
+PLAYER=mpv; export PLAYER
 
 # aliases
 alias weather="curl 'wttr.in/?0'"
 alias vi="busybox vi"
+alias tar="bsdtar"
 
 # zsh configuration settings
 case "$SHELL" in
diff --git a/noire-carnation/zshenv b/noire-carnation/zshenv
new file mode 100644
index 0000000..236c678
--- /dev/null
+++ b/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
diff --git a/noire-carnation/zshrc b/noire-carnation/zshrc
index 67fff4c..66f8fc5 100644
--- a/noire-carnation/zshrc
+++ b/noire-carnation/zshrc
@@ -19,4 +19,8 @@ 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"