From a7fdb4f49714d8526a68c1a0cd2549ca5e92eb6f Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <pham@topo.tw>
Date: Sat, 12 Aug 2023 14:14:23 +0800
Subject: Update for new laptop installation

---
 Makefile                | 12 ++++++++----
 X11/alacritty/fonts.yml |  2 +-
 X11/openbox/rc.xml      | 43 ++++++++++++++++++++++---------------------
 alias                   |  3 ++-
 bin/gpt/gpt             |  1 +
 bin/install.sh          |  2 +-
 misc/keymap             |  3 +--
 tigrc                   |  2 +-
 8 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index 72f4dd9..4e435fb 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,6 @@ gpg:
 	ln -sf `pwd`/misc/gpg-agent ~/.gnupg/gpg-agent.conf
 	gpgconf --reload gpg-agent
 
-console:
-	sudo ln -sf `pwd`/misc/vconsole.conf /etc/vconsole.conf
-
 zsh:
 	ln -sf `pwd`/zsh/zshenv ~/.zshenv
 	mkdir -p ~/.config/zsh
@@ -62,9 +59,16 @@ tmux:
 crontab:
 	(crontab -l 2>/dev/null; cat bin/cron/* | sed '/^#/ d') | crontab -
 
+# Swap Ctrl-Caps in X11
 libinput:
 	sudo ln -sf `pwd`/misc/libinput/* /etc/X11/xorg.conf.d/
 
+# Swap Ctrl-Caps in tty2~6
+console:
+	sudo ln -sf `pwd`/misc/vconsole.conf /etc/vconsole.conf
+	sudo systemctl restart systemd-vconsole-setup.service
+
+
 task:
 	ln -sf $(HOME)/.task/taskrc $(HOME)/.taskrc
 	if [ ! -d "$(HOME)/.task/.git" ]; then 
@@ -93,7 +97,7 @@ urlview:
 	ln -sf `pwd`/misc/urlview ~/.urlview
 
 alacritty:
-	ln -sf `pwd`/X11/alacritty/ ~/.config/alacritty
+	ln -sf `pwd`/X11/alacritty ~/.config/alacritty
 
 mpd:
 	ln -sf `pwd`/mpd/ncmpcpp ~/.config/ncmpcpp
diff --git a/X11/alacritty/fonts.yml b/X11/alacritty/fonts.yml
index 2ea94f1..d8cacaf 100644
--- a/X11/alacritty/fonts.yml
+++ b/X11/alacritty/fonts.yml
@@ -24,7 +24,7 @@ font:
     #style: Bold Italic
 
   # Point size
-  size: 18
+  size: 20
 
   # Offset
   #offset:
diff --git a/X11/openbox/rc.xml b/X11/openbox/rc.xml
index d1bf693..65ffdf2 100644
--- a/X11/openbox/rc.xml
+++ b/X11/openbox/rc.xml
@@ -28,37 +28,37 @@
     <animateIconify>yes</animateIconify>
     <font place="ActiveWindow">
       <name>Sans</name>
-      <size>18</size>
+      <size>20</size>
       <weight>Bold</weight>
       <slant>Normal</slant>
     </font>
     <font place="InactiveWindow">
       <name>Hack Nerd Font</name>
-      <size>18</size>
+      <size>20</size>
       <weight>Normal</weight>
       <slant>Normal</slant>
     </font>
     <font place="MenuHeader">
       <name>Hack Nerd Font</name>
-      <size>18</size>
+      <size>20</size>
       <weight>Bold</weight>
       <slant>Normal</slant>
     </font>
     <font place="MenuItem">
       <name>Hack Nerd Font</name>
-      <size>18</size>
+      <size>20</size>
       <weight>Normal</weight>
       <slant>Normal</slant>
     </font>
     <font place="ActiveOnScreenDisplay">
       <name>Hack Nerd Font</name>
-      <size>18</size>
+      <size>20</size>
       <weight>Bold</weight>
       <slant>Normal</slant>
     </font>
     <font place="InactiveOnScreenDisplay">
       <name>Hack Nerd Font</name>
-      <size>18</size>
+      <size>20</size>
       <weight>Normal</weight>
       <slant>Normal</slant>
     </font>
@@ -111,7 +111,7 @@
             alacritty --title @OPENBOX_CONFIG \
             -o "window.dimensions.lines=32" \
             -o "window.dimensions.columns=90" \
-            -e $EDITOR ~/.config/openbox/rc.xml \
+            -e nvim ~/.config/openbox/rc.xml \
           '
         </command>
       </action>
@@ -435,17 +435,17 @@
     <!-- Media Controls-->
     <keybind key="XF86AudioRaiseVolume">
       <action name="Execute">
-        <command>volume --inc</command>
+        <command>ob-volume --inc</command>
       </action>
     </keybind>
     <keybind key="XF86AudioLowerVolume">
       <action name="Execute">
-        <command>volume --dec</command>
+        <command>ob-volume --dec</command>
       </action>
     </keybind>
     <keybind key="XF86AudioMute">
       <action name="Execute">
-        <command>volume --toggle</command>
+        <command>ob-volume --toggle</command>
       </action>
     </keybind>
     <keybind key="XF86AudioStop">
@@ -605,7 +605,7 @@
     <!-- Rofi -->
     <keybind key="A-F1">
       <action name="Execute">
-        <command>~/.config/openbox/rofi/bin/launcher</command>
+        <command>launcher</command>
       </action>
     </keybind>
     <keybind key="W-n">
@@ -620,12 +620,13 @@
     </keybind>
     <keybind key="W-a">
       <action name="Execute">
-        <command>
-          sh -c '
-            xdotool search --name MPD windowquit || \
-            alacritty --title MPD -e ncmpcpp
-          '
-        </command>
+      <command>ob-music</command>
+	<backup>
+	  sh -c '
+	    xdotool search --name MPD windowquit || \
+	    alacritty --title MPD -e ncmpcpp
+	  '
+	</backup>
       </action>
     </keybind>
     <keybind key="W-m">
@@ -644,7 +645,7 @@
     </keybind>
     <keybind key="W-x">
       <action name="Execute">
-        <command>~/.config/openbox/rofi/bin/powermenu</command>
+        <command>powermenu</command>
       </action>
     </keybind>
     <keybind key="W-z">
@@ -659,7 +660,7 @@
     </keybind>
     <keybind key="C-A-Print">
       <action name="Execute">
-        <command>~/.config/openbox/rofi/bin/screenshot</command>
+        <command>screenshot</command>
       </action>
     </keybind>
     <keybind key="W-i">
@@ -687,7 +688,7 @@
     </keybind>
     <keybind key="W-r">
       <action name="Execute">
-        <command>~/.config/openbox/rofi/bin/runner</command>
+        <command>runner</command>
       </action>
     </keybind>
     <keybind key="W-g">
@@ -804,7 +805,7 @@
     <keybind key="A-S-q">
       <action name="Close"/>
     </keybind>
-      <!--
+    <!--
       <action name="Execute">
         <command>
           sh -c '
diff --git a/alias b/alias
index 32fe1df..380badf 100644
--- a/alias
+++ b/alias
@@ -32,7 +32,7 @@ vll() {
   nvim -c 'Telescope oldfiles'
 }
 #alias vl="vim $(sed -n '/^[^#]/{p;q}' ~/.vim_mru_files)"
-alias ve="vim ~/.config/nvim/init.lua"
+alias ve="vim ~/.config/nvim/nvim.lua"
 alias vro='vim -R'
 alias vu='vim -u NONE'
 alias vq='vim ~/buffer'
@@ -180,6 +180,7 @@ date.reset() {
   sudo date -s "$(wget -qSO- --max-redirect=0 google.com 2>&1 | grep Date: | cut -d' ' -f5-8)Z"
 }
 alias clock.reset='hwclock --systohc'
+unalias gr
 gr() {
   grep -IR $1 .
 }
diff --git a/bin/gpt/gpt b/bin/gpt/gpt
index b348a2e..7dc55dd 100755
--- a/bin/gpt/gpt
+++ b/bin/gpt/gpt
@@ -224,6 +224,7 @@ _get_input_by_fzf() {
 
 # Check OPENAI API KEY in env
 # Exit with 6 (configuration issue) if it is not set
+XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config}
 [ -z "$OPENAI_API_KEY" ] && OPENAI_API_KEY=$(cat "$XDG_CONFIG_HOME"/openai/key)
 [ -z "$OPENAI_API_KEY" ] && { echo API KEY not specified; exit 6; }
 
diff --git a/bin/install.sh b/bin/install.sh
index b6d6bde..cfc13d3 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -26,5 +26,5 @@ source \$SETTING_DIR/bin/init/load-settings.sh
 EOF
 
 cd "$SETTING_DIR" || exit 1
-git swapprotocol
 make
+EOF
diff --git a/misc/keymap b/misc/keymap
index 7f16e69..f0ff7e7 100644
--- a/misc/keymap
+++ b/misc/keymap
@@ -49,7 +49,6 @@ keycode  54 = Shift
 keycode  56 = Alt
 keycode  57 = space
 	control	keycode  57 = nul
-keycode  58 = Control
+keycode  66 = Control
 keycode  86 = less             greater          bar
 keycode  97 = Control
-keycode 105 = Menu
diff --git a/tigrc b/tigrc
index 4f04cd7..d5a0ca7 100644
--- a/tigrc
+++ b/tigrc
@@ -63,7 +63,7 @@ bind reflog  c  ?git checkout %(commit)
 # highlight diff without +/-
 # set diff-show-signs = false
 # set diff_column_highlight = ALL
-set diff-highlight = true
+#set diff-highlight = true
 
 # misc settings
 set ignore-case = true
-- 
cgit v1.2.3-70-g09d2