Merge remote-tracking branch 'refs/remotes/origin/main'

7 files changed, 37 insertions, 14 deletions

diff --git a/bin/common/ytclipo b/bin/common/ytclipo
index 0ac412c..6cb2fc6 100755
--- a/bin/common/ytclipo
+++ b/bin/common/ytclipo
@@ -9,7 +9,7 @@ echo "inp: ${inp}" 1>&2
 # works when link is from yt-local
 inp="$(echo -n "$inp" | awk -F 'https?://' '{print $NF}')"
 echo "inp: ${inp}" 1>&2
-notify-send "ytclipo" "<b>ytclipo</b><br><i>downloading</i> $inp"
+notify-send "ytclipo" "<b>downloading</b> $inp"
 
 yt-dlp "$inp" \
 	-f "b" \
diff --git a/bin/guiscripts/slmpd b/bin/guiscripts/slmpd
index 1e573ac..96d9cd1 100755
--- a/bin/guiscripts/slmpd
+++ b/bin/guiscripts/slmpd
@@ -2,5 +2,5 @@
 if mpc > /dev/null 2>&1 
 then
 	test "`mpc status %totaltime%`" = "0:00" ||
-		echo -n "$(mpc status "%currenttime%/%totaltime%") $(mpc current)"
+		echo -n " $(mpc status "%currenttime%/%totaltime%") $(mpc -f "[[%title%]|%file%]" | head -n -2) "
 fi
diff --git a/config/X/mpv/mpv.conf b/config/X/mpv/mpv.conf
index 034ec6a..4f5e251 100755
--- a/config/X/mpv/mpv.conf
+++ b/config/X/mpv/mpv.conf
@@ -1,7 +1,7 @@
 profile=gpu-hq
 
 # Set OSD font
-osd-font='Ubuntu Mono'
+osd-font='monospace'
 # Set OSD font size
 osd-font-size=30
 
diff --git a/config/X/mpv/scripts/script-opts/youtube-quality.conf b/config/X/mpv/scripts/script-opts/youtube-quality.conf
index b197714..fc1361b 100755
--- a/config/X/mpv/scripts/script-opts/youtube-quality.conf
+++ b/config/X/mpv/scripts/script-opts/youtube-quality.conf
@@ -25,7 +25,7 @@ scale_playlist_by_window=false
 # these styles will be used for the whole playlist. More specific styling will need to be hacked in
 #
 # (a monospaced font is recommended but not required)
-style_ass_tags={\\fnUbuntu}
+style_ass_tags="{\\fnmonospace}"
 
 # paddings for top left corner
 text_padding_x=1
diff --git a/config/common/newsboat/urls b/config/common/newsboat/urls
index 801d556..839a214 100644
--- a/config/common/newsboat/urls
+++ b/config/common/newsboat/urls
@@ -4,6 +4,7 @@ https://thisweek.gnome.org/index.xml
 https://itsfoss.com/rss
 https://archlinux.org/feeds/news/
 https://www.hln.be/home/rss.xml
+https://suckless.org/atom.xml
 "---VIDEOS---"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCngn7SVujlvskHRvRKc1cTw # Bugswrite
 https://www.youtube.com/feeds/videos.xml?channel_id=UCVls1GmFKf6WlTraIb_IaJg # Distrotube 
@@ -14,6 +15,7 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UC5UAwBUum7CPN5buc-_N1Fw # T
 https://www.youtube.com/feeds/videos.xml?channel_id=UCbTp1BYjpuhDRG5OmgIT8iw # James Tomsaino
 https://www.youtube.com/feeds/videos.xml?channel_id=UC_ML5xP23TOWKUcc-oAE_Eg # Hussein Nasser
 https://www.youtube.com/feeds/videos.xml?channel_id=UCd3dNckv1Za2coSaHGHl5aA # TJ De vries
