Merge branch 'main' of /var/git/dotfiles

12 files changed, 69 insertions, 52 deletions

diff --git a/config/X/dunst/dunstrc b/config/X/dunst/dunstrc
index 71998b9..6127474 100644
--- a/config/X/dunst/dunstrc
+++ b/config/X/dunst/dunstrc
@@ -30,10 +30,10 @@
     height = 80
 
     # Position the notification in the top right corner
-    origin = top-center
+    origin = right
 
     # Offset from the origin
-    offset = 0x10
+    offset = 10x10
 
     # Scale factor. It is auto-detected if value is 0.
     scale = 0
@@ -87,7 +87,7 @@
 
     # Defines width in pixels of frame around the notification window.
     # Set to 0 to disable.
-    frame_width = 1
+    frame_width = 0
 
     # Defines color of the frame around the notification window.
     frame_color = "#969B95"
@@ -96,7 +96,7 @@
     # If value is greater than 0, separator_height will be ignored and a border
     # of size frame_width will be drawn around each notification instead.
     # Click events on gaps do not currently propagate to applications below.
-    gap_size = 2
+    gap_size = 4
 
     # Define a color for the separator.
     # possible values are:
@@ -118,11 +118,11 @@
 
     ### Text ###
 
-    font = mononoki nerd font mono 10
+    font = mononoki nerd font mono 11
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
-    line_height = 11
+    line_height = 7
 
     # Possible values are:
     # full: Allow a small subset of html markup in notifications:
@@ -158,7 +158,7 @@
     #   %n  progress value if set without any extra characters
     #   %%  Literal %
     # Markup is allowed
-    format = "%b"
+	format = "[<u>%s</u>]\n%b"
 
     # Alignment of message text.
     # Possible values are "left", "center" and "right".
@@ -181,13 +181,13 @@
     ignore_newline = no
 
     # Stack together notifications with the same content
-    stack_duplicates = false
+    stack_duplicates = true
 
     # Hide the count of stacked notifications with the same content
     hide_duplicate_count = false
 
     # Display indicators for URLs (U) and actions (A).
-    show_indicators = no
+    show_indicators = yes
 
     ### Icons ###
 
@@ -310,13 +310,13 @@
     # Otherwise the "#" and following would be interpreted as a comment.
     # Icon for notifications with low urgency, uncomment to enable
     #default_icon = /path/to/icon
-    background = "#d08770"
-    foreground = "#2E3541"
+    background = "#b48ead"
+    foreground = "#2e3440"
     frame_color = "#81a1c1"
     timeout = 6
 
 [urgency_normal]
-    background = "#b48ead"
+    background = "#81a1c1"
     foreground = "#2e3440"
     frame_color = "#2e3440"
     timeout = 5
@@ -324,9 +324,10 @@
     #default_icon = /path/to/icon
 
 [urgency_critical]
-    background = "#b48ead"
-    foreground = "#d8dee9"
+    background = "#d08770"
+    foreground = "#2e3440"
     frame_color = "#81a1c1"
+	format = "[<u>%s</u>]\n<b>%b</b>"
     timeout = 0
     # Icon for notifications with critical urgency, uncomment to enable
     #default_icon = /path/to/icon
diff --git a/config/common/mpv/mpv.conf b/config/common/mpv/mpv.conf
index 4f5e251..7d9d1fe 100755
--- a/config/common/mpv/mpv.conf
+++ b/config/common/mpv/mpv.conf
@@ -26,3 +26,5 @@ force-seekable=yes
 
 slang=eng, en, english
 alang=jpn
+
+screenshot-directory=~/pics/screenshots
diff --git a/config/common/ncmpcpp/bindings b/config/common/ncmpcpp/bindings
index d2a5eb6..b7921e7 100644
--- a/config/common/ncmpcpp/bindings
+++ b/config/common/ncmpcpp/bindings
@@ -194,9 +194,9 @@ def_key "p"
 def_key "P"
   play
 
-def_key "H"
+def_key "g"
 	move_home
