more cleanup + updates

8 files changed, 50 insertions, 83 deletions

diff --git a/.config/X11/dark b/.config/X11/dark
deleted file mode 100644
index 3b6781e..0000000
--- a/.config/X11/dark
+++ /dev/null
@@ -1,19 +0,0 @@
-*.color0:  #484f58
-*.color1:  #ffa198
-*.color2:  #56d364
-*.color3:  #e3b341
-*.color4:  #79c0ff
-*.color5:  #d2a8ff
-*.color6:  #56d4dd
-*.color7:  #b1bac4
-*.color8:  #6e7681
-*.color9:  #ff7b72
-*.color10: #3fb950
-*.color11: #d29922
-*.color12: #58a6ff
-*.color13: #bc8cff
-*.color14: #39c5cf
-*.color15: #ffffff
-
-*.foreground: #e6edf3
-*.background: #0d1117
diff --git a/.config/X11/light b/.config/X11/light
deleted file mode 100644
index 2ce02f2..0000000
--- a/.config/X11/light
+++ /dev/null
@@ -1,19 +0,0 @@
-*.color0:  #d1d5da
-*.color1:  #cb2431
-*.color2:  #22863a
-*.color3:  #b08800
-*.color4:  #005cc5
-*.color5:  #5a32a3
-*.color6:  #3192aa
-*.color7:  #6a737d
-*.color8:  #959da5
-*.color9:  #d73a49
-*.color10: #28a745
-*.color11: #dbab09
-*.color12: #0366d6
-*.color13: #5a32a3
-*.color14: #1b7c83
-*.color15: #24292e
-
-*.foreground: #24292e
-*.background: #ffffff
diff --git a/.config/bat/config b/.config/bat/config
new file mode 100644
index 0000000..2d658ea
--- /dev/null
+++ b/.config/bat/config
@@ -0,0 +1,3 @@
+--style=plain
+--paging=never
+--theme=base16
diff --git a/.config/i3/autostart##template b/.config/i3/autostart##template
index 47532ff..cc2c652 100755
--- a/.config/i3/autostart##template
+++ b/.config/i3/autostart##template
@@ -1,15 +1,17 @@
 #!/bin/sh
 . "$HOME/.profile"
 mode --no-reload restore
+
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 polybar &
 rwall &
-picom -b
+picom &
 xbanish &
 dunst &
-autocutsel &
-fcitx5 -d
-xbindkeys -f "$XDG_CONFIG_HOME/xbindkeys/main"
+autocutsel -selection CLIPBOARD &
+autocutsel -selection PRIMARY &
+fcitx5 &
+xbindkeys --file "$XDG_CONFIG_HOME/xbindkeys/main" --nodaemon &
 {% if yadm.hostname == "thoncc" %}
 xdimmer -t 45 -p 3 &
 light-locker --no-late-locking &
@@ -21,5 +23,14 @@ desktop2mqtt --config "$XDG_CONFIG_HOME/desktop2mqtt/config.yml" &
 flashfocus &
 
 # auto start lazy script after everything else
-[ -x "$HOME/do.sh" ] && "$HOME/do.sh"
+[ -x "$HOME/do.sh" ] && "$HOME/do.sh" &
+
+exit_trap() {
+	trap - SIGTERM
+	kill -- -$$
+}
+trap exit_trap SIGINT SIGTERM EXIT
 
+# I want to keep this script running so I can easily kill all daemons when i3
+# exits
+wait $(jobs -rp)
diff --git a/.config/i3/config##template b/.config/i3/config##template
index 2b7a84b..2af8c10 100644
--- a/.config/i3/config##template
+++ b/.config/i3/config##template
@@ -25,11 +25,6 @@ for_window [class=".*"] border pixel 0
 # font
 font pango:Inter 9
 
-# no idea what these do but they were in here by default
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-exec --no-startup-id nm-applet
-set $refresh_i3status killall -SIGUSR1 i3status
-
 floating_modifier $mod
 
 # Gaps
@@ -41,7 +36,7 @@ bindsym $mod+n gaps inner current set -1; gaps outer current set 0
 bindsym $mod+d gaps inner current set $inner_gaps; gaps outer current set $outer_gaps;
 
 # Autostart
-exec "~/.config/i3/autostart"
+exec --no-startup-id "{{ env.XDG_CONFIG_HOME }}/i3/autostart"
 
 # split in horizontal orientation
 bindsym $mod+bar split h
