sravan/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-org x11 stow package into dwm

Browse Source 
- Add winitrc for wayland similar to xinitrc
- Move x11 stow package to dwm
- Remove x11 stow packages from stow creation/recreation list
- Update dwl submodule
This commit is contained in:
Sravan Balaji
2024-09-29 14:15:07 -04:00
parent ac58c12a19
commit 760e2607a7
7 changed files with 79 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
README.org
View File

@@ -110,7 +110,11 @@
- [[#colors-1][Colors]] - [[#colors-1][Colors]]
- [[#sizes][Sizes]] - [[#sizes][Sizes]]
- [[#application-specific-changes][Application Specific Changes]] - [[#application-specific-changes][Application Specific Changes]]
- [[#startup][Startup]] - [[#winit][Winit]]
- [[#environment-variables-1][Environment Variables]]
- [[#startup-applications--processes-1][Startup Applications & Processes]]
- [[#launch-environment-1][Launch Environment]]
- [[#x11-startup][X11 Startup]]
- [[#justfile][Justfile]] - [[#justfile][Justfile]]
- [[#miscellaneous-scripts][Miscellaneous Scripts]] - [[#miscellaneous-scripts][Miscellaneous Scripts]]
- [[#media-control][Media Control]] - [[#media-control][Media Control]]
@@ -8694,7 +8698,7 @@ Host gitea.sravanbalaji.com
*** Environment Variables *** Environment Variables
#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle x11/.xinitrc #+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle dwm/.xinitrc
export TERM=xterm-256color # Sets the terminal type export TERM=xterm-256color # Sets the terminal type
export SHELL=/bin/fish # Preferred shell export SHELL=/bin/fish # Preferred shell
export EDITOR="emacs" # Default editor export EDITOR="emacs" # Default editor
@@ -8707,26 +8711,26 @@ export _JAVA_AWT_WM_NONREPARENTING=1 # Java fix for Window Managers
*** Load Xresources *** Load Xresources
#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle x11/.xinitrc #+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle dwm/.xinitrc
xrdb ~/.Xresources xrdb ~/.Xresources
#+END_SRC #+END_SRC
*** Startup Applications & Processes *** Startup Applications & Processes
#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle x11/.xinitrc #+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle dwm/.xinitrc
# Startup Applications # Startup Applications
/home/sravan/.scripts/startup.sh --kill-startup && /home/sravan/.scripts/x11-startup.sh --kill-startup &&
/home/sravan/.scripts/startup.sh --startup /home/sravan/.scripts/x11-startup.sh --startup
# Delayed Startup Applications # Delayed Startup Applications
(sleep 5 && (sleep 5 &&
/home/sravan/.scripts/startup.sh --kill-delay && /home/sravan/.scripts/x11-startup.sh --kill-delay &&
/home/sravan/.scripts/startup.sh --delay) & /home/sravan/.scripts/x11-startup.sh --delay) &
#+END_SRC #+END_SRC
*** Launch Environment *** Launch Environment
#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle x11/.xinitrc #+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle dwm/.xinitrc
exec dwm exec dwm
#+END_SRC #+END_SRC
@@ -8734,7 +8738,7 @@ exec dwm
*** Colors *** Colors
#+BEGIN_SRC conf :tangle x11/.Xresources #+BEGIN_SRC conf :tangle dwm/.Xresources
! Colors ! Colors
#define FOREGROUND #F8F8F2 #define FOREGROUND #F8F8F2
#define BACKGROUND #282A36 #define BACKGROUND #282A36
@@ -8797,7 +8801,7 @@ exec dwm
#define CURSOR_SIZE 16 #define CURSOR_SIZE 16
#+END_SRC #+END_SRC
#+BEGIN_SRC conf :tangle x11/.Xresources #+BEGIN_SRC conf :tangle dwm/.Xresources
! System76 Oryx Pro 7 DPI Parameters ! System76 Oryx Pro 7 DPI Parameters
#define DPI 96 #define DPI 96
#define BAR_HEIGHT 25 #define BAR_HEIGHT 25
@@ -8834,7 +8838,7 @@ exec dwm
**** dwm **** dwm
#+BEGIN_SRC conf :tangle x11/.Xresources #+BEGIN_SRC conf :tangle dwm/.Xresources
! DWM ! DWM
dwm.normbordercolor: BLACK2 dwm.normbordercolor: BLACK2
dwm.normbgcolor: BACKGROUND dwm.normbgcolor: BACKGROUND
@@ -8851,7 +8855,7 @@ dwm.gappov: OUTER_GAPS
**** Polybar **** Polybar
#+BEGIN_SRC conf :tangle x11/.Xresources #+BEGIN_SRC conf :tangle dwm/.Xresources
! Polybar ! Polybar
polybar.bar-height: BAR_HEIGHT polybar.bar-height: BAR_HEIGHT
polybar.module-margin: MODULE_MARGIN polybar.module-margin: MODULE_MARGIN
@@ -8864,15 +8868,49 @@ polybar.maxlen: MAXLEN
**** Display Scaling **** Display Scaling
#+BEGIN_SRC conf :tangle x11/.Xresources #+BEGIN_SRC conf :tangle dwm/.Xresources
! Display Scaling ! Display Scaling
,*.dpi: DPI ,*.dpi: DPI
Xcursor.size: CURSOR_SIZE Xcursor.size: CURSOR_SIZE
#+END_SRC #+END_SRC
** Startup ** Winit
#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle x11/.scripts/startup.sh *** Environment Variables
#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle dwl/.winitrc
export TERM=xterm-256color # Sets the terminal type
export SHELL=/bin/fish # Preferred shell
export EDITOR="emacs" # Default editor
export GIT_EDITOR="emacs" # Default git editor
export BROWSER=vivaldi-stable # Web Browser
export XDG_CONFIG_HOME=$HOME/.config # Set Config directory
export QT_QPA_PLATFORMTHEME=qt6ct # QGtkStyle
export _JAVA_AWT_WM_NONREPARENTING=1 # Java fix for Window Managers
#+END_SRC
*** Startup Applications & Processes
#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle dwl/.winitrc
# Startup Applications
/home/sravan/.scripts/wayland-startup.sh --kill-startup &&
/home/sravan/.scripts/wayland-startup.sh --startup
# Delayed Startup Applications
(sleep 5 &&
/home/sravan/.scripts/wayland-startup.sh --kill-delay &&
/home/sravan/.scripts/wayland-startup.sh --delay) &
#+END_SRC
*** Launch Environment
#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle dwl/.winitrc
exec dwl
#+END_SRC
** X11 Startup
#+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle dwm/.scripts/x11-startup.sh
declare -a startup_array=(\ declare -a startup_array=(\
"/usr/bin/greenclip daemon" \ # Greenclip Clipboard Manager "/usr/bin/greenclip daemon" \ # Greenclip Clipboard Manager
"/usr/libexec/polkit-gnome-authentication-agent-1" \ # GNOME Polkit Authentication Agent "/usr/libexec/polkit-gnome-authentication-agent-1" \ # GNOME Polkit Authentication Agent
@@ -9048,38 +9086,27 @@ doom-emacs-doctor:
stow-create: stow-create:
stow -v \ stow -v \
-S alacritty \ -S alacritty \
-S autorandr \
-S awesome \
-S bash \ -S bash \
-S betterlockscreen \
-S blender \ -S blender \
-S brightness \ -S brightness \
-S calibre \ -S calibre \
-S deadd \
-S dunst \ -S dunst \
-S dwl \ -S dwl \
-S dwm \
-S emacs \ -S emacs \
-S eww \
-S fish \ -S fish \
-S freecad \ -S freecad \
-S fuzzel \
-S gaming \ -S gaming \
-S gammastep \ -S gammastep \
-S geoclue \ -S geoclue \
-S gimp \ -S gimp \
-S git \ -S git \
-S gtk \ -S gtk \
-S hyprland \
-S kitty \ -S kitty \
-S mangal \ -S mangal \
-S mpv \ -S mpv \
-S naughty \
-S pactl \ -S pactl \
-S picom \
-S playerctl \ -S playerctl \
-S qt5 \ -S qt5 \
-S redshift \
-S rofi \ -S rofi \
-S shikane \ -S shikane \
-S snapborg \ -S snapborg \
@@ -9087,21 +9114,15 @@ stow-create:
-S starship \ -S starship \
-S swappy \ -S swappy \
-S swaylock \ -S swaylock \
-S swaync \
-S swhkd \ -S swhkd \
-S syncthing \ -S syncthing \
-S system76 \ -S system76 \
-S tmux \ -S tmux \
-S trackma \ -S trackma \
-S trackpad \
-S tty \ -S tty \
-S vim \ -S vim \
-S vscode \ -S vscode \
-S x11 \
-S xfce4-notifyd \
-S xmonad \
-S xournalpp \ -S xournalpp \
-S xrandr \
-S zathura \ -S zathura \
-S zsh -S zsh
@@ -9158,7 +9179,6 @@ stow-delete:
-D tty \ -D tty \
-D vim \ -D vim \
-D vscode \ -D vscode \
-D x11 \
-D xfce4-notifyd \ -D xfce4-notifyd \
-D xmonad \ -D xmonad \
-D xournalpp \ -D xournalpp \
@@ -9170,38 +9190,27 @@ stow-delete:
stow-recreate: stow-recreate:
stow -v \ stow -v \
-R alacritty \ -R alacritty \
-R autorandr \
-R awesome \
-R bash \ -R bash \
-R betterlockscreen \
-R blender \ -R blender \
-R brightness \ -R brightness \
-R calibre \ -R calibre \
-R deadd \
-R dunst \ -R dunst \
-R dwl \ -R dwl \
-R dwm \
-R emacs \ -R emacs \
-R eww \
-R fish \ -R fish \
-R freecad \ -R freecad \
-R fuzzel \
-R gaming \ -R gaming \
-R gammastep \ -R gammastep \
-R geoclue \ -R geoclue \
-R gimp \ -R gimp \
-R git \ -R git \
-R gtk \ -R gtk \
-R hyprland \
-R kitty \ -R kitty \
-R mangal \ -R mangal \
-R mpv \ -R mpv \
-R naughty \
-R pactl \ -R pactl \
-R picom \
-R playerctl \ -R playerctl \
-R qt5 \ -R qt5 \
-R redshift \
-R rofi \ -R rofi \
-R shikane \ -R shikane \
-R snapborg \ -R snapborg \
@@ -9209,21 +9218,15 @@ stow-recreate:
-R starship \ -R starship \
-R swappy \ -R swappy \
-R swaylock \ -R swaylock \
-R swaync \
-R swhkd \ -R swhkd \
-R syncthing \ -R syncthing \
-R system76 \ -R system76 \
-R tmux \ -R tmux \
-R trackma \ -R trackma \
-R trackpad \
-R tty \ -R tty \
-R vim \ -R vim \
-R vscode \ -R vscode \
-R x11 \
-R xfce4-notifyd \
-R xmonad \
-R xournalpp \ -R xournalpp \
-R xrandr \
-R zathura \ -R zathura \
-R zsh -R zsh

2
dwl/.config/dwl

Submodule dwl/.config/dwl updated: f4f5234990...85892f3517

20
dwl/.winitrc Executable file
View File

@@ -0,0 +1,20 @@
#!/usr/bin/env bash
export TERM=xterm-256color # Sets the terminal type
export SHELL=/bin/fish # Preferred shell
export EDITOR="emacs" # Default editor
export GIT_EDITOR="emacs" # Default git editor
export BROWSER=vivaldi-stable # Web Browser
export XDG_CONFIG_HOME=$HOME/.config # Set Config directory
export QT_QPA_PLATFORMTHEME=qt6ct # QGtkStyle
export _JAVA_AWT_WM_NONREPARENTING=1 # Java fix for Window Managers
# Startup Applications
/home/sravan/.scripts/wayland-startup.sh --kill-startup &&
/home/sravan/.scripts/wayland-startup.sh --startup
# Delayed Startup Applications
(sleep 5 &&
/home/sravan/.scripts/wayland-startup.sh --kill-delay &&
/home/sravan/.scripts/wayland-startup.sh --delay) &
exec dwl

0
x11/.Xresources → dwm/.Xresources
View File

0
x11/.scripts/startup.sh → dwm/.scripts/x11-startup.sh
View File

8
x11/.xinitrc → dwm/.xinitrc
View File

@@ -11,12 +11,12 @@ export _JAVA_AWT_WM_NONREPARENTING=1 # Java fix for Window Managers
xrdb ~/.Xresources xrdb ~/.Xresources
# Startup Applications # Startup Applications
/home/sravan/.scripts/startup.sh --kill-startup && /home/sravan/.scripts/x11-startup.sh --kill-startup &&
/home/sravan/.scripts/startup.sh --startup /home/sravan/.scripts/x11-startup.sh --startup
# Delayed Startup Applications # Delayed Startup Applications
(sleep 5 && (sleep 5 &&
/home/sravan/.scripts/startup.sh --kill-delay && /home/sravan/.scripts/x11-startup.sh --kill-delay &&
/home/sravan/.scripts/startup.sh --delay) & /home/sravan/.scripts/x11-startup.sh --delay) &
exec dwm exec dwm

35
justfile
View File

@@ -23,38 +23,27 @@ doom-emacs-doctor:
stow-create: stow-create:
stow -v \ stow -v \
-S alacritty \ -S alacritty \
-S autorandr \
-S awesome \
-S bash \ -S bash \
-S betterlockscreen \
-S blender \ -S blender \
-S brightness \ -S brightness \
-S calibre \ -S calibre \
-S deadd \
-S dunst \ -S dunst \
-S dwl \ -S dwl \
-S dwm \
-S emacs \ -S emacs \
-S eww \
-S fish \ -S fish \
-S freecad \ -S freecad \
-S fuzzel \
-S gaming \ -S gaming \
-S gammastep \ -S gammastep \
-S geoclue \ -S geoclue \
-S gimp \ -S gimp \
-S git \ -S git \
-S gtk \ -S gtk \
-S hyprland \
-S kitty \ -S kitty \
-S mangal \ -S mangal \
-S mpv \ -S mpv \
-S naughty \
-S pactl \ -S pactl \
-S picom \
-S playerctl \ -S playerctl \
-S qt5 \ -S qt5 \
-S redshift \
-S rofi \ -S rofi \
-S shikane \ -S shikane \
-S snapborg \ -S snapborg \
@@ -62,21 +51,15 @@ stow-create:
-S starship \ -S starship \
-S swappy \ -S swappy \
-S swaylock \ -S swaylock \
-S swaync \
-S swhkd \ -S swhkd \
-S syncthing \ -S syncthing \
-S system76 \ -S system76 \
-S tmux \ -S tmux \
-S trackma \ -S trackma \
-S trackpad \
-S tty \ -S tty \
-S vim \ -S vim \
-S vscode \ -S vscode \
-S x11 \
-S xfce4-notifyd \
-S xmonad \
-S xournalpp \ -S xournalpp \
-S xrandr \
-S zathura \ -S zathura \
-S zsh -S zsh
@@ -133,7 +116,6 @@ stow-delete:
-D tty \ -D tty \
-D vim \ -D vim \
-D vscode \ -D vscode \
-D x11 \
-D xfce4-notifyd \ -D xfce4-notifyd \
-D xmonad \ -D xmonad \
-D xournalpp \ -D xournalpp \
@@ -145,38 +127,27 @@ stow-delete:
stow-recreate: stow-recreate:
stow -v \ stow -v \
-R alacritty \ -R alacritty \
-R autorandr \
-R awesome \
-R bash \ -R bash \
-R betterlockscreen \
-R blender \ -R blender \
-R brightness \ -R brightness \
-R calibre \ -R calibre \
-R deadd \
-R dunst \ -R dunst \
-R dwl \ -R dwl \
-R dwm \
-R emacs \ -R emacs \
-R eww \
-R fish \ -R fish \
-R freecad \ -R freecad \
-R fuzzel \
-R gaming \ -R gaming \
-R gammastep \ -R gammastep \
-R geoclue \ -R geoclue \
-R gimp \ -R gimp \
-R git \ -R git \
-R gtk \ -R gtk \
-R hyprland \
-R kitty \ -R kitty \
-R mangal \ -R mangal \
-R mpv \ -R mpv \
-R naughty \
-R pactl \ -R pactl \
-R picom \
-R playerctl \ -R playerctl \
-R qt5 \ -R qt5 \
-R redshift \
-R rofi \ -R rofi \
-R shikane \ -R shikane \
-R snapborg \ -R snapborg \
@@ -184,21 +155,15 @@ stow-recreate:
-R starship \ -R starship \
-R swappy \ -R swappy \
-R swaylock \ -R swaylock \
-R swaync \
-R swhkd \ -R swhkd \
-R syncthing \ -R syncthing \
-R system76 \ -R system76 \
-R tmux \ -R tmux \
-R trackma \ -R trackma \
-R trackpad \
-R tty \ -R tty \
-R vim \ -R vim \
-R vscode \ -R vscode \
-R x11 \
-R xfce4-notifyd \
-R xmonad \
-R xournalpp \ -R xournalpp \
-R xrandr \
-R zathura \ -R zathura \
-R zsh -R zsh