-def_key "L"
+def_key "G"
 	move_end
 
 def_key "ctrl-u"
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index 7c6d87f..e59b81a 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -15,6 +15,8 @@ vim.keymap.set("i", "\\\\", "\\", { noremap = true })
 vim.keymap.set("n", "gb", "<cmd>buffers<cr>:buffer<Space>", { noremap = true })
 vim.keymap.set("n", "<Leader>q", "<cmd>q!<cr>", { noremap = true })
 vim.keymap.set("n", "<Leader>Q", "<cmd>qa!<cr>", { noremap = true })
+-- close all except focused buffer
+vim.keymap.set("n", "<leader>1", "<cmd>%bd|e#<cr>", { noremap = true })
 
 -- Windows
 vim.keymap.set("n", "<A-h>", "<C-W>h", { noremap = true })
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index d8675d4..0665533 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -5,9 +5,9 @@ then
 	clear
 	if [ "/dev/tty1" = "$TTY" ]
 	then
-		startw > /dev/null 2>&1
+		exec startw > /dev/null 2>&1
 	else
-		startx > /dev/null 2>&1
+		exec startx > /dev/null 2>&1
 	fi
 	exit
 fi
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index 3884582..461546a 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -128,6 +128,7 @@ alias xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HD
 alias d='du -d 0 -h'
 alias dud='du .* * -d 0 -h 2>/dev/null | sort -h'
 alias df='df -h'
+alias diff='diff -u --color'
 alias shred='shred -uz'
 alias lsblk='lsblk -o name,type,fsused,fsavail,size,fstype,label,mountpoint'
 alias floc='doas find / -type "f" 2> /dev/null | grep'
@@ -181,7 +182,7 @@ alias wf='doas wipefs -a'
 alias dmci="doas make clean install"
 alias rmd='rm -f *.{orig,rej}'
 alias cdzot='mkdir -p /tmp/zottesite && cd /tmp/zottesite'
-alias gdate="date +%y%m%d_%H%M%S"
+alias gdate='date +%y_%m_%d-%T'
 alias tpid='tail -f /dev/null --pid'
 
 alias vbm='vboxmanage'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index 671e6fb..3c5f11f 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -39,23 +39,30 @@ nnn() { test -z "$NNNLVL" && /usr/bin/nnn "$@" || exit }
 ranger() { test -z "$RANGER_LEVEL" && /usr/bin/ranger "$@" || exit }
 
 # googoo aliases
-ff () { goo f "$1" | fzf }
-fd () { goo d "$1" | fzf }
-fdf () { goo f "$1" | fzf | xargs -I {} dirname "{}" }
+_googoo_fzf_opt ()
+{
+	if [ "$1" ]
+	then
+		[ -d "$1" ] && dest="$1" || opt="-q $1"
+	fi
+}
 o ()
 {
-	f="$(ff $1)"
+	_googoo_fzf_opt "$1"
+	f="$(goo f "dest" | fzf $opt)"
 	test "$1" && shift
-	test -n "$f" && $EDITOR $@ "$f"
+	test -f "$f" && $EDITOR $@ "$f"
 }
 go ()
 {
-	d="$(fd $1)"
+	_googoo_fzf_opt "$1"
+	d="$(goo d "$dest" | fzf $opt)"
 	test -d "$d" && cd "$d"
 }
 ogo ()
 {
-	d="$(fdf $1)"
+	_googoo_fzf_opt "$1"
+	d="$(dirname "$(goo f "$dest")" | fzf $opt)"
 	test -d "$d" && cd "$d"
 }
 
@@ -69,7 +76,13 @@ ipc ()
    fi
 }
 
