diff --git a/modules/01-git.sh b/modules/01-git.sh index e2b98ed..61fb025 100644 --- a/modules/01-git.sh +++ b/modules/01-git.sh @@ -1,6 +1,7 @@ #!/bin/bash -ensure_system_is_updated && +source ./modules/00-library.sh && + ensure_system_is_updated && ensure_package_is_installed git && ensure_package_is_installed github-cli && ensure_git_configuration_set "user.name" && diff --git a/modules/02-base.sh b/modules/02-base.sh index 9f0e746..978b76c 100644 --- a/modules/02-base.sh +++ b/modules/02-base.sh @@ -1,6 +1,7 @@ #!/bin/bash -ensure_git_configuration_set "user.name" && +source ./modules/00-library.sh && + ensure_git_configuration_set "user.name" && ensure_git_configuration_set "user.email" && ensure_git_configuration_set "init.defaultbranch" && ensure_ssh_key_installed && diff --git a/modules/03-docker.sh b/modules/03-docker.sh index 9c2ab24..3cd2cfe 100644 --- a/modules/03-docker.sh +++ b/modules/03-docker.sh @@ -1,8 +1,8 @@ #!/bin/bash -ensure_package_is_installed docker && +source ./modules/00-library.sh && + ensure_package_is_installed docker && ensure_package_is_installed docker-compose && ensure_package_is_installed lazydocker && ensure_group_is_installed docker && ensure_service_active docker - diff --git a/modules/04-neovim.sh b/modules/04-neovim.sh index 3c9caca..dd8e229 100644 --- a/modules/04-neovim.sh +++ b/modules/04-neovim.sh @@ -1,7 +1,7 @@ #!/bin/bash -ensure_package_is_installed nvim && +source ./modules/00-library.sh && + ensure_package_is_installed nvim && ensure_package_is_installed lazygit && synchronize_user_folder ./sources/nvim/ ~/.config/nvim && synchronize_root_folder ./sources/nvim /root/.config/nvim - diff --git a/modules/05-fish.sh b/modules/05-fish.sh index 40ec1c5..9638e56 100644 --- a/modules/05-fish.sh +++ b/modules/05-fish.sh @@ -1,6 +1,7 @@ #!/bin/bash -ensure_package_is_installed fish && +source ./modules/00-library.sh && + ensure_package_is_installed fish && ensure_package_is_installed eza && ensure_package_is_installed bat && ensure_package_is_installed fastfetch && diff --git a/modules/06-fontconfig.sh b/modules/06-fontconfig.sh index b2ed9b6..381ded0 100644 --- a/modules/06-fontconfig.sh +++ b/modules/06-fontconfig.sh @@ -1,10 +1,10 @@ #!/bin/bash -ensure_package_is_installed ttf-jetbrains-mono-nerd && +source ./modules/00-library.sh && + ensure_package_is_installed ttf-jetbrains-mono-nerd && ensure_package_is_installed noto-fonts && ensure_package_is_installed noto-fonts-emoji && ensure_package_is_installed noto-fonts-cjk && ensure_package_is_installed noto-fonts-ar && synchronize_user_folder ./sources/fontconfig ~/.config && synchronize_root_folder ./sources/fontconfig /root/.config - diff --git a/modules/07-services.sh b/modules/07-services.sh index 5fc13b3..ccb6752 100644 --- a/modules/07-services.sh +++ b/modules/07-services.sh @@ -1,3 +1,5 @@ #!/bin/bash -ensure_service_active acpid \ No newline at end of file +source ./modules/00-library.sh && + ensure_service_active acpid + diff --git a/modules/08-gnome.sh b/modules/08-gnome.sh index 55e7477..b577970 100644 --- a/modules/08-gnome.sh +++ b/modules/08-gnome.sh @@ -1,8 +1,8 @@ #!/bin/bash -ensure_package_group_is_installed gnome && +source ./modules/00-library.sh && + ensure_package_group_is_installed gnome && ensure_package_group_is_installed gnome-extra && ensure_package_is_installed python-psutil && ensure_service_active gdm && ensure_gnome_setting_set "org.gnome.desktop.input-sources" "xkb-options" "['compose:ralt']" - diff --git a/modules/09-kitty.sh b/modules/09-kitty.sh index f4ff019..f6617ec 100644 --- a/modules/09-kitty.sh +++ b/modules/09-kitty.sh @@ -1,6 +1,7 @@ #!/bin/bash -ensure_package_is_installed kitty && +source ./modules/00-library.sh && + ensure_package_is_installed kitty && ensure_package_is_installed viu && ensure_package_is_installed ueberzugpp && ensure_package_is_installed otf-operator-lig-mono && diff --git a/modules/10-tmux.sh b/modules/10-tmux.sh index 8db53f6..5671b47 100644 --- a/modules/10-tmux.sh +++ b/modules/10-tmux.sh @@ -1,6 +1,7 @@ #!/bin/bash -ensure_package_is_installed tmux && +source ./modules/00-library.sh && + ensure_package_is_installed tmux && ensure_git_folder_installed_for_user tmux-plugins/tpm ~/.tmux/plugins/tpm && ensure_git_folder_installed_for_root tmux-plugins/tpm /root/.tmux/plugins/tpm && synchronize_user_folder ./sources/tmux/.tmux.conf ~/ && diff --git a/modules/11-syncthing.sh b/modules/11-syncthing.sh index 293ef54..6ddfb4a 100644 --- a/modules/11-syncthing.sh +++ b/modules/11-syncthing.sh @@ -1,6 +1,7 @@ #!/bin/bash -ensure_package_is_installed syncthing && +source ./modules/00-library.sh && + ensure_package_is_installed syncthing && ensure_user_folder_present ~/.config/systemd/user && synchronize_user_folder ./sources/syncthing/syncthing.service ~/.config/systemd/user && ensure_user_service_active syncthing diff --git a/modules/12-yazi.sh b/modules/12-yazi.sh index 5d92f0b..8b394ca 100644 --- a/modules/12-yazi.sh +++ b/modules/12-yazi.sh @@ -1,6 +1,7 @@ #!/bin/bash -ensure_package_is_installed yazi && +source ./modules/00-library.sh && + ensure_package_is_installed yazi && ensure_package_is_installed ffmpeg && ensure_package_is_installed 7zip && ensure_package_is_installed jq && diff --git a/modules/13-rust.sh b/modules/13-rust.sh index 1f5416a..f271381 100644 --- a/modules/13-rust.sh +++ b/modules/13-rust.sh @@ -1 +1,2 @@ -ensure_package_is_installed rustup +source ./modules/00-library.sh && + ensure_package_is_installed rustup diff --git a/modules/14-steam.sh b/modules/14-steam.sh index 5d1672a..e9072e1 100644 --- a/modules/14-steam.sh +++ b/modules/14-steam.sh @@ -1,6 +1,7 @@ #!/bin/sh -ensure_package_is_installed steam && +source ./modules/00-library.sh && + ensure_package_is_installed steam && ensure_package_is_installed bluez && ensure_package_is_installed bluez-utils && ensure_package_is_installed xone-dkms diff --git a/modules/15-dns-over-tls.sh b/modules/15-dns-over-tls.sh index 327219c..d2c8cfc 100644 --- a/modules/15-dns-over-tls.sh +++ b/modules/15-dns-over-tls.sh @@ -1,3 +1,4 @@ -sudo sed -i "s/^#\?DNS=.*/DNS=157.90.170.95#dns.nairi.cloud/" /etc/systemd/resolved.conf && +source ./modules/00-library.sh && + sudo sed -i "s/^#\?DNS=.*/DNS=157.90.170.95#dns.nairi.cloud/" /etc/systemd/resolved.conf && sudo sed -i "s/^#\?DNSOverTLS=.*/DNSOverTLS=yes/" /etc/systemd/resolved.conf && ensure_service_active systemd-resolved diff --git a/modules/16-opencode.sh b/modules/16-opencode.sh index 537cd71..5f8b04f 100644 --- a/modules/16-opencode.sh +++ b/modules/16-opencode.sh @@ -1,3 +1,5 @@ +#!/bin/sh + source ./modules/00-library.sh && ensure_package_is_installed opencode && synchronize_user_folder sources/opencode ~/.config