Merge branch 'master' of github.com:ogabriel/setuper

Author: ogabriel

README.md

@@ -48,9 +48,11 @@ And inside that you can have three folders with the files to be used:
     - these files should be mostly the dotfiles
 - `./packages` - from your sourced files
 
-you can also define custom locations to these files with a `$HOME/.config/setuper/config/entrypoint.sh`, like:
+you can also define custom locations to these files with a `$HOME/.config/setuper/init.sh`, like:
 
 ```bash
+config_files_dir=$HOME/.debian_config/
+config_files_dir=$HOME/.arch_config/
 system_files_dir=$HOME/.system/
 user_files_dir=$HOME/.dotfiles/
 sourced_package_dir=$HOME/.mypackages/
@@ -68,9 +70,14 @@ sourced_package_dir=$HOME/.mypackages/
     - `--flatpak` - flatpak packages
     - `--source=file` - this allows you to install a specific package in your config directories, like a `pkg.tar.zst` or `deb`, the file must be in the folder `packages/file`
 - `RemovePkg/RemovePackage packagename` - removes said package
-- `SystemdUnitSystemEnable unitname` - enables a systemd system unit
+- `SystemdUnitSystemEnable unitname` - enables a systemd system unit (auto-unmasks if masked)
+- `SystemdUnitSystemDisable unitname` - disables a systemd system unit
 - `SystemdUnitSystemMask unitname` - masks a systemd system unit
-- `SystemdUnitUserEnable unitname` -enables a system user unit
+- `SystemdUnitSystemUnmask unitname` - unmasks a systemd system unit
+- `SystemdUnitUserEnable unitname` - enables a system user unit (auto-unmasks if masked)
+- `SystemdUnitUserDisable unitname` - disables a system user unit
+- `SystemdUnitUserMask unitname` - masks a system user unit
+- `SystemdUnitUserUnmask unitname` - unmasks a system user unit
 - `SystemFile file` - copies a system file with superuser permissions, like a udev rule, tlp config etc.
 - `SystemFileFromTo from_file to_file` - same as above, but you can rename
 - `SystemDirectory directory` - copies a directory like `system/etc/sddm.conf.d` to `/etc/sddm.conf.d`
@@ -95,7 +102,7 @@ The order is thought to not cause any problems, so for example, the packages wil
 
 ### Sourcing order
 
-When loading the configuration files, the file `entrypoint.sh` will be sourced first, and then the rest by alphabetical order
+When loading the configuration files, the file `init.sh` will be sourced first, and then the rest by alphabetical order
 
 ### Examples of configurations
 
@@ -115,10 +122,10 @@ if [[ "$HOSTNAME" == "laptop" ]]; then
 fi
 ```
 
