Merge branch 'main' of github.com:Laitram31/.config

11 files changed, 39 insertions, 83 deletions

diff --git a/.gitignore b/.gitignore
index acfc6a4..7817106 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,11 +13,13 @@ qBittorrent/
 vlc/
 MuseScore/
 libreoffice/
+itch/
 
 ## trashfiles
 .zcompdump
 *~
 QtProject.conf
+gops/
 
 ## other stuff
 scummvm/
diff --git a/dwmblocks/config b/dwmblocks/config
index a75740d..91f8f1d 100644
--- a/dwmblocks/config
+++ b/dwmblocks/config
@@ -1,6 +1,6 @@
 /*Name       State  Update Signal + 34*/
 music      = true  // 35
-cputemp    = false  // 36
+cputemp    = true  // 36
 fanspeed   = false  // 37
 memory     = true  // 38
 battery    = true  // 39
diff --git a/fontconfig/fonts.conf b/fontconfig/fonts.conf
index 903102f..1f32825 100644
--- a/fontconfig/fonts.conf
+++ b/fontconfig/fonts.conf
@@ -29,6 +29,12 @@
             <family>Noto Emoji</family>
         </prefer>
     </alias>
+    <alias>
+	<family>dwm</family>
+	<prefer>
+		<family>Tintin</family>
+	</prefer>
+</alias>
 
 
 </fontconfig>
diff --git a/fontconfig/fonts.conf~ b/fontconfig/fonts.conf~
deleted file mode 100644
index 903102f..0000000
--- a/fontconfig/fonts.conf~
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
-<fontconfig>
-    <alias>
-        <family>serif</family>
-        <prefer>
-            <family>Noto Serif</family>
-            <family>Noto Emoji</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>sans-serif</family>
-        <prefer>
-            <family>Noto Sans</family>
-            <family>Noto Emoji</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>sans</family>
-        <prefer>
-            <family>Noto Sans</family>
-            <family>Noto Emoji</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>monospace</family>
-        <prefer>
-            <family>Cousine Nerd Font</family>
-            <family>Noto Emoji</family>
-        </prefer>
-    </alias>
-
-
-</fontconfig>
diff --git a/scripts/dmenusearch b/scripts/dmenusearch
index b1ed9d6..059be7f 100755
--- a/scripts/dmenusearch
+++ b/scripts/dmenusearch
@@ -70,7 +70,7 @@ emoji() {
 	[ -z "$CHOSEN" ] && return 1
 
 	printf '%s' "$CHOSEN" | xclip -selection clipboard
-	# notify-send "'$CHOSEN' copied to clipboard."
+	herbe "'$CHOSEN' copied to clipboard."
 }
 
 main() {
@@ -82,6 +82,11 @@ main() {
 	aur)
 		aur ;;
 	youtube)
+#		vid="$(ytfzf -D -I raw)"
+#		title="$(echo $vid | sed "s/\s*|.*//g")"
+#		url="https$(echo $vid | sed "s/.*|https//")"
+#		echo "\"$url\"" > "$HOME/music/urls/$title"
+#		pidof mpv > /dev/null || music "auto" "$HOME/music/urls"
 		ytfzf -D
 		return ;;
 	man)
@@ -97,4 +102,4 @@ main() {
 	"$BROWSER" "$query" 2> /dev/null
 }
 
-main "$@"
\ No newline at end of file
+main "$@"
diff --git a/scripts/music b/scripts/music
index a7fe836..d5eeaa3 100755
--- a/scripts/music
+++ b/scripts/music
@@ -1,7 +1,17 @@
 #!/bin/sh
-# simple music selector with dmenu that uses and interacts with mpv
-# have a look at musiccmd, dwmblocks/sb_music and .local/etc/mpv/music
-# shellcheck disable=SC2012
+#                                                      .     :-. .
+#    author:  ratakor <ratakor@disroot.org>            :*==*%%%#%+=---:
+#                                                       :#%%%*+%#=+%*:.
+#    created: Sat, 06 May 2023 18:44:52 +0200            :%%%. .   -*%-
+#    updated: Sat, 01 Jul 2023 18:12:52 +0200             =## .   :#%*=:.
+#                                                         -#*#%:=#%%%#-
+#    description:                                        *:*%%%%%%%#-
+#    simple music selector with dmenu that uses and       .-#%%%%%%+
+#    interacts with mpv. have a look at musiccmd,          %%%--%%%%*-
+#    dwmblocks/sb_music and .local/etc/mpv/music ;)       ##%=  +%%=:..
+#                                                          #*    #%#
+#                                                         :#     -==*
+#   shellcheck disable=SC2012 #                           ::        .:
 
 MUSICDIR="${XDG_MUSIC_DIR:-$HOME/music}"
 
@@ -11,11 +21,11 @@ if [ "$1" = "--shuffle" ]; then
 fi
 
 MUSIC="${1:-$MUSICDIR/$(ls "$MUSICDIR" | dmenu -i -p "Play ")}"
-SCRIPT="$XDG_CONFIG_HOME/mpv/music/local.lua"
+SCRIPT="${XDG_CONFIG_HOME:-$HOME/.config}/mpv/music/local.lua"
 
 if [ "$MUSIC" = "$MUSICDIR/urls" ]; then
 	MUSIC="$(cat "$MUSICDIR/urls/$(ls "$MUSICDIR/urls" | dmenu -i -p "Play ")")"