+https://www.youtube.com/feeds/videos.xml?channel_id=UCaSCt8s_4nfkRglWCvNSDrg # Code Aesthetic
 http://vimcasts.org/feeds/ogg.rss
 "---REDDIT---"
 https://www.reddit.com/r/linux.rss
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index 2e375e1..083ccc0 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -71,7 +71,8 @@ ls.add_snippets("java", {
 	-- function
 	s("fn", fmt(
 	[[
-	{}{} {} ({}) {{
+	{}{} {} ({})
+	{{
 		{}
 	}}
 	]],
@@ -84,7 +85,8 @@ ls.add_snippets("java", {
 	-- constructor
 	s("cst", fmt(
 	[[
-	public {} ({}) {{
+	public {} ({})
+	{{
 		{}
 	}}{}
 	]],
@@ -92,7 +94,8 @@ ls.add_snippets("java", {
 	-- setter function
 	s("sfn", fmt(
 	[[
-	{}void set_{} ({} {}) {{
+	{}void set_{} ({} {})
+	{{
 		this.{} = {};
 	}}{}
 	]],
@@ -101,15 +104,18 @@ ls.add_snippets("java", {
 	-- getter function
 	s("gfn", fmt(
 	[[
-	{}{} get_{} () {{
+	{}{} get_{} ()
+	{{
 		return this.{};
 	}}{}
 	]],
 	{ c(1, {t "public ", t "private ", t ""}), i(2, "type"), i(3), rep(3), i(0)})),
 	s("psv", fmt(
 	[[
-	public class Main {{
-		public static void main (String[] args) {{
+	public class Main
+	{{
+		public static void main (String[] args)
+		{{
 			{}
 		}}
 	}}
@@ -118,16 +124,28 @@ ls.add_snippets("java", {
 	-- constructor
 	s("class", fmt(
 	[[
-	{}class {} {{
+	{}class {}
+	{{
 		{}
 	}}
 	]],
 	{ c(1, {t "public ", t "private ", t ""}), i(2), i(0)})),
+	-- StringBuilder
+	s("sb", fmt(
+	[[
+	public void print()
+	{{
+		StringBuilder sb = new StringBuilder(30);
+		sb.append({});
+		sb.append(", ").append({});{}
+		System.out.print(sb.toString());
+	}}{}
+	]],
+	{ i(1), i(2), i(3), i(0)})),
 	-- print
 	parse("pt", "System.out.println($1);$0", {}),
 	parse("pti", "System.out.println(\"$1: \" + $1);$0", {}),
-	parse("abs", "Math.abs($1);$0", {}),
-	-- quick
+	-- quickies 
 	s("pr", t "private "),
 	s("ob", fmt(
 	[[
@@ -135,6 +153,7 @@ ls.add_snippets("java", {
 	{}
 	]],
 	{ i(1), i(2), rep(1), i(3), i(0) })),
+	parse("abs", "Math.abs($1);$0", {}),
 })
 
 ls.add_snippets("sh", {
diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index a45a684..0e18eb7 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -100,7 +100,7 @@ alias -g cx='chmod +x'
 alias -g ch='chown ${USER}:${USER} -R'
 alias -g hl='--help |& less -r'
 alias -g pi='ping archlinux.org -c4'
-alias -g sba='source bin/activate'
+alias -g sba='source env/bin/activate || source bin/activate'
 alias -g smc='systemctl'
 alias -g smcu='systemctl --user'
 alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
@@ -113,8 +113,10 @@ alias -g eza='$EDITOR ${ZDOTDIR}/aliases.zsh'
 alias -g eto='$EDITOR ~/sync/TODO'
 alias -g edw='$EDITOR ~/src/dwm/config.def.h'
 alias -g edm='$EDITOR ~/src/dmenu/config.def.h'
+alias -g ehist='$EDITOR $ZDOTDIR/histfile'
 alias -g est='$EDITOR ~/src/st/config.def.h'
 alias -g esl='$EDITOR ~/src/slock/config.def.h'
+alias -g esls='$EDITOR ~/src/slstatus/config.def.h'
 alias -g cfdef='$EDITOR config.def.h'
 alias -g cdo='$HOME/src/dotfiles'