-calc () { echo "$@" | bc -l }
+calc () { echo "$@" | bc -l | numfmt --grouping; }
+
+psgrep ()
+{
+	[ $# -eq 0 ] && return 1
+	pgrep "$@" | xargs ps
+}
 
 unique () {
 	local f
diff --git a/config/extra/tridactyl/tridactylrc b/config/extra/tridactyl/tridactylrc
index 2de07b4..f7e1935 100644
--- a/config/extra/tridactyl/tridactylrc
+++ b/config/extra/tridactyl/tridactylrc
@@ -60,3 +60,11 @@ bind gpdy tabopen http://debuc.com:9010
 
 " For syntax highlighting see https://github.com/tridactyl/vim-tridactyl
 " vim: set filetype=tridactyl
+
+modeindicatormodes.normal true
+set modeindicatormodes.insert true
+set modeindicatormodes.input true
+set modeindicatormodes.ignore false
+set modeindicatormodes.ex true
+set modeindicatormodes.hint true
+set modeindicatormodes.visual true
diff --git a/config/home/.zshenv b/config/home/.zshenv
index d1cd73a..9a8206c 100644
--- a/config/home/.zshenv
+++ b/config/home/.zshenv
@@ -19,11 +19,16 @@ export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export GNUPGHOME="$XDG_CONFIG_HOME"/gnupg
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc-2.0
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
-export NVM_DIR="$XDG_DATA_HOME/nvm"
+export NVM_DIR="$XDG_DATA_HOME"/nvm
 export W3M_DIR="$XDG_STATE_HOME"/w3m
 export GOPATH="$XDG_DATA_HOME"/go
 export GOMODCACHE="$XDG_CACHE_HOME"/go/mod
 export TNS_ADMIN=/opt/oracle/instantclient_21_9/network/admin
+export WGETRC="$XDG_CONFIG_HOME"/wgetrc
+export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
+export PARALLEL_HOME="$XDG_CONFIG_HOME"/parallel
+export MYSQL_HISTFILE="$XDG_DATA_HOME"/mysql_history
+export RANDFILE="$XDG_CACHE_HOME"/rnd
 
 export XINITRC="$XDG_CONFIG_HOME/x11"/xinitrc
 export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
diff --git a/config/hyprland/hypr/startup.sh b/config/hyprland/hypr/startup.sh
index 83fefe4..6d5957f 100755
--- a/config/hyprland/hypr/startup.sh
+++ b/config/hyprland/hypr/startup.sh
@@ -5,3 +5,4 @@ gammastep &
 wl-paste --watch cliphist store &
 keyadd id_rsa &
 swayidle 300 locker &
+$TERMINAL &
diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index d2bad38..0fc585f 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -1,28 +1,14 @@
 {
 	"layer": "top",
-	"modules-left": ["battery", "clock", "hyprland/workspaces", "mpd"],
-	"modules-center": ["hyprland/window"],
+	"modules-left": ["battery", "hyprland/workspaces", "mpd", "hyprland/window"],
+	"modules-center": ["clock"],
 	"modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"],
-	"hyprland/workspaces": {
-		"format": "{icon}",
-		"format-icons": {
-			"1": "I",
-			"2": "II",
-			"3": "III",
-			"4": "IV",
-			"5": "V",
-			"6": "VI",
-			"7": "VII",
-			"8": "VIII",
-			"9": "IX",
-		},
-	},
 	"mpd": {
 		"tooltip": false,
 		"format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
 		"artist-len": 24,
-		"format-disconnected": "",
-		"format-stopped": "",
+		"format-disconnected": "s",
+		"format-stopped": "s",
 		"state-icons": {
 			"playing": "",
 			"paused": "",
@@ -78,8 +64,8 @@
 		"restart-interval": 3,
 	},
 	"clock": {
-		"format": "{:%H:%M}",
-		"format-alt": "{:(%R) %A %d %B}",
+		"format": "{:%R}",
+		"format-alt": "{:(%T) %A %d %B}",
 		"interval": 1,
 	},
 	"tray": {
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index 589cc12..61378fd 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -38,7 +38,6 @@ window#waybar.PCSX2 #window {
 }
 
 #mpd, #battery,
-#window,
 #custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory {
 	margin-left: 8px;
 	padding-left: 16px;
@@ -47,7 +46,6 @@ window#waybar.PCSX2 #window {
 }
 
 #workspaces, #mpd, #battery, #clock,
-#window,
 #custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
 	border: solid @background 2px;
 	margin-top: 4px;
@@ -108,8 +106,8 @@ window#waybar.PCSX2 #window {
 }
 
 #window {
-	color: @background;
-	background: @color4;
+	padding-left: 16px;
+	color: @color4;
 }
 
 #custom-wireguard {