-	SCRIPT="$XDG_CONFIG_HOME/mpv/music/online.lua"
+	SCRIPT="${XDG_CONFIG_HOME:-$HOME/.config}/mpv/music/online.lua"
 fi
 
 [ "$MUSIC" = "$MUSICDIR/" ] || [ -z "$MUSIC" ] && exit 1
@@ -26,5 +36,5 @@ if [ -z "$SHUFFLE" ] && [ -d "$MUSIC" ] || printf '%s' "$MUSIC" | grep -q playli
 fi
 
 printf 'stop\n' | socat - /tmp/mpvsocket 2> /dev/null
-mpv --vid=no --input-ipc-server=/tmp/mpvsocket --loop-playlist --volume=100\
-	--ytdl-format="wv*+ba" --script="$SCRIPT" --shuffle="$SHUFFLE" "$MUSIC"
+mpv --vid=no --input-ipc-server=/tmp/mpvsocket --loop-playlist\
+	--ytdl-format=ba --script="$SCRIPT" --shuffle="$SHUFFLE" "$MUSIC"
diff --git a/scripts/randwp b/scripts/randwp
index a63271d..da47247 100755
--- a/scripts/randwp
+++ b/scripts/randwp
@@ -2,7 +2,7 @@
 # set a random wallpaper
 # to ignore a folder or a file put it in IGNORE like "file1|folder|file2"
 
-WPDIR="${1:-/home/marcellus/.config/wallpapers}"
+WPDIR="${1:-/home/marcellus/.config/wallpapers/SFW}"
 ALL="$(find "$WPDIR" -type f ! -path '*/.git*' ! -name 'README.md')"
 
 searchwp() {
diff --git a/scripts/test b/scripts/test
deleted file mode 100644
index 999bef1..0000000
--- a/scripts/test
+++ /dev/null
@@ -1 +0,0 @@
-fzdlfhzdk
\ No newline at end of file
diff --git a/sxhkd/sxhkdrc~ b/sxhkd/sxhkdrc~
deleted file mode 100644
index 42bc92f..0000000
--- a/sxhkd/sxhkdrc~
+++ /dev/null
@@ -1,35 +0,0 @@
-# reload with kill -10 $(pidof sxhkd)
-{super + Return,button8}
-       $TERMINAL
-super + d
-      dmenu_run -hp "browser,mail,librewolf,discord,anki,steam,monero-wallet-gui"
-{super + shift + x}
-       slock
-Scroll_Lock
-	themeswap
-Print
-	screenshot
-{super + equal, XF86AudioRaiseVolume}
-    wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+; kill -44 $(pidof dwmblocks)
-{super + minus, XF86AudioLowerVolume}
-    wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-; kill -44 $(pidof dwmblocks)
-XF86Launch1
-    wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)
-F6
-    wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle; kill -45 $(pidof dwmblocks)
-{F7,super + n,super + shift + n}
-    $TERMINAL -e {dmenurecord,lfub "$XDG_DATA_HOME/notes",newsboat}
-super + {m, shift + m}
-    {music,musiccmd}
-XF86Audio{Prev,Next,Play,Stop}
-    musiccmd {prev,next,cycle,stop}
-super + {s,a,y,w,e}
-    dmenusearch {web,aur,youtube,man,emoji}
-super + shift + w
-    dmenuoff
-super + u
-    dmenuhandler "$(xclip -o)"
-{super + shift + u,button2}
-    plumber --sel
-button9
-    xdo kill
\ No newline at end of file
diff --git a/zsh/.zshenv b/zsh/.zshenv
index eba98af..c80ce3a 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -6,5 +6,6 @@ export BRIGHTNESS=1
 
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/data"
+export XDG_PICTURES_DIR="$HOME/img"
 # Following line was automatically added by arttime installer
 export PATH="$HOME/.local/bin:$PATH"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 6dddacf..015f79e 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -23,6 +23,8 @@ alias {statut,sta}="git status"
 alias {ajouter,aj}="git add"
 alias {atome_de_code,ato}="git commit -m" # voir bitoduc.fr, Commit
 alias {pousser,pous}="git push"
+alias {difference,ference}="git diff"
+alias {tronc,tr}="git log"
 
 alias bri5="xrandr --output eDP-1 --brightness 0.5"
 alias bri6="xrandr --output eDP-1 --brightness 0.6"
@@ -30,10 +32,10 @@ alias ascii="ascii -d"
 alias cf="$HOME/.config/"
 alias cspt="$HOME/.config/scripts"
 alias cz="$HOME/.config/zsh"
-alias czr="nv $ZDOTDIR/.zshrc"
+alias czr="v $ZDOTDIR/.zshrc"
 alias cn="$XDG_CONFIG_HOME/nvim"
 alias rps="echo help | nc ratakor.com 9998"
-alias nv="nvim"
+alias v="nvim"
 alias cdmnt="sudo mount -t iso9660 -o ro /dev/sr0 $HOME/cdrom"
 alias py="python3"
 alias wtr="curl wttr.in/Lyon"