From e4e2adf3ebde34ed93bc30e40b0910406fcecf31 Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Tue, 27 Feb 2024 21:02:02 -0500 Subject: [PATCH] Add Justfile to Replace Simple Scripts - Update submodules to use working ssh remote and pull in updates - Remove doom and stow scripts in favor of a justfile --- .config/doom-emacs | 2 +- .config/doom-emacs-config | 2 +- .config/dwm-flexipatch | 2 +- .config/hypr | 2 +- .scripts/doom_emacs_doctor.sh | 7 --- .scripts/doom_emacs_sync.sh | 7 --- .scripts/doom_emacs_update.sh | 13 ----- .scripts/stow-create.sh | 3 -- .scripts/stow-remove.sh | 3 -- README.org | 93 +++++++++++------------------------ justfile | 23 +++++++++ 11 files changed, 56 insertions(+), 101 deletions(-) delete mode 100755 .scripts/doom_emacs_doctor.sh delete mode 100755 .scripts/doom_emacs_sync.sh delete mode 100755 .scripts/doom_emacs_update.sh delete mode 100755 .scripts/stow-create.sh delete mode 100755 .scripts/stow-remove.sh create mode 100644 justfile diff --git a/.config/doom-emacs b/.config/doom-emacs index 03d692f..98d753e 160000 --- a/.config/doom-emacs +++ b/.config/doom-emacs @@ -1 +1 @@ -Subproject commit 03d692f129633e3bf0bd100d91b3ebf3f77db6d1 +Subproject commit 98d753e1036f76551ccaa61f5c810782cda3b48a diff --git a/.config/doom-emacs-config b/.config/doom-emacs-config index 23adcd5..53435ae 160000 --- a/.config/doom-emacs-config +++ b/.config/doom-emacs-config @@ -1 +1 @@ -Subproject commit 23adcd51129bdd384ccba00b0f5afc41d2912fff +Subproject commit 53435ae6d724ce744293c19d03fa80edac9c2d09 diff --git a/.config/dwm-flexipatch b/.config/dwm-flexipatch index 597a302..f4f7069 160000 --- a/.config/dwm-flexipatch +++ b/.config/dwm-flexipatch @@ -1 +1 @@ -Subproject commit 597a30207ac5b3bce5022d4d0f62c5c7aa1151be +Subproject commit f4f7069cae2c9d6092fbf7cf7ede7a30125493a7 diff --git a/.config/hypr b/.config/hypr index 4e0cb8d..47dff95 160000 --- a/.config/hypr +++ b/.config/hypr @@ -1 +1 @@ -Subproject commit 4e0cb8d04ab8f0b3890edf45e50e3b5b9b9891b5 +Subproject commit 47dff9522381602388ef237a9cb2bd237f2e4973 diff --git a/.scripts/doom_emacs_doctor.sh b/.scripts/doom_emacs_doctor.sh deleted file mode 100755 index 973ae81..0000000 --- a/.scripts/doom_emacs_doctor.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# Define some local variables -DOOM_BIN=~/.config/doom-emacs/bin/doom -DOOM_DIR_PATH=~/.config/doom-emacs-config - -# Check for errors with installation -DOOMDIR=$DOOM_DIR_PATH $DOOM_BIN doctor diff --git a/.scripts/doom_emacs_sync.sh b/.scripts/doom_emacs_sync.sh deleted file mode 100755 index 07bde23..0000000 --- a/.scripts/doom_emacs_sync.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# Define some local variables -DOOM_BIN=~/.config/doom-emacs/bin/doom -DOOM_DIR_PATH=~/.config/doom-emacs-config - -# Sync Doom with personal configuration -DOOMDIR=$DOOM_DIR_PATH $DOOM_BIN sync diff --git a/.scripts/doom_emacs_update.sh b/.scripts/doom_emacs_update.sh deleted file mode 100755 index 180c45f..0000000 --- a/.scripts/doom_emacs_update.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# Define some local variables -DOOM_BIN=~/.config/doom-emacs/bin/doom -DOOM_DIR_PATH=~/.config/doom-emacs-config - -# Upgrade Doom to the latest version (then update your packages). This is equivalent to -# $ git pull -# $ doom sync -# $ doom update -DOOMDIR=$DOOM_DIR_PATH $DOOM_BIN upgrade - -# Delete orphaned packages & repos, and compacts them -DOOMDIR=$DOOM_DIR_PATH $DOOM_BIN purge diff --git a/.scripts/stow-create.sh b/.scripts/stow-create.sh deleted file mode 100755 index e0b4373..0000000 --- a/.scripts/stow-create.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd $HOME/.dotfiles/ -stow -v . diff --git a/.scripts/stow-remove.sh b/.scripts/stow-remove.sh deleted file mode 100755 index b0a13e8..0000000 --- a/.scripts/stow-remove.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd $HOME/.dotfiles/ -stow -v -D . diff --git a/README.org b/README.org index 4576709..38724b3 100644 --- a/README.org +++ b/README.org @@ -10,8 +10,6 @@ - [[#ignoring-files-and-directories][Ignoring files and directories]] - [[#gnu-stow-ignore][GNU Stow Ignore]] - [[#git-ignore][Git Ignore]] - - [[#create-symbolic-links-with-gnu-stow][Create Symbolic Links with GNU Stow]] - - [[#remove-symbolic-links-with-gnu-stow][Remove Symbolic Links with GNU Stow]] - [[#git][Git]] - [[#gitconfig][Gitconfig]] - [[#notifications][Notifications]] @@ -62,7 +60,6 @@ - [[#vim][Vim]] - [[#emacs][Emacs]] - [[#chemacs2][Chemacs2]] - - [[#doom-emacs-scripts][DOOM Emacs Scripts]] - [[#vs-code][VS Code]] - [[#settings][Settings]] - [[#keybindings][Keybindings]] @@ -109,6 +106,7 @@ - [[#sizes][Sizes]] - [[#application-specific-changes][Application Specific Changes]] - [[#startup][Startup]] +- [[#justfile][Justfile]] - [[#miscellaneous-scripts][Miscellaneous Scripts]] - [[#media-control][Media Control]] - [[#volume-control][Volume Control]] @@ -290,20 +288,6 @@ Things to ignore in dotfiles git repo. .themes/dracula-pro #+END_SRC -** Create Symbolic Links with GNU Stow - -#+BEGIN_SRC shell :shebang #!/bin/bash :tangle .scripts/stow-create.sh -cd $HOME/.dotfiles/ -stow -v . -#+END_SRC - -** Remove Symbolic Links with GNU Stow - -#+BEGIN_SRC shell :shebang #!/bin/bash :tangle .scripts/stow-remove.sh -cd $HOME/.dotfiles/ -stow -v -D . -#+END_SRC - * Git ** Gitconfig @@ -7758,53 +7742,6 @@ Select the emacs configuration to use by default. doom #+END_SRC -*** DOOM Emacs Scripts - -**** Update - -Script to update Doom Emacs configuration. - -#+BEGIN_SRC shell :shebang #!/bin/bash :tangle .scripts/doom_emacs_update.sh -# Define some local variables -DOOM_BIN=~/.config/doom-emacs/bin/doom -DOOM_DIR_PATH=~/.config/doom-emacs-config - -# Upgrade Doom to the latest version (then update your packages). This is equivalent to -# $ git pull -# $ doom sync -# $ doom update -DOOMDIR=$DOOM_DIR_PATH $DOOM_BIN upgrade - -# Delete orphaned packages & repos, and compacts them -DOOMDIR=$DOOM_DIR_PATH $DOOM_BIN purge -#+END_SRC - -**** Sync - -Script to synchronize Doom Emacs configuration - -#+BEGIN_SRC shell :shebang #!/bin/bash :tangle .scripts/doom_emacs_sync.sh -# Define some local variables -DOOM_BIN=~/.config/doom-emacs/bin/doom -DOOM_DIR_PATH=~/.config/doom-emacs-config - -# Sync Doom with personal configuration -DOOMDIR=$DOOM_DIR_PATH $DOOM_BIN sync -#+END_SRC - -**** Doctor - -Script to check for errors with Doom Emacs install - -#+BEGIN_SRC shell :shebang #!/bin/bash :tangle .scripts/doom_emacs_doctor.sh -# Define some local variables -DOOM_BIN=~/.config/doom-emacs/bin/doom -DOOM_DIR_PATH=~/.config/doom-emacs-config - -# Check for errors with installation -DOOMDIR=$DOOM_DIR_PATH $DOOM_BIN doctor -#+END_SRC - ** VS Code *** Settings @@ -9889,6 +9826,34 @@ main() { main $@ #+END_SRC +* Justfile + +#+BEGIN_SRC just :tangle justfile +set shell := ["bash", "-c"] + +DOOM_BIN := "~/.config/doom-emacs/bin/doom" +DOOM_DIR_PATH := "~/.config/doom-emacs-config" + +doom-emacs-update: && doom-emacs-sync + DOOMDIR={{DOOM_DIR_PATH}} {{DOOM_BIN}} upgrade + DOOMDIR={{DOOM_DIR_PATH}} {{DOOM_BIN}} purge + +doom-emacs-sync: + DOOMDIR={{DOOM_DIR_PATH}} {{DOOM_BIN}} sync + +doom-emacs-doctor: + DOOMDIR={{DOOM_DIR_PATH}} {{DOOM_BIN}} doctor + +stow-create: + stow -v -S . + +stow-delete: + stow -v -D . + +stow-recreate: + stow -v -R . +#+END_SRC + * Miscellaneous Scripts ** Media Control diff --git a/justfile b/justfile new file mode 100644 index 0000000..0ba6c1e --- /dev/null +++ b/justfile @@ -0,0 +1,23 @@ +set shell := ["bash", "-c"] + +DOOM_BIN := "~/.config/doom-emacs/bin/doom" +DOOM_DIR_PATH := "~/.config/doom-emacs-config" + +doom-emacs-update: && doom-emacs-sync + DOOMDIR={{DOOM_DIR_PATH}} {{DOOM_BIN}} upgrade + DOOMDIR={{DOOM_DIR_PATH}} {{DOOM_BIN}} purge + +doom-emacs-sync: + DOOMDIR={{DOOM_DIR_PATH}} {{DOOM_BIN}} sync + +doom-emacs-doctor: + DOOMDIR={{DOOM_DIR_PATH}} {{DOOM_BIN}} doctor + +stow-create: + stow -v -S . + +stow-delete: + stow -v -D . + +stow-recreate: + stow -v -R .