diff --git a/home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.tmpl b/home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.tmpl index af687e9f..d0310ab9 100644 --- a/home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.tmpl +++ b/home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.tmpl @@ -21,5 +21,5 @@ fi ### Modify vm.max_map_count if command -v sysctl > /dev/null; then logg info 'Increasing vm.max_map_count size to 262144' - sudo sysctl -w vm.max_map_count=262144 + sudo sysctl -w vm.max_map_count=262144 > /dev/null fi diff --git a/home/.chezmoiscripts/universal/run_onchange_after_25-gnome-extension-settings.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_25-gnome-extension-settings.tmpl index 70de3164..bc39190e 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_25-gnome-extension-settings.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_25-gnome-extension-settings.tmpl @@ -73,7 +73,7 @@ if [ -f "$HOME/.config/desktop/gnome.yml" ]; then EXT_SETTINGS_TYPE="$(cat "$TMP" | jq -r '.settings | type')" EXT_SETTINGS="$(cat "$TMP" | jq -r '.settings')" if [ "$EXT_SETTINGS" != 'null' ]; then - logg info 'Evaluating extension settings' + logg info 'Evaluating extension settings for `'"$EXT_ID"'`' if [ "$EXT_SETTINGS_TYPE" == 'array' ]; then cat "$TMP" | jq -r '.settings[]' | while read EXT_SETTING; do logg info 'Applying following extension setting:' diff --git a/home/.chezmoiscripts/universal/run_onchange_after_4-environment-profile.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_4-environment-profile.tmpl index f63bff39..d4fd0dd2 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_4-environment-profile.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_4-environment-profile.tmpl @@ -8,8 +8,10 @@ logg info 'Ensuring QT_STYLE_OVERRIDE is set in /etc/environment' if cat /etc/environment | grep QT_STYLE_OVERRIDE > /dev/null; then sudo sed -i 's/.*QT_STYLE_OVERRIDE.*/export QT_STYLE_OVERRIDE=kvantum-dark/' /etc/environment + logg info 'Updated QT_STYLE_OVERRIDE in /etc/environment' else echo 'export QT_STYLE_OVERRIDE=kvantum-dark' | sudo tee -a /etc/environment + logg info 'Added QT_STYLE_OVERRIDE to /etc/environment' fi {{ end -}} diff --git a/home/.chezmoiscripts/universal/run_onchange_after_5-log-config.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_5-log-config.tmpl index 270ed1c2..107a7682 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_5-log-config.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_5-log-config.tmpl @@ -10,14 +10,15 @@ {{ includeTemplate "universal/profile" }} {{ includeTemplate "universal/logg" }} -find /home -maxdepth 1 -type d | while read HOME_DIR; do - USER_FOLDER="$(echo "$HOME_DIR" | sed 's/\/\([^\/]*\)/\1/')" - if [ ! -d "/var/log/user/$USER_FOLDER" ]; then - if [ ! -d "$HOME_DIR/.local/log" ]; then - mkdir -p "$HOME_DIR/.local/log" +find /home -mindepth 1 -maxdepth 1 -type d | while read HOME_DIR; do + USER_FOLDER="$(echo "$HOME_DIR" | sed 's/.*\/\([^\/]*\)$/\1/')" + if [ -d "$HOME_DIR/.local" ]; then + if [ ! -d "/var/log/user/$USER_FOLDER" ]; then + if [ ! -d "$HOME_DIR/.local/log" ]; then + mkdir -p "$HOME_DIR/.local/log" + fi + sudo ln -s "$HOME_DIR/.local/log" "/var/log/user/$USER_FOLDER" + logg success 'Symlinked /var/log/user/'"$USER_FOLDER"' to ~/.local/log' fi - sudo mkdir -p "$(dirname "/var/log/user/$USER_FOLDER")" - sudo ln -s "$HOME_DIR/.local/log" "/var/log/user/$USER_FOLDER" - logg success 'Symlinked /var/log/user/'"$USER_FOLDER"' to ~/.local/log' fi done diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program index c0e7fa62..71b4f7d6 100644 --- a/home/dot_local/bin/executable_install-program +++ b/home/dot_local/bin/executable_install-program @@ -70,7 +70,7 @@ function log(type, label, msg) { } function runCommand(spinnerTitle, command) { - execSync(command.includes('sudo') ? `sudo gum spin --spinner dot --title "${spinnerTitle}" -- ${command}` : `gum spin --spinner dot --title "${spinnerTitle}" -- ${command}`, { + execSync(command.includes('sudo') ? `sudo "$(which gum)" spin --spinner dot --title "${spinnerTitle}" -- ${command}` : `gum spin --spinner dot --title "${spinnerTitle}" -- ${command}`, { stdio: 'inherit', shell: true }) diff --git a/software.yml b/software.yml index f06e31fb..f759ac20 100644 --- a/software.yml +++ b/software.yml @@ -207,7 +207,7 @@ softwarePackages: - web-font-generator - what-ip # Only works with at least one package specified - flatpak: flatseal + flatpak: com.github.tchx84.Flatseal drawing: _bin: drawing flatpak: com.github.maoschanz.drawing @@ -4076,9 +4076,6 @@ softwarePackages: _home: null _name: MAS CLI ansible: professormanhattan.mas - flatseal: - _bin: flatseal - flatpak: com.github.tchx84.Flatseal gnome-extension-manager: _bin: gnome-extension-manager flatpak: com.mattjakeman.ExtensionManager