-Sometimes you want to define a variable to be used on other files, so you can set a variable on the `entrypoint.sh` to be later used:
+Sometimes you want to define a variable to be used on other files, so you can set a variable on the `init.sh` to be later used:
 
 ```bash
-# on the entrypoint.sh file
+# on the init.sh file
 case $HOSTNAME in
 my_work_PC)
     window_manager=sway

examples/init.sh

@@ -0,0 +1,12 @@
+case $HOSTNAME in
+my_work_PC)
+    window_manager=sway
+
+    config_files_dir=$HOME/.config_work/
+    ;;
+my_personal_PC)
+    window_manager=hyprland
+
+    config_files_dir=$HOME/.config_personal/
+    ;;
+esac

lib/apply.sh

@@ -1,6 +1,5 @@
 source $lib_dir/helper_functions.sh
 
-CheckConfig
 CheckPermissons
 DefineDistro
 

lib/config/main.sh

@@ -6,21 +6,20 @@ source $lib_dir/config/files_and_directories.sh
 source $lib_dir/config/users_and_groups.sh
 
 function LoadConfig() {
-    if [[ -f $config_files_dir/entrypoint.sh ]]; then
-        Info "Loading entrypoint"
-        source $config_files_dir/entrypoint.sh
+    if [[ -f $config_dir/init.sh ]]; then
+        Info "Loading init"
+        source $config_dir/init.sh
     fi
 
+    : ${config_files_dir:=$config_dir/config}
     : ${system_files_dir:=$config_dir/system/}
     : ${user_files_dir:=$config_dir/user/}
     : ${sourced_package_dir:=$config_dir/packages/}
 
+    CheckConfig
+
     for file in $config_files_dir/*.sh; do
-        if [[ $file == $config_files_dir/entrypoint.sh ]]; then
-            continue
-        else
-            Info "Loading $file"
-            source $file
-        fi
+        Info "Loading $file"
+        source $file
     done
 }

lib/config/systemd.sh

@@ -10,14 +10,38 @@ function SystemdUnitSystemDisable() {
     systemd_unit_system_disable+=($1)
 }
 
+function SystemdUnitSystemMask() {
+    ValidateExactFunctionParams 1 $# $FUNCNAME
+
+    systemd_unit_system_mask+=($1)
+}
+
+function SystemdUnitSystemUnmask() {
+    ValidateExactFunctionParams 1 $# $FUNCNAME
+
+    systemd_unit_system_unmask+=($1)
+}
+
 function SystemdUnitUserEnable() {
     ValidateExactFunctionParams 1 $# $FUNCNAME
 
     systemd_unit_user_enable+=($1)
 }
 
-function SystemdUnitSystemMask() {
+function SystemdUnitUserDisable() {
     ValidateExactFunctionParams 1 $# $FUNCNAME
 
-    systemd_unit_system_mask+=($1)
+    systemd_unit_user_disable+=($1)
+}
+
+function SystemdUnitUserMask() {
+    ValidateExactFunctionParams 1 $# $FUNCNAME
+
+    systemd_unit_user_mask+=($1)
+}
+
+function SystemdUnitUserUnmask() {
+    ValidateExactFunctionParams 1 $# $FUNCNAME
+
+    systemd_unit_user_unmask+=($1)
 }

lib/handler/systemd.sh

@@ -1,52 +1,118 @@
 function HandleSystemdUnits() {
     if [[ ${#systemd_unit_system_enable[*]} -gt 0 ]] ||
         [[ ${#systemd_unit_system_mask[*]} -gt 0 ]] ||
+        [[ ${#systemd_unit_system_unmask[*]} -gt 0 ]] ||
         [[ ${#systemd_unit_system_disable[*]} -gt 0 ]] ||
-        [[ ${#systemd_unit_user_enable[*]} -gt 0 ]]; then
+        [[ ${#systemd_unit_user_enable[*]} -gt 0 ]] ||
+        [[ ${#systemd_unit_user_unmask[*]} -gt 0 ]] ||
+        [[ ${#systemd_unit_user_disable[*]} -gt 0 ]] ||
+        [[ ${#systemd_unit_user_mask[*]} -gt 0 ]]; then
 
         if ! __AllUnitsFound?; then
             sudo systemctl daemon-reload
         fi
 
-        __HandleSystemEnable
+        __WarnConflicts
+
         __HandleSystemMask
+        __HandleSystemUnmask
+
         __HandleSystemDisable
+        __HandleSystemEnable
+
+        __HandleUserMask
+        __HandleUserUnmask
+
+        __HandleUserDisable
         __HandleUserEnable
     fi
 }
 
-function __HandleSystemEnable() {
-    for service in ${systemd_unit_system_enable[*]}; do
-        if ! systemctl is-enabled --quiet $service &>/dev/null; then
-            Info "Enabling systemmd system unit $service"
-            sudo systemctl enable $service --force
-        fi
-    done
-}
-
 function __HandleSystemMask() {
     for service in ${systemd_unit_system_mask[*]}; do
         if ! systemctl list-unit-files --quiet --state=masked $service &>/dev/null; then
-            Info "Masking systemmd unit $service"
+            Info "Masking systemd system unit $service"
             sudo systemctl mask $service
         fi
     done
 }
 
+function __HandleSystemUnmask() {
+    for service in ${systemd_unit_system_unmask[*]}; do
+        __HandleSystemUnmaskService $service
+    done
+}
+
+function __HandleSystemUnmaskService() {
+    local service=$1
+
+    if systemctl list-unit-files --quiet --state=masked $service &>/dev/null; then
+        Info "Unmasking systemd system unit $service"
+        sudo systemctl unmask $service
+    fi
+}
+
 function __HandleSystemDisable() {
     for service in ${systemd_unit_system_disable[*]}; do
         if systemctl list-unit-files --quiet $service &>/dev/null &&
             ! systemctl list-unit-files --quiet --state=disabled $service &>/dev/null; then
-            Info "Disabling systemmd system unit $service"
+            Info "Disabling systemd system unit $service"
             sudo systemctl disable $service
         fi
     done
 }
 
+function __HandleSystemEnable() {
+    for service in ${systemd_unit_system_enable[*]}; do
+        __HandleSystemUnmaskService $service
+
+        if ! systemctl is-enabled --quiet $service &>/dev/null; then
+            Info "Enabling systemd system unit $service"
+            sudo systemctl enable $service --force
+        fi
+    done
+}
+
+function __HandleUserUnmask() {
+    for service in ${systemd_unit_user_unmask[*]}; do
+        __HandleUserUnmaskService $service
+    done
+}
+
+function __HandleUserUnmaskService() {
+    local service=$1
+
+    if systemctl --user list-unit-files --quiet --state=masked $service &>/dev/null; then
+        Info "Unmasking systemd user unit $service"
+        systemctl --user unmask $service
+    fi
+}
+
+function __HandleUserMask() {
+    for service in ${systemd_unit_user_mask[*]}; do
+        if ! systemctl --user list-unit-files --quiet --state=masked $service &>/dev/null; then
+            Info "Masking systemd user unit $service"
+            systemctl --user mask $service
+        fi
+    done
+}
+
+function __HandleUserDisable() {
+    for service in ${systemd_unit_user_disable[*]}; do
+        if systemctl --user list-unit-files --quiet $service &>/dev/null &&
+            ! systemctl --user list-unit-files --quiet --state=disabled $service &>/dev/null; then
+            Info "Disabling systemd user unit $service"
+            systemctl --user disable $service
+        fi
+    done
+}
+
 function __HandleUserEnable() {
     for service in ${systemd_unit_user_enable[*]}; do
+        __HandleUserUnmaskService $service
+
         if ! systemctl --user is-enabled --quiet $service &>/dev/null; then
-            Info "Enabling systemmd user unit $service"
+            Info "Enabling systemd user unit $service"
             systemctl --user enable $service
         fi
     done
@@ -71,11 +137,53 @@ function __AllUnitsFound?() {
         fi
     done
 
+    for service in ${systemd_unit_system_unmask[*]}; do
+        if ! systemctl list-unit-files --quiet $service &>/dev/null; then
+            return 1
+        fi
+    done
+
     for service in ${systemd_unit_user_enable[*]}; do
         if ! systemctl --user list-unit-files --quiet $service &>/dev/null; then
             return 1
         fi
     done
 
+    for service in ${systemd_unit_user_disable[*]}; do
+        if ! systemctl --user list-unit-files --quiet $service &>/dev/null; then
+            return 1
+        fi
+    done
+
+    for service in ${systemd_unit_user_mask[*]}; do
+        if ! systemctl --user list-unit-files --quiet $service &>/dev/null; then
+            return 1
+        fi
+    done
+
+    for service in ${systemd_unit_user_unmask[*]}; do
+        if ! systemctl --user list-unit-files --quiet $service &>/dev/null; then
+            return 1
+        fi
+    done
+
     return 0
 }
+
+function __WarnConflicts() {
+    for enable_service in ${systemd_unit_system_enable[*]}; do
+        for mask_service in ${systemd_unit_system_mask[*]}; do
+            if [[ $enable_service == $mask_service ]]; then
+                Warn "System unit $enable_service present in both enable and mask lists; will end up enabled"
+            fi
+        done
+    done
+
+    for enable_service in ${systemd_unit_user_enable[*]}; do
+        for mask_service in ${systemd_unit_user_mask[*]}; do
+            if [[ $enable_service == $mask_service ]]; then
+                Warn "User unit $enable_service present in both enable and mask lists; will end up enabled"
+            fi
+        done
+    done
+}

lib/helper_functions.sh

@@ -25,7 +25,7 @@ function CheckConfig() {
     fi
 
     if ! [[ -n "$(find $config_files_dir -maxdepth 1 -type f -size +0 -iname "*.sh" -print -quit)" ]]; then
-        Error "No valid .sh files found in $config_dir"
+        Error "No valid .sh files found in $config_files_dir"
     fi
 }
 

lib/main.sh

@@ -13,7 +13,6 @@ Options:
 else
     readonly lib_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
     readonly config_dir=${XDG_CONFIG_HOME:-$HOME/.config}/setuper
-    readonly config_files_dir=$config_dir/config
 
     case $1 in
     install)