From 5f80f7e0f347449c04f797d7efcd05eadf836db4 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Thu, 24 Aug 2023 10:02:28 -0500 Subject: [PATCH] ArchTitus 2.0 --- .github/labeler.yml | 23 ----- .github/workflows/generate-documentation.yml | 27 ------ .github/workflows/label.yml | 22 ----- REFERENCE-0-preinstall.md | 23 ----- REFERENCE-1-setup.md | 8 -- REFERENCE-2-user.md | 8 -- REFERENCE-3-post-setup.md | 8 -- REFERENCE-archtitus.md | 8 -- REFERENCE-startup.md | 88 -------------------- REFERENCE.md | 8 -- pkg-files/budgie.txt | 3 - pkg-files/deepin.txt | 3 - pkg-files/mate.txt | 3 - pkg-files/openbox.txt | 45 ---------- pkg-files/{lxde.txt => server.txt} | 1 - pkg-files/xfce.txt | 3 - scripts/2-user.sh | 6 +- scripts/3-post-setup.sh | 12 --- 18 files changed, 1 insertion(+), 298 deletions(-) delete mode 100644 .github/labeler.yml delete mode 100644 .github/workflows/generate-documentation.yml delete mode 100644 .github/workflows/label.yml delete mode 100644 REFERENCE-0-preinstall.md delete mode 100644 REFERENCE-1-setup.md delete mode 100644 REFERENCE-2-user.md delete mode 100644 REFERENCE-3-post-setup.md delete mode 100644 REFERENCE-archtitus.md delete mode 100644 REFERENCE-startup.md delete mode 100644 REFERENCE.md delete mode 100644 pkg-files/budgie.txt delete mode 100644 pkg-files/deepin.txt delete mode 100644 pkg-files/mate.txt delete mode 100644 pkg-files/openbox.txt rename pkg-files/{lxde.txt => server.txt} (84%) delete mode 100644 pkg-files/xfce.txt diff --git a/.github/labeler.yml b/.github/labeler.yml deleted file mode 100644 index de40377..0000000 --- a/.github/labeler.yml +++ /dev/null @@ -1,23 +0,0 @@ -repo: -- '*' - -GitHub-Action: -- .github/workflows/* - -Configs: -- configs/**/* - -Package-Files: -- pkg-files/**/* - -scripts: -- scripts/**/* - -debug: -- scripts/debug/**/* - -helpers: -- scripts/helpers/**/* - -installers: -- scripts/installers/**/* \ No newline at end of file diff --git a/.github/workflows/generate-documentation.yml b/.github/workflows/generate-documentation.yml deleted file mode 100644 index 9e80699..0000000 --- a/.github/workflows/generate-documentation.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Generate Documentation - -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3.5.3 - - name: Github Action genshdoc - id: action-genshdoc - uses: vargiuscuola/genshdoc@master - - name: genshdoc result - run: echo "The result of genshdoc Action was ${{ steps.action-genshdoc.outputs.result }}" - - name: Commit files - run: | - echo ${{ github.ref }} - git add . - git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - git commit -m "CI: Automated build push" -a | exit 0 - - name: Push changes - if: github.ref == 'refs/heads/main' - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml deleted file mode 100644 index ef3d7d5..0000000 --- a/.github/workflows/label.yml +++ /dev/null @@ -1,22 +0,0 @@ -# This workflow will triage pull requests and apply a label based on the -# paths that are modified in the pull request. -# -# To use this workflow, you will need to set up a .github/labeler.yml -# file with configuration. For more information, see: -# https://github.com/actions/labeler - -name: Labeler -on: [pull_request] - -jobs: - label: - - runs-on: ubuntu-latest - permissions: - contents: read - pull-requests: write - - steps: - - uses: actions/labeler@v4 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file diff --git a/REFERENCE-0-preinstall.md b/REFERENCE-0-preinstall.md deleted file mode 100644 index c19244f..0000000 --- a/REFERENCE-0-preinstall.md +++ /dev/null @@ -1,23 +0,0 @@ -# Preinstall - -Contains the steps necessary to configure and pacstrap the install to selected drive. - -# Overview - -Creates the btrfs subvolumes. - - -# Functions -* [mountallsubvol()](#mountallsubvol) -* [subvolumesetup()](#subvolumesetup) - - -## mountallsubvol() - -Mount all btrfs subvolumes after root has been mounted. - -## subvolumesetup() - -BTRFS subvolulme creation and mounting. - - diff --git a/REFERENCE-1-setup.md b/REFERENCE-1-setup.md deleted file mode 100644 index 1f18ef8..0000000 --- a/REFERENCE-1-setup.md +++ /dev/null @@ -1,8 +0,0 @@ -# Setup - -Configures installed system, installs base packages, and creates user. - -# Functions - - - diff --git a/REFERENCE-2-user.md b/REFERENCE-2-user.md deleted file mode 100644 index a64d508..0000000 --- a/REFERENCE-2-user.md +++ /dev/null @@ -1,8 +0,0 @@ -# User - -User customizations and AUR package installation. - -# Functions - - - diff --git a/REFERENCE-3-post-setup.md b/REFERENCE-3-post-setup.md deleted file mode 100644 index 623e2e0..0000000 --- a/REFERENCE-3-post-setup.md +++ /dev/null @@ -1,8 +0,0 @@ -# Post-Setup - -Finalizing installation configurations and cleaning up after script. - -# Functions - - - diff --git a/REFERENCE-archtitus.md b/REFERENCE-archtitus.md deleted file mode 100644 index ecd766e..0000000 --- a/REFERENCE-archtitus.md +++ /dev/null @@ -1,8 +0,0 @@ -# ArchTitus - -Entrance script that launches children scripts for each phase of installation. - -# Functions - - - diff --git a/REFERENCE-startup.md b/REFERENCE-startup.md deleted file mode 100644 index 8eb7353..0000000 --- a/REFERENCE-startup.md +++ /dev/null @@ -1,88 +0,0 @@ -# Startup - -This script will ask users about their prefrences like disk, file system, timezone, keyboard layout, user name, password, etc. - -# Settings - -## General Settings -* **CONFIG_FILE** (string)[default: **$CONFIGS_DIR/setup.conf**]: Location of setup.conf to be used by set_option and all subsequent scripts. - - -# Functions -* [set_option()](#set_option) -* [logo()](#logo) -* [filesystem()](#filesystem) -* [timezone()](#timezone) -* [keymap()](#keymap) -* [drivessd()](#drivessd) -* [diskpart()](#diskpart) -* [userinfo()](#userinfo) -* [aurhelper()](#aurhelper) -* [desktopenv()](#desktopenv) -* [installtype()](#installtype) - - -## set_option() - -set options in setup.conf - -### Output on stdout - -* Output routed to startup.log - -### Output on stderr - -* # @stderror Output routed to startup.log - -### Arguments - -* **$1** (string): Configuration variable. - -### Arguments - -* **$2** (string): Configuration value. - -## logo() - -Displays ArchTitus logo - -_Function has no arguments._ - -## filesystem() - -This function will handle file systems. At this movement we are handling only -btrfs and ext4. Others will be added in future. - -## timezone() - -Detects and sets timezone. - -## keymap() - -Set user's keyboard mapping. - -## drivessd() - -Choose whether drive is SSD or not. - -## diskpart() - -Disk selection for drive to be used with installation. - -## userinfo() - -Gather username and password to be used for installation. - -## aurhelper() - -Choose AUR helper. - -## desktopenv() - -Choose Desktop Environment - -## installtype() - -Choose whether to do full or minimal installation. - - diff --git a/REFERENCE.md b/REFERENCE.md deleted file mode 100644 index 8fa58c7..0000000 --- a/REFERENCE.md +++ /dev/null @@ -1,8 +0,0 @@ -# Reference -**Library Files** -* [scripts/startup.sh](REFERENCE-startup.md) -* [scripts/0-preinstall.sh](REFERENCE-0-preinstall.md) -* [archtitus.sh](REFERENCE-archtitus.md) -* [scripts/1-setup.sh](REFERENCE-1-setup.md) -* [scripts/3-post-setup.sh](REFERENCE-3-post-setup.md) -* [scripts/2-user.sh](REFERENCE-2-user.md) diff --git a/pkg-files/budgie.txt b/pkg-files/budgie.txt deleted file mode 100644 index ab7873d..0000000 --- a/pkg-files/budgie.txt +++ /dev/null @@ -1,3 +0,0 @@ -budgie-desktop -gnome ---END OF MINIMAL INSTALL-- diff --git a/pkg-files/deepin.txt b/pkg-files/deepin.txt deleted file mode 100644 index 9c01f73..0000000 --- a/pkg-files/deepin.txt +++ /dev/null @@ -1,3 +0,0 @@ -deepin -deepin-extra ---END OF MINIMAL INSTALL-- diff --git a/pkg-files/mate.txt b/pkg-files/mate.txt deleted file mode 100644 index 736ee37..0000000 --- a/pkg-files/mate.txt +++ /dev/null @@ -1,3 +0,0 @@ -mate -mate-extra ---END OF MINIMAL INSTALL-- diff --git a/pkg-files/openbox.txt b/pkg-files/openbox.txt deleted file mode 100644 index 34ea690..0000000 --- a/pkg-files/openbox.txt +++ /dev/null @@ -1,45 +0,0 @@ -openbox -lightdm -lightdm-gtk-greeter -thunar -lxsession -rxvt-unicode ---END OF MINIMAL INSTALL-- -alsa-utils -pulseaudio -pulseaudio-alsa -wireless_tools -zsh -dunst -tint2 -rofi -feh -lightdm-webkit2-greeter -lightdm-webkit-theme-litarvan -lxappearance -qt5ct -gsimplecal -xautolock -xclip -scrot -thunar-archive-plugin -thunar-volman -thunar-media-tags-plugin -tumbler -jq -w3m -geany -nano -viewnior -pavucontrol -parcellite -neofetch -htop -picom -gtk2-perl -xfce4-power-manager -imagemagick -playerctl -xsettingsd -obconf - diff --git a/pkg-files/lxde.txt b/pkg-files/server.txt similarity index 84% rename from pkg-files/lxde.txt rename to pkg-files/server.txt index c39843f..0596bf6 100644 --- a/pkg-files/lxde.txt +++ b/pkg-files/server.txt @@ -1,2 +1 @@ -lxde --END OF MINIMAL INSTALL-- diff --git a/pkg-files/xfce.txt b/pkg-files/xfce.txt deleted file mode 100644 index 0d365c4..0000000 --- a/pkg-files/xfce.txt +++ /dev/null @@ -1,3 +0,0 @@ -xfce4 -xfce4-goodies ---END OF MINIMAL INSTALL-- diff --git a/scripts/2-user.sh b/scripts/2-user.sh index 8e60e6f..f534fc2 100755 --- a/scripts/2-user.sh +++ b/scripts/2-user.sh @@ -67,11 +67,7 @@ if [[ $INSTALL_TYPE == "FULL" ]]; then konsave -i ~/ArchTitus/configs/kde.knsv sleep 1 konsave -a kde - elif [[ $DESKTOP_ENV == "openbox" ]]; then - cd ~ - git clone https://github.com/stojshic/dotfiles-openbox - ./dotfiles-openbox/install-titus.sh - fi + fi fi echo -ne " diff --git a/scripts/3-post-setup.sh b/scripts/3-post-setup.sh index c31cdab..352e160 100755 --- a/scripts/3-post-setup.sh +++ b/scripts/3-post-setup.sh @@ -69,18 +69,6 @@ if [[ ${DESKTOP_ENV} == "kde" ]]; then elif [[ "${DESKTOP_ENV}" == "gnome" ]]; then systemctl enable gdm.service -elif [[ "${DESKTOP_ENV}" == "lxde" ]]; then - systemctl enable lxdm.service - -elif [[ "${DESKTOP_ENV}" == "openbox" ]]; then - systemctl enable lightdm.service - if [[ "${INSTALL_TYPE}" == "FULL" ]]; then - # Set default lightdm-webkit2-greeter theme to Litarvan - sed -i 's/^webkit_theme\s*=\s*\(.*\)/webkit_theme = litarvan #\1/g' /etc/lightdm/lightdm-webkit2-greeter.conf - # Set default lightdm greeter to lightdm-webkit2-greeter - sed -i 's/#greeter-session=example.*/greeter-session=lightdm-webkit2-greeter/g' /etc/lightdm/lightdm.conf - fi - else if [[ ! "${DESKTOP_ENV}" == "server" ]]; then sudo pacman -S --noconfirm --needed lightdm lightdm-gtk-greeter