From 5f47923b7ede266a631deec5511bb58444e3fab4 Mon Sep 17 00:00:00 2001
From: Mitsuo Tokumori <rtokumori@pucp.edu.pe>
Date: Thu, 29 Aug 2024 03:39:04 +0900
Subject: Small changes I forgot to include when appropiate

---
 config/bash/bashrc      |  1 +
 config/git/config       |  2 ++
 config/xorg/xbindkeysrc | 25 +++++++++++++------------
 config/xorg/xinitrc     | 20 +++++++++++++++++---
 4 files changed, 33 insertions(+), 15 deletions(-)

(limited to 'config')

diff --git a/config/bash/bashrc b/config/bash/bashrc
index e36f61b..065e12e 100644
--- a/config/bash/bashrc
+++ b/config/bash/bashrc
@@ -77,6 +77,7 @@ PS1='\[\033[32m\]\u@\h \[\033[35m\]$MSYSTEM \[\033[33m\]\w\[\033[36m\]`__git_ps1
 # Add directories to PATH
 ds=(
     "$HOME/code/tex-live-native/build/bin/x86_64-linux"
+    "$HOME/.local/share/gem/ruby/3.0.0/bin"
     "$HOME/.local/bin"
     "$HOME/mahcode/dotfiles/local/bin"
 )
diff --git a/config/git/config b/config/git/config
index a5dd072..ec672da 100644
--- a/config/git/config
+++ b/config/git/config
@@ -11,3 +11,5 @@
     owner = Mitsuo Tokumori <rtokumori@pucp.edu.pe>
 [init]
 	defaultBranch = master
+[pull]
+	ff = only
diff --git a/config/xorg/xbindkeysrc b/config/xorg/xbindkeysrc
index b37fa34..3d54661 100644
--- a/config/xorg/xbindkeysrc
+++ b/config/xorg/xbindkeysrc
@@ -87,29 +87,24 @@
 # System
 # ------
 
-"sudo shutdown 0"
+# WIP: shutdown and reboot require root privileges, so they won't work like this
+"shutdown 0"
     Control+Shift+Alt+Mod4 + s
-"sudo reboot"
+
+"reboot"
     Control+Shift+Alt+Mod4 + r
 
 "slock"
     Control+Alt + l
 
-# Audio & brightness control
-# Ref.:
-# https://wiki.archlinux.org/title/Backlight
-
 "audio_control.sh inc"
     Mod4 + 0
-#    XF86AudioRaiseVolume
  
 "audio_control.sh dec"
     Mod4 + 9
-#    XF86AudioLowerVolume
 
 "audio_control.sh mutetoggle"
     Mod4 + m
-#    XF86AudioMute
 
 "audio_control.sh micinc"
     Mod4 + 8
@@ -120,14 +115,20 @@
 "audio_control.sh deafentoggle"
     Mod4 + n
 
-# Maybe it'd be a good idea to remove the sudo from here, idk
 "brightness_control.sh inc"
     Shift+Mod4 + 0
-#    XF86MonBrightnessUp
 
 "brightness_control.sh dec"
     Shift+Mod4 + 9
-#    XF86MonBrightnessDown
+
+"network_control.sh wifitoggle"
+    Shift+Mod4 + c
+
+"network_control.sh bluetoothtoggle"
+    Shift+Mod4 + v
+
+"network_control.sh isolatetoggle"
+    Shift+Mod4 + b
 
 # Suckless desktop
 # --------------------
diff --git a/config/xorg/xinitrc b/config/xorg/xinitrc
index 74aeeef..523f19c 100644
--- a/config/xorg/xinitrc
+++ b/config/xorg/xinitrc
@@ -46,10 +46,23 @@ export GTK_IM_MODULE=fcitx
 export QT_IM_MODULE=fcitx
 export XMODIFIERS=@im=fcitx
 
-xrandr --dpi 144     # Original mac: 72, stupid windows: 96  pulse15: 188
-laptop-xinput_setup.sh
-xbindkeys           # keyboard shortcuts
+xrandr --dpi 144        # Original mac: 72, stupid windows: 96  pulse15: 188
 setxkbmap -option caps:escape   # map CAPSLOCK to ESC
+laptop-xinput_setup.sh          # laptop touchpad
+laptop-xrandr.sh
+xbindkeys               # keyboard shortcuts
+# Bind the right Alt key to Mod4 (for DWM)
+# https://wiki.archlinux.org/title/Dwm#Bind_the_right_Alt_key_to_Mod4
+# xmodmap -pke | grep Alt_R
+xmodmap -display ":0.0" -e "keycode 108 = Super_L"
+xmodmap -display ":0.0" -e "remove mod1 = Super_L"
+
+#autostart="mpd xcompmgr dunst unclutter pipewire remapd"
+#autostart="dunst unclutter"
+#
+#for program in $autostart; do
+#	pidof -sx "$program" || "$program" &
+#done >/dev/null 2>&1
 
 # Start twm
 #twm &
@@ -67,6 +80,7 @@ setxkbmap -option caps:escape   # map CAPSLOCK to ESC
 #startxfce4
 
 # Start dwm
+unclutter &
 xautolock -time 10 -locker slock &
 dwmblocks &
 setbg.sh &
-- 
cgit v1.2.3