diff --git a/.config/xbindkeys/main##template b/.config/xbindkeys/main##template
index 8467a0e..a14e953 100644
--- a/.config/xbindkeys/main##template
+++ b/.config/xbindkeys/main##template
@@ -66,13 +66,13 @@
 
 
 
-"~/.local/share/bin/wacommode topleft"
+"wacommode topleft"
 	Mod1 + Control + Mod4 + 1
-"~/.local/share/bin/wacommode bottomleft"
+"wacommode bottomleft"
 	Mod1 + Control + Mod4 + 2
-"~/.local/share/bin/wacommode topright"
+"wacommode topright"
 	Mod1 + Control + Mod4 + 3
-"~/.local/share/bin/wacommode bottomright"
+"wacommode bottomright"
 	Mod1 + Control + Mod4 + 4
 
 
@@ -118,3 +118,4 @@
 	XF86Launch6 + Release
 "fcitx5-remote -s mozc"
 	XF86Launch7 + Release
+
diff --git a/.local/share/bin/brave b/.local/share/bin/brave
index 966b990..10514cf 100755
--- a/.local/share/bin/brave
+++ b/.local/share/bin/brave
@@ -3,5 +3,5 @@
 # ~/.local/share/mode/reload.d/brave. this is probaby bad for security if
 # you're not the only user on the system
 /usr/bin/brave \
-	--remote-debugging-port=9222
+	--remote-debugging-port=9222 \
 	"$@"
diff --git a/.profile b/.profile
index e1af117..0143731 100644
--- a/.profile
+++ b/.profile
@@ -5,35 +5,32 @@
 # respective shell's profile or init file (e.g. .zshrc, .bash_profile, etc.)
 
 # AJATT (user account only because TTYs don't render non-ascii characters)
-export LANG="ja_JP.UTF-8"
+export LANG='ja_JP.UTF-8'
 
 # aliases
-alias cls="clear"
-alias vim="nvim"
-alias copy="xclip -selection c"
-alias dnd="dragon-drag-and-drop -a -x"
-alias mk="make"
-alias sl="sl -w"
-alias vv="neovide"
-alias today="khal list today today"
-alias bctl="bluetoothctl"
-alias sctl="systemctl --user"
+alias cls='clear'
+alias vim='nvim'
+alias copy='xclip -selection c'
+alias dnd='dragon-drag-and-drop -a -x'
+alias mk='make'
+alias sl='sl -w'
+alias vv='neovide'
+alias today='khal list today today'
+alias bctl='bluetoothctl'
+alias sctl='systemctl --user'
+alias fv='nvim "$(fzf)"'
 
 # one letters
-alias r="ranger"
-alias v="nvim"
-alias m="neomutt"
-alias y="yay"
-alias n="ncmpcpp"
-alias c="khal"
-alias f="fork"
-alias p="pass"
-alias b="bluetoothctl"
-alias s="systemctl --user"
-
-# "functions"
-alias reload="sudo systemctl restart lightdm"
-alias screenrecord='giph -f 60 -s -b 4 -c 255,255,255 $(date +"$HOME/%Y-%m-%d_%H-%M-%S.mp4")'
+alias r='ranger'
+alias v='nvim'
+alias m='neomutt'
+alias y='yay'
+alias n='ncmpcpp'
+alias c='khal'
+alias f='fork'
+alias p='pass'
+alias b='bluetoothctl'
+alias s='systemctl --user'
 
 # fontpreview
 if [ -n "$DISPLAY" ]; then
@@ -41,9 +38,6 @@ if [ -n "$DISPLAY" ]; then
 	export FONTPREVIEW_FG_COLOR="$(xrdb -query | grep foreground | cut -f2)"
 fi
 
-# bat
-alias bat="bat -pp --theme=base16"
-
 # force colorterm
 export COLORTERM="truecolor"
 
@@ -63,7 +57,8 @@ export PATH="$HOME/.lyp/bin:$PATH"
 
 # other stuff
 export EDITOR="nvim"
-export FZF_DEFAULT_COMMAND="find ."
+export PAGER="less"
+export FZF_DEFAULT_COMMAND="find . -name '.?*' -prune -o -print"
 export FZF_DEFAULT_OPTS="--color=16"
 export GOPATH="$HOME/.local/go"
 [ -e "$XDG_CONFIG_HOME/gtk-4.0/env" ] && . "$XDG_CONFIG_HOME/gtk-4.0/env"