From e4ff08d98c928cda50891fb895ef9fe5ba6e5524 Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Tue, 15 Jun 2021 21:23:41 -0400 Subject: [PATCH] Switch from Xmonad to DWM, MangoHud Config Changes, & Fallout Grub Theme - Change "~" to "=" in some places in README.org - Update MangoHud config to show info about RAM, Disk, GPU, etc. - Switch from xmonad to dwm - Add dwm-flexipatch submodule - Add fallout grub theme submodule - Add notifications to session control script - Remove nyrna from autostart - Add Bauh package management GUI to autostart - Comment out turning picom off when starting game since it stops when a program goes fullscreen now --- .Xresources | 13 +++++++ .config/MangoHud/MangoHud.conf | 37 +++++++++++++----- .config/dwm-flexipatch | 1 + .config/emacs | 2 +- .gitmodules | 6 +++ .scripts/game_launch.sh | 2 +- .scripts/session.sh | 14 +++++-- .scripts/startup.sh | 4 +- .themes/fallout-grub-theme | 1 + .xinitrc | 2 +- .xmonad | 2 +- README.org | 71 +++++++++++++++++++++++----------- 12 files changed, 113 insertions(+), 42 deletions(-) create mode 160000 .config/dwm-flexipatch create mode 160000 .themes/fallout-grub-theme diff --git a/.Xresources b/.Xresources index 3be1e4b..9662232 100644 --- a/.Xresources +++ b/.Xresources @@ -53,6 +53,19 @@ #define MAXLEN 50 #define CURSOR_SIZE 16 +! DWM +dwm.normbordercolor: BLACK2 +dwm.normbgcolor: BACKGROUND +dwm.normfgcolor: FOREGROUND +dwm.selbordercolor: PURPLE1 +dwm.selbgcolor: PURPLE1 +dwm.selfgcolor: BACKGROUND +dwm.borderpx: BORDER_SIZE +dwm.gappih: INNER_GAPS +dwm.gappiv: INNER_GAPS +dwm.gappoh: OUTER_GAPS +dwm.gappov: OUTER_GAPS + ! Polybar polybar.bar-height: BAR_HEIGHT polybar.module-margin: MODULE_MARGIN diff --git a/.config/MangoHud/MangoHud.conf b/.config/MangoHud/MangoHud.conf index 24c2c0b..c74bc41 100644 --- a/.config/MangoHud/MangoHud.conf +++ b/.config/MangoHud/MangoHud.conf @@ -1,22 +1,41 @@ -cpu_stats -cpu_temp -cpu_color=2e97cb -cpu_text=CPU +legacy_layout=false gpu_stats gpu_temp gpu_core_clock gpu_mem_clock -vulkan_driver -gpu_name -gpu_color=2e9762 +gpu_power +gpu_load_change +gpu_load_value=50,90 +gpu_load_color=FFFFFF,FF7800,CC0000 gpu_text=GPU +cpu_stats +cpu_temp +cpu_power +cpu_mhz +cpu_load_change +cpu_load_value=50,90 +cpu_load_color=FFFFFF,FF7800,CC0000 +cpu_color=2e97cb +cpu_text=CPU +io_stats +io_read +io_write +io_color=a491d3 +swap vram vram_color=ad64c1 ram ram_color=c26693 -io_color=a491d3 +fps +engine_color=eb5b5b +gpu_name +gpu_color=2e9762 +vulkan_driver +wine +wine_color=eb5b5b frame_timing=1 frametime_color=00ff00 +media_player_color=ffffff background_alpha=0.4 font_size=24 background_color=020202 @@ -24,5 +43,5 @@ position=top-left text_color=ffffff toggle_hud=Shift_R+F12 toggle_logging=Shift_L+F2 -output_file=/home/sravan/mangohud_log_ +output_folder=/home/sravan media_player_name=spotify diff --git a/.config/dwm-flexipatch b/.config/dwm-flexipatch new file mode 160000 index 0000000..d5ddc83 --- /dev/null +++ b/.config/dwm-flexipatch @@ -0,0 +1 @@ +Subproject commit d5ddc83bedf6ec824d50fa4e47263ed07aab3e71 diff --git a/.config/emacs b/.config/emacs index e24d505..5c9d8fb 160000 --- a/.config/emacs +++ b/.config/emacs @@ -1 +1 @@ -Subproject commit e24d5057db04df745c76e5ae23e5f17973e2f530 +Subproject commit 5c9d8fb5c746337de325a5c3f225582c7215b454 diff --git a/.gitmodules b/.gitmodules index ff89e72..a0efc75 100644 --- a/.gitmodules +++ b/.gitmodules @@ -66,3 +66,9 @@ path = .themes/dracula-qbittorrent url = git@github.com:dracula/qbittorrent.git branch = master +[submodule ".config/dwm-flexipatch"] + path = .config/dwm-flexipatch + url = git@github.com:balajsra/dwm-flexipatch.git +[submodule ".themes/fallout-grub-theme"] + path = .themes/fallout-grub-theme + url = git@github.com:shvchk/fallout-grub-theme.git diff --git a/.scripts/game_launch.sh b/.scripts/game_launch.sh index 6a29cf0..8551e2d 100755 --- a/.scripts/game_launch.sh +++ b/.scripts/game_launch.sh @@ -1,3 +1,3 @@ #!/bin/bash -/home/sravan/.scripts/picom.sh --off +# /home/sravan/.scripts/picom.sh --off /home/sravan/.scripts/dunst.sh --dnd diff --git a/.scripts/session.sh b/.scripts/session.sh index 3c74dd8..2caa9c7 100755 --- a/.scripts/session.sh +++ b/.scripts/session.sh @@ -11,7 +11,7 @@ help_menu() { rofi_menu() { declare -a options=( - " Recompile & Restart Xmonad - restart" + "勒 Restart Dwm - restart" " Logout - logout" " Lock - lock" "⏾ Sleep - sleep" @@ -39,26 +39,32 @@ main() { help_menu ;; --logout) - notify-send -t 0 "Session Control" "Press M-S-q to exit xmonad" + notify-send "Session Control" "Logging Out of Dwm" + xdotool key Super+Shift_L+q ;; --lock) + notify-send "Session Control" "Locking Session" light-locker-command --lock ;; --sleep) + notify-send "Session Control" "Going to Sleep" systemctl suspend ;; --reboot) + notify-send "Session Control" "Rebooting System" reboot ;; --shutdown) + notify-send "Session Control" "Shutting Down System" shutdown now ;; --hibernate) + notify-send "Session Control" "Hibernating System" systemctl hibernate ;; --restart) - xmonad --recompile - xmonad --restart + notify-send "Session Control" "Restarting Dwm" + xdotool key Super+Control_L+Shift_L+q ;; --rofi) rofi_menu diff --git a/.scripts/startup.sh b/.scripts/startup.sh index e1eec6d..f0328ca 100755 --- a/.scripts/startup.sh +++ b/.scripts/startup.sh @@ -28,7 +28,7 @@ declare -a kill_system_array=(\ declare -a apps_array=(\ # System Tray Applications "redshift-gtk" \ # Redshift Blue Light Filter - "nyrna" \ # Nyrna Application Suspend + "bauh-tray" \ # Bauh Package Management GUI "blueman-tray" \ # Blueman Bluetooth Manager "nm-applet" \ # Network Manager Applet "kdeconnect-indicator" \ # KDE Connect Indicator @@ -40,7 +40,7 @@ declare -a apps_array=(\ declare -a kill_apps_array=(\ # System Tray Applications "killall redshift" \ # Redshift Blue Light Filter - "killall nyrna" \ # Nyrna Application Suspend + "killall bauh-tray" \ # Bauh Package Management GUI "killall blueman-tray" \ # Blueman Bluetooth Manager "killall nm-applet" \ # Network Manager Applet "killall kdeconnect-indicator" \ # KDE Connect Indicator diff --git a/.themes/fallout-grub-theme b/.themes/fallout-grub-theme new file mode 160000 index 0000000..211348f --- /dev/null +++ b/.themes/fallout-grub-theme @@ -0,0 +1 @@ +Subproject commit 211348f7fe7002a144c709dc3eb5d04f4acde4dd diff --git a/.xinitrc b/.xinitrc index b456362..0971aa0 100755 --- a/.xinitrc +++ b/.xinitrc @@ -19,4 +19,4 @@ xrdb ~/.Xresources /home/sravan/.scripts/startup.sh --kill-apps && /home/sravan/.scripts/startup.sh --apps) & -exec xmonad +exec dwm diff --git a/.xmonad b/.xmonad index 8c5c283..0dbd477 160000 --- a/.xmonad +++ b/.xmonad @@ -1 +1 @@ -Subproject commit 8c5c283da5803a8fa18d0261de060895c591b77c +Subproject commit 0dbd47799ca8995c0c074f4d66fa1580719c1bda diff --git a/README.org b/README.org index 909e902..43b8ec8 100644 --- a/README.org +++ b/README.org @@ -1,6 +1,7 @@ #+title: Personal Dotfiles #+author: Sravan Balaji #+auto_tangle: t +#+startup: showeverything * Installation @@ -12,7 +13,7 @@ Prior to the installation, create alias for config alias config="GIT_WORK_TREE=~ GIT_DIR=~/.cfg" #+end_src -Add ~.cfg~ to ~.gitignore~ +Add =.cfg= to ~.gitignore~ #+begin_src shell echo ".cfg" >> .gitignore @@ -58,7 +59,7 @@ Re-run checkout config git checkout #+end_src -Set the flag ~showUntrackedFiles~ to ~no~ on this specific (local) repo +Set the flag =showUntrackedFiles= to =no= on this specific (local) repo #+begin_src shell config git config --local status.showUntrackedFiles no @@ -6354,25 +6355,44 @@ Configuration for Alacritty, the GPU enhanced terminal emulator. ** MangoHUD #+begin_src conf :tangle .config/MangoHud/MangoHud.conf - cpu_stats - cpu_temp - cpu_color=2e97cb - cpu_text=CPU + legacy_layout=false gpu_stats gpu_temp gpu_core_clock gpu_mem_clock - vulkan_driver - gpu_name - gpu_color=2e9762 + gpu_power + gpu_load_change + gpu_load_value=50,90 + gpu_load_color=FFFFFF,FF7800,CC0000 gpu_text=GPU + cpu_stats + cpu_temp + cpu_power + cpu_mhz + cpu_load_change + cpu_load_value=50,90 + cpu_load_color=FFFFFF,FF7800,CC0000 + cpu_color=2e97cb + cpu_text=CPU + io_stats + io_read + io_write + io_color=a491d3 + swap vram vram_color=ad64c1 ram ram_color=c26693 - io_color=a491d3 + fps + engine_color=eb5b5b + gpu_name + gpu_color=2e9762 + vulkan_driver + wine + wine_color=eb5b5b frame_timing=1 frametime_color=00ff00 + media_player_color=ffffff background_alpha=0.4 font_size=24 background_color=020202 @@ -6380,7 +6400,7 @@ Configuration for Alacritty, the GPU enhanced terminal emulator. text_color=ffffff toggle_hud=Shift_R+F12 toggle_logging=Shift_L+F2 - output_file=/home/sravan/mangohud_log_ + output_folder=/home/sravan media_player_name=spotify #+end_src @@ -6439,7 +6459,7 @@ Configuration for Alacritty, the GPU enhanced terminal emulator. *** Launch Environment #+begin_src shell :shebang #!/bin/sh :tangle .xinitrc - exec xmonad + exec dwm #+end_src ** Xresources @@ -6543,15 +6563,14 @@ Configuration for Alacritty, the GPU enhanced terminal emulator. **** dwm -*NOT IN USE* -#+begin_src conf :tangle no +#+begin_src conf :tangle .Xresources ! DWM - dwm.normbgcolor: BACKGROUND dwm.normbordercolor: BLACK2 + dwm.normbgcolor: BACKGROUND dwm.normfgcolor: FOREGROUND - dwm.selfgcolor: BACKGROUND dwm.selbordercolor: PURPLE1 dwm.selbgcolor: PURPLE1 + dwm.selfgcolor: BACKGROUND dwm.borderpx: BORDER_SIZE dwm.gappih: INNER_GAPS dwm.gappiv: INNER_GAPS @@ -6863,7 +6882,7 @@ Configuration for Alacritty, the GPU enhanced terminal emulator. rofi_menu() { declare -a options=( - " Recompile & Restart Xmonad - restart" + "勒 Restart Dwm - restart" " Logout - logout" " Lock - lock" "⏾ Sleep - sleep" @@ -6891,26 +6910,32 @@ Configuration for Alacritty, the GPU enhanced terminal emulator. help_menu ;; --logout) - notify-send -t 0 "Session Control" "Press M-S-q to exit xmonad" + notify-send "Session Control" "Logging Out of Dwm" + xdotool key Super+Shift_L+q ;; --lock) + notify-send "Session Control" "Locking Session" light-locker-command --lock ;; --sleep) + notify-send "Session Control" "Going to Sleep" systemctl suspend ;; --reboot) + notify-send "Session Control" "Rebooting System" reboot ;; --shutdown) + notify-send "Session Control" "Shutting Down System" shutdown now ;; --hibernate) + notify-send "Session Control" "Hibernating System" systemctl hibernate ;; --restart) - xmonad --recompile - xmonad --restart + notify-send "Session Control" "Restarting Dwm" + xdotool key Super+Control_L+Shift_L+q ;; --rofi) rofi_menu @@ -6954,7 +6979,7 @@ Configuration for Alacritty, the GPU enhanced terminal emulator. declare -a apps_array=(\ # System Tray Applications "redshift-gtk" \ # Redshift Blue Light Filter - "nyrna" \ # Nyrna Application Suspend + "bauh-tray" \ # Bauh Package Management GUI "blueman-tray" \ # Blueman Bluetooth Manager "nm-applet" \ # Network Manager Applet "kdeconnect-indicator" \ # KDE Connect Indicator @@ -6966,7 +6991,7 @@ Configuration for Alacritty, the GPU enhanced terminal emulator. declare -a kill_apps_array=(\ # System Tray Applications "killall redshift" \ # Redshift Blue Light Filter - "killall nyrna" \ # Nyrna Application Suspend + "killall bauh-tray" \ # Bauh Package Management GUI "killall blueman-tray" \ # Blueman Bluetooth Manager "killall nm-applet" \ # Network Manager Applet "killall kdeconnect-indicator" \ # KDE Connect Indicator @@ -7075,7 +7100,7 @@ These are scripts that should be run from Lutris when launching or exiting a gam *Preferences > System options > Pre-launch script* #+begin_src shell :shebang #!/bin/bash :tangle .scripts/game_launch.sh - /home/sravan/.scripts/picom.sh --off + # /home/sravan/.scripts/picom.sh --off /home/sravan/.scripts/dunst.sh --dnd #+end_src