From 371d753f1612e0d6e2817b6bb92f97fddd531813 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Thu, 9 Nov 2023 11:47:47 -0500 Subject: [PATCH] Reorg --- .../gnome/gnome-terminal-settings.sh | 9 ++++----- configs/shells/bash/.bashrc | 2 +- configs/shells/zsh/.zshrc | 2 +- install-linux.sh | 3 ++- {configs/scripts => scripts}/aspath | 0 {configs/scripts => scripts}/basejump | 0 {configs/scripts => scripts}/basejump-fetch | 0 {configs/scripts => scripts}/basejump-init | 0 {configs/scripts => scripts}/catto | 0 .../scripts => scripts}/configure-gnome-remote-desktop | 0 {configs/scripts => scripts}/deadline-read-options | 0 {configs/scripts => scripts}/ewp-sendmail | 0 {configs/scripts => scripts}/fetch-steamdeck-screenshots | 0 {configs/scripts => scripts}/git-authors-multirepo | 0 {configs/scripts => scripts}/github-to-trello | 0 {configs/scripts => scripts}/guru-shell | 0 {configs/scripts => scripts}/guru-sync-issues | 0 {configs/scripts => scripts}/guru-vpn | 0 {configs/scripts => scripts}/houdini-tool | 0 {configs/scripts => scripts}/hython-latest | 0 {configs/scripts => scripts}/install-nvim-appimage | 0 {configs/scripts => scripts}/install-nvim-from-source | 0 {configs/scripts => scripts}/qmk-helper | 0 {configs/scripts => scripts}/run-logid | 0 {configs/scripts => scripts}/scp-make-upload-acl | 0 {configs/scripts => scripts}/show-pythonpath | 0 {configs/scripts => scripts}/ufw-del | 0 {configs/scripts => scripts}/ufw-gen | 0 {configs/scripts => scripts}/usdnc-to-usd | 0 {configs/scripts => scripts}/video_trimmer | 0 {configs/scripts => scripts}/wg-genzone | 0 {configs/scripts => scripts}/wg-handshakes | 0 32 files changed, 8 insertions(+), 8 deletions(-) rename helpers/configure-gnome.sh => configs/gnome/gnome-terminal-settings.sh (58%) rename {configs/scripts => scripts}/aspath (100%) rename {configs/scripts => scripts}/basejump (100%) rename {configs/scripts => scripts}/basejump-fetch (100%) rename {configs/scripts => scripts}/basejump-init (100%) rename {configs/scripts => scripts}/catto (100%) rename {configs/scripts => scripts}/configure-gnome-remote-desktop (100%) rename {configs/scripts => scripts}/deadline-read-options (100%) rename {configs/scripts => scripts}/ewp-sendmail (100%) rename {configs/scripts => scripts}/fetch-steamdeck-screenshots (100%) rename {configs/scripts => scripts}/git-authors-multirepo (100%) rename {configs/scripts => scripts}/github-to-trello (100%) rename {configs/scripts => scripts}/guru-shell (100%) rename {configs/scripts => scripts}/guru-sync-issues (100%) rename {configs/scripts => scripts}/guru-vpn (100%) rename {configs/scripts => scripts}/houdini-tool (100%) rename {configs/scripts => scripts}/hython-latest (100%) rename {configs/scripts => scripts}/install-nvim-appimage (100%) rename {configs/scripts => scripts}/install-nvim-from-source (100%) rename {configs/scripts => scripts}/qmk-helper (100%) rename {configs/scripts => scripts}/run-logid (100%) rename {configs/scripts => scripts}/scp-make-upload-acl (100%) rename {configs/scripts => scripts}/show-pythonpath (100%) rename {configs/scripts => scripts}/ufw-del (100%) rename {configs/scripts => scripts}/ufw-gen (100%) rename {configs/scripts => scripts}/usdnc-to-usd (100%) rename {configs/scripts => scripts}/video_trimmer (100%) rename {configs/scripts => scripts}/wg-genzone (100%) rename {configs/scripts => scripts}/wg-handshakes (100%) diff --git a/helpers/configure-gnome.sh b/configs/gnome/gnome-terminal-settings.sh similarity index 58% rename from helpers/configure-gnome.sh rename to configs/gnome/gnome-terminal-settings.sh index 0faa1ff..51b0601 100644 --- a/helpers/configure-gnome.sh +++ b/configs/gnome/gnome-terminal-settings.sh @@ -1,6 +1,9 @@ #! /bin/sh set -e +# Get the path to this script +SCRIPT_PATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" + # Check if dconf is available if ! command -v dconf >/dev/null 2>&1; then echo "dconf is not installed, skipping GNOME configuration" @@ -9,8 +12,4 @@ fi # Configure gnome-terminal echo "Writing gnome-terminal settings..." -dconf load "/org/gnome/terminal/" < configs/gnome/terminal/terminal.dconf - -# Configure GNOME itself -echo "Writing GNOME settings..." -sh ./configs/gnome/desktop-settings.sh \ No newline at end of file +dconf load "/org/gnome/terminal/" < $SCRIPT_PATH/terminal/terminal.dconf diff --git a/configs/shells/bash/.bashrc b/configs/shells/bash/.bashrc index 342546e..44a9343 100644 --- a/configs/shells/bash/.bashrc +++ b/configs/shells/bash/.bashrc @@ -9,7 +9,7 @@ export EWCONFIG_ROOT="$HOME/.config/ewconfig" # I always want my ~/bin to be in my PATH export PATH="$HOME/bin:$PATH" -export PATH="$EWCONFIG_ROOT/configs/scripts:$PATH" +export PATH="$EWCONFIG_ROOT/scripts:$PATH" export PATH="$HOME/.local/bin:$PATH" # A basic prompt to display user@host dir sign diff --git a/configs/shells/zsh/.zshrc b/configs/shells/zsh/.zshrc index 8e5f39f..26de500 100644 --- a/configs/shells/zsh/.zshrc +++ b/configs/shells/zsh/.zshrc @@ -18,7 +18,7 @@ fi # I always want my ~/bin to be in my PATH export PATH="$HOME/bin:$PATH" -export PATH="$EWCONFIG_ROOT/configs/scripts:$PATH" +export PATH="$EWCONFIG_ROOT/scripts:$PATH" export PATH="$HOME/.local/bin:$PATH" # Configure a sane default editor diff --git a/install-linux.sh b/install-linux.sh index 50a163f..10b1ad6 100644 --- a/install-linux.sh +++ b/install-linux.sh @@ -131,7 +131,8 @@ if [ -d ~/.config/blender/3.6 ]; then ln -sf $EWCONFIG_ROOT/configs/blender/3.x/ # -- Finalization -- # On systems that need it, configure Gnome -sh ./helpers/configure-gnome.sh +sh ./configs/gnome/gnome-terminal-settings.sh +sh ./configs/gnome/desktop-settings.sh # Attempt to force a termux settings reload on Android devices termux-reload-settings || true diff --git a/configs/scripts/aspath b/scripts/aspath similarity index 100% rename from configs/scripts/aspath rename to scripts/aspath diff --git a/configs/scripts/basejump b/scripts/basejump similarity index 100% rename from configs/scripts/basejump rename to scripts/basejump diff --git a/configs/scripts/basejump-fetch b/scripts/basejump-fetch similarity index 100% rename from configs/scripts/basejump-fetch rename to scripts/basejump-fetch diff --git a/configs/scripts/basejump-init b/scripts/basejump-init similarity index 100% rename from configs/scripts/basejump-init rename to scripts/basejump-init diff --git a/configs/scripts/catto b/scripts/catto similarity index 100% rename from configs/scripts/catto rename to scripts/catto diff --git a/configs/scripts/configure-gnome-remote-desktop b/scripts/configure-gnome-remote-desktop similarity index 100% rename from configs/scripts/configure-gnome-remote-desktop rename to scripts/configure-gnome-remote-desktop diff --git a/configs/scripts/deadline-read-options b/scripts/deadline-read-options similarity index 100% rename from configs/scripts/deadline-read-options rename to scripts/deadline-read-options diff --git a/configs/scripts/ewp-sendmail b/scripts/ewp-sendmail similarity index 100% rename from configs/scripts/ewp-sendmail rename to scripts/ewp-sendmail diff --git a/configs/scripts/fetch-steamdeck-screenshots b/scripts/fetch-steamdeck-screenshots similarity index 100% rename from configs/scripts/fetch-steamdeck-screenshots rename to scripts/fetch-steamdeck-screenshots diff --git a/configs/scripts/git-authors-multirepo b/scripts/git-authors-multirepo similarity index 100% rename from configs/scripts/git-authors-multirepo rename to scripts/git-authors-multirepo diff --git a/configs/scripts/github-to-trello b/scripts/github-to-trello similarity index 100% rename from configs/scripts/github-to-trello rename to scripts/github-to-trello diff --git a/configs/scripts/guru-shell b/scripts/guru-shell similarity index 100% rename from configs/scripts/guru-shell rename to scripts/guru-shell diff --git a/configs/scripts/guru-sync-issues b/scripts/guru-sync-issues similarity index 100% rename from configs/scripts/guru-sync-issues rename to scripts/guru-sync-issues diff --git a/configs/scripts/guru-vpn b/scripts/guru-vpn similarity index 100% rename from configs/scripts/guru-vpn rename to scripts/guru-vpn diff --git a/configs/scripts/houdini-tool b/scripts/houdini-tool similarity index 100% rename from configs/scripts/houdini-tool rename to scripts/houdini-tool diff --git a/configs/scripts/hython-latest b/scripts/hython-latest similarity index 100% rename from configs/scripts/hython-latest rename to scripts/hython-latest diff --git a/configs/scripts/install-nvim-appimage b/scripts/install-nvim-appimage similarity index 100% rename from configs/scripts/install-nvim-appimage rename to scripts/install-nvim-appimage diff --git a/configs/scripts/install-nvim-from-source b/scripts/install-nvim-from-source similarity index 100% rename from configs/scripts/install-nvim-from-source rename to scripts/install-nvim-from-source diff --git a/configs/scripts/qmk-helper b/scripts/qmk-helper similarity index 100% rename from configs/scripts/qmk-helper rename to scripts/qmk-helper diff --git a/configs/scripts/run-logid b/scripts/run-logid similarity index 100% rename from configs/scripts/run-logid rename to scripts/run-logid diff --git a/configs/scripts/scp-make-upload-acl b/scripts/scp-make-upload-acl similarity index 100% rename from configs/scripts/scp-make-upload-acl rename to scripts/scp-make-upload-acl diff --git a/configs/scripts/show-pythonpath b/scripts/show-pythonpath similarity index 100% rename from configs/scripts/show-pythonpath rename to scripts/show-pythonpath diff --git a/configs/scripts/ufw-del b/scripts/ufw-del similarity index 100% rename from configs/scripts/ufw-del rename to scripts/ufw-del diff --git a/configs/scripts/ufw-gen b/scripts/ufw-gen similarity index 100% rename from configs/scripts/ufw-gen rename to scripts/ufw-gen diff --git a/configs/scripts/usdnc-to-usd b/scripts/usdnc-to-usd similarity index 100% rename from configs/scripts/usdnc-to-usd rename to scripts/usdnc-to-usd diff --git a/configs/scripts/video_trimmer b/scripts/video_trimmer similarity index 100% rename from configs/scripts/video_trimmer rename to scripts/video_trimmer diff --git a/configs/scripts/wg-genzone b/scripts/wg-genzone similarity index 100% rename from configs/scripts/wg-genzone rename to scripts/wg-genzone diff --git a/configs/scripts/wg-handshakes b/scripts/wg-handshakes similarity index 100% rename from configs/scripts/wg-handshakes rename to scripts/wg-handshakes