From b541292ab401806061ea33f6c1fea613067c399a Mon Sep 17 00:00:00 2001 From: Tobias Brandt Date: Fri, 7 Jun 2024 00:12:51 +0200 Subject: [PATCH 1/2] WIP: Separates gui app installs from the rest. --- install-headless.sh | 30 +++++++++++++++++++ install/{mise.sh => app-mise.sh} | 0 install/{a-shell.sh => cfg-shell.sh} | 0 install/{docker.sh => dev-docker.sh} | 0 install/{libraries.sh => dev-libraries.sh} | 0 .../{app-1password.sh => gui-1password.sh} | 0 .../{app-alacritty.sh => gui-alacritty.sh} | 0 install/{app-chrome.sh => gui-chrome.sh} | 0 .../{app-flameshot.sh => gui-flameshot.sh} | 0 install/{fonts.sh => gui-fonts.sh} | 0 ...-tweak-tool.sh => gui-gnome-tweak-tool.sh} | 0 .../{app-localsend.sh => gui-localsend.sh} | 0 install/{app-pinta.sh => gui-pinta.sh} | 0 install/{app-signal.sh => gui-signal.sh} | 0 install/{app-spotify.sh => gui-spotify.sh} | 0 install/{app-typora.sh => gui-typora.sh} | 0 install/{ulauncher.sh => gui-ulauncher.sh} | 0 install/{app-vlc.sh => gui-vlc.sh} | 0 install/{app-vscode.sh => gui-vscode.sh} | 0 .../{app-xournalpp.sh => gui-xournalpp.sh} | 0 install/{app-zoom.sh => gui-zoom.sh} | 0 install/{set-git.sh => set-cfg-git.sh} | 0 install/{set-theme.sh => set-cfg-theme.sh} | 0 install/{set-dock.sh => set-gui-dock.sh} | 0 install/{set-emojis.sh => set-gui-emojis.sh} | 0 ...g.sh => set-gui-framework-text-scaling.sh} | 0 ...ensions.sh => set-gui-gnome-extensions.sh} | 0 ...me-hotkeys.sh => set-gui-gnome-hotkeys.sh} | 0 28 files changed, 30 insertions(+) create mode 100644 install-headless.sh rename install/{mise.sh => app-mise.sh} (100%) rename install/{a-shell.sh => cfg-shell.sh} (100%) rename install/{docker.sh => dev-docker.sh} (100%) rename install/{libraries.sh => dev-libraries.sh} (100%) rename install/{app-1password.sh => gui-1password.sh} (100%) rename install/{app-alacritty.sh => gui-alacritty.sh} (100%) rename install/{app-chrome.sh => gui-chrome.sh} (100%) rename install/{app-flameshot.sh => gui-flameshot.sh} (100%) rename install/{fonts.sh => gui-fonts.sh} (100%) rename install/{app-gnome-tweak-tool.sh => gui-gnome-tweak-tool.sh} (100%) rename install/{app-localsend.sh => gui-localsend.sh} (100%) rename install/{app-pinta.sh => gui-pinta.sh} (100%) rename install/{app-signal.sh => gui-signal.sh} (100%) rename install/{app-spotify.sh => gui-spotify.sh} (100%) rename install/{app-typora.sh => gui-typora.sh} (100%) rename install/{ulauncher.sh => gui-ulauncher.sh} (100%) rename install/{app-vlc.sh => gui-vlc.sh} (100%) rename install/{app-vscode.sh => gui-vscode.sh} (100%) rename install/{app-xournalpp.sh => gui-xournalpp.sh} (100%) rename install/{app-zoom.sh => gui-zoom.sh} (100%) rename install/{set-git.sh => set-cfg-git.sh} (100%) rename install/{set-theme.sh => set-cfg-theme.sh} (100%) rename install/{set-dock.sh => set-gui-dock.sh} (100%) rename install/{set-emojis.sh => set-gui-emojis.sh} (100%) rename install/{set-framework-text-scaling.sh => set-gui-framework-text-scaling.sh} (100%) rename install/{set-gnome-extensions.sh => set-gui-gnome-extensions.sh} (100%) rename install/{set-gnome-hotkeys.sh => set-gui-gnome-hotkeys.sh} (100%) diff --git a/install-headless.sh b/install-headless.sh new file mode 100644 index 00000000..f34554fe --- /dev/null +++ b/install-headless.sh @@ -0,0 +1,30 @@ +# Be fancy +source ~/.local/share/omakub/ascii.sh + +# Ensure ~/Downloads exists +mkdir -p ~/Downloads + +# Needed for all installers +sudo apt update -y +sudo apt install -y curl git jq unzip + +# Ensure computer doesn't go to sleep while installing +#gsettings set org.gnome.desktop.session idle-delay 0 + +# Run installers +for script in ~/.local/share/omakub/install/cfg-*.sh; do source $script; done +for script in ~/.local/share/omakub/install/app*-*.sh; do source $script; done +for script in ~/.local/share/omakub/install/dev-*.sh; do source $script; done +for script in ~/.local/share/omakub/install/set-cfg-*.sh; do source $script; done +#for script in ~/.local/share/omakub/install/gui-*.sh; do source $script; done +#for script in ~/.local/share/omakub/install/set-gui-*.sh; do source $script; done + +# Revert to normal idle settings +#gsettings set org.gnome.desktop.session idle-delay 300 + +# Upgrade everything that might ask for a reboot last +sudo apt upgrade -y + +# Reboot to pickup changes +gum confirm "Ready to logout for all settings to take effect?" && exit +#gum confirm "Ready to logout for all settings to take effect?" && gnome-session-quit --logout --no-prompt diff --git a/install/mise.sh b/install/app-mise.sh similarity index 100% rename from install/mise.sh rename to install/app-mise.sh diff --git a/install/a-shell.sh b/install/cfg-shell.sh similarity index 100% rename from install/a-shell.sh rename to install/cfg-shell.sh diff --git a/install/docker.sh b/install/dev-docker.sh similarity index 100% rename from install/docker.sh rename to install/dev-docker.sh diff --git a/install/libraries.sh b/install/dev-libraries.sh similarity index 100% rename from install/libraries.sh rename to install/dev-libraries.sh diff --git a/install/app-1password.sh b/install/gui-1password.sh similarity index 100% rename from install/app-1password.sh rename to install/gui-1password.sh diff --git a/install/app-alacritty.sh b/install/gui-alacritty.sh similarity index 100% rename from install/app-alacritty.sh rename to install/gui-alacritty.sh diff --git a/install/app-chrome.sh b/install/gui-chrome.sh similarity index 100% rename from install/app-chrome.sh rename to install/gui-chrome.sh diff --git a/install/app-flameshot.sh b/install/gui-flameshot.sh similarity index 100% rename from install/app-flameshot.sh rename to install/gui-flameshot.sh diff --git a/install/fonts.sh b/install/gui-fonts.sh similarity index 100% rename from install/fonts.sh rename to install/gui-fonts.sh diff --git a/install/app-gnome-tweak-tool.sh b/install/gui-gnome-tweak-tool.sh similarity index 100% rename from install/app-gnome-tweak-tool.sh rename to install/gui-gnome-tweak-tool.sh diff --git a/install/app-localsend.sh b/install/gui-localsend.sh similarity index 100% rename from install/app-localsend.sh rename to install/gui-localsend.sh diff --git a/install/app-pinta.sh b/install/gui-pinta.sh similarity index 100% rename from install/app-pinta.sh rename to install/gui-pinta.sh diff --git a/install/app-signal.sh b/install/gui-signal.sh similarity index 100% rename from install/app-signal.sh rename to install/gui-signal.sh diff --git a/install/app-spotify.sh b/install/gui-spotify.sh similarity index 100% rename from install/app-spotify.sh rename to install/gui-spotify.sh diff --git a/install/app-typora.sh b/install/gui-typora.sh similarity index 100% rename from install/app-typora.sh rename to install/gui-typora.sh diff --git a/install/ulauncher.sh b/install/gui-ulauncher.sh similarity index 100% rename from install/ulauncher.sh rename to install/gui-ulauncher.sh diff --git a/install/app-vlc.sh b/install/gui-vlc.sh similarity index 100% rename from install/app-vlc.sh rename to install/gui-vlc.sh diff --git a/install/app-vscode.sh b/install/gui-vscode.sh similarity index 100% rename from install/app-vscode.sh rename to install/gui-vscode.sh diff --git a/install/app-xournalpp.sh b/install/gui-xournalpp.sh similarity index 100% rename from install/app-xournalpp.sh rename to install/gui-xournalpp.sh diff --git a/install/app-zoom.sh b/install/gui-zoom.sh similarity index 100% rename from install/app-zoom.sh rename to install/gui-zoom.sh diff --git a/install/set-git.sh b/install/set-cfg-git.sh similarity index 100% rename from install/set-git.sh rename to install/set-cfg-git.sh diff --git a/install/set-theme.sh b/install/set-cfg-theme.sh similarity index 100% rename from install/set-theme.sh rename to install/set-cfg-theme.sh diff --git a/install/set-dock.sh b/install/set-gui-dock.sh similarity index 100% rename from install/set-dock.sh rename to install/set-gui-dock.sh diff --git a/install/set-emojis.sh b/install/set-gui-emojis.sh similarity index 100% rename from install/set-emojis.sh rename to install/set-gui-emojis.sh diff --git a/install/set-framework-text-scaling.sh b/install/set-gui-framework-text-scaling.sh similarity index 100% rename from install/set-framework-text-scaling.sh rename to install/set-gui-framework-text-scaling.sh diff --git a/install/set-gnome-extensions.sh b/install/set-gui-gnome-extensions.sh similarity index 100% rename from install/set-gnome-extensions.sh rename to install/set-gui-gnome-extensions.sh diff --git a/install/set-gnome-hotkeys.sh b/install/set-gui-gnome-hotkeys.sh similarity index 100% rename from install/set-gnome-hotkeys.sh rename to install/set-gui-gnome-hotkeys.sh From 80b2ed475aa845d91679fcf003a568e0da264fbe Mon Sep 17 00:00:00 2001 From: Tobias Brandt Date: Mon, 10 Jun 2024 14:30:37 +0200 Subject: [PATCH 2/2] Runs dev-* scripts first as these tend to be req'd by the app-* scripts. --- install-headless.sh | 4 ++-- install/cfg-shell.sh | 1 - install/set-cfg-shell.sh | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 install/set-cfg-shell.sh diff --git a/install-headless.sh b/install-headless.sh index f34554fe..7bf28a1b 100644 --- a/install-headless.sh +++ b/install-headless.sh @@ -13,10 +13,10 @@ sudo apt install -y curl git jq unzip # Run installers for script in ~/.local/share/omakub/install/cfg-*.sh; do source $script; done -for script in ~/.local/share/omakub/install/app*-*.sh; do source $script; done for script in ~/.local/share/omakub/install/dev-*.sh; do source $script; done -for script in ~/.local/share/omakub/install/set-cfg-*.sh; do source $script; done +for script in ~/.local/share/omakub/install/app*-*.sh; do source $script; done #for script in ~/.local/share/omakub/install/gui-*.sh; do source $script; done +for script in ~/.local/share/omakub/install/set-cfg-*.sh; do source $script; done #for script in ~/.local/share/omakub/install/set-gui-*.sh; do source $script; done # Revert to normal idle settings diff --git a/install/cfg-shell.sh b/install/cfg-shell.sh index 32c6eb8e..afc770ea 100644 --- a/install/cfg-shell.sh +++ b/install/cfg-shell.sh @@ -1,6 +1,5 @@ [ -f "~/.bashrc" ] && mv ~/.bashrc ~/.bashrc.bak cp ~/.local/share/omakub/configs/bashrc ~/.bashrc -source ~/.local/share/omakub/defaults/bash/shell [ -f "~/.inputrc" ] && mv ~/.inputrc ~/.inputrc.bak cp ~/.local/share/omakub/configs/inputrc ~/.inputrc diff --git a/install/set-cfg-shell.sh b/install/set-cfg-shell.sh new file mode 100644 index 00000000..b9225c68 --- /dev/null +++ b/install/set-cfg-shell.sh @@ -0,0 +1 @@ +source ~/.local/share/omakub/defaults/bash/shell