Merge pull request #3 from blusewill/dev

School Linux v2 Version 0.2

.github/ISSUE_TEMPLATE/request-software.md

@@ -15,11 +15,13 @@ assignees: ''
 **Why Would you like us to add this Software?**
 I want you guys add this Software Because.........
 
-**It is available on Debian's Repo?** [Check it Here](https://www.debian.org/distrib/packages)
+**It is available on?** [Check it Here](https://www.debian.org/distrib/packages)
 
-- [ ] Yes
+- [x] Debian
 
-- [x] No
+- [ ] Flatpak
+
+- [ ] Non of the above
 
 **Additional context**
 Add any other context or screenshots about the feature request here.

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/combine.yml

@@ -0,0 +1,18 @@
+name: "Combine Dependabot PRs"
+on:
+  workflow_dispatch:
+
+jobs:
+  combine-prs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.0
+      - uses: maadhattah/combine-dependabot-prs@main
+        with:
+          branchPrefix: "dependabot"
+          mustBeGreen: true
+          combineBranchName: "combined-prs"
+          ignoreLabel: "nocombine"
+          baseBranch: "main"
+          openPR: true
+          allowSkipped: false

.github/workflows/linter.yml

@@ -0,0 +1,55 @@
+---
+#################################
+#################################
+## Super Linter GitHub Actions ##
+#################################
+#################################
+name: Lint Code Base
+
+#
+# Documentation:
+# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
+#
+
+#############################
+# Start the job on all push #
+#############################
+on:
+  push:
+    #    branches-ignore: [master, main]
+    # Remove the line above to run when pushing to master
+  pull_request:
+    branches: [master, dev]
+
+###############
+# Set the Job #
+###############
+jobs:
+  build:
+    # Name the Job
+    name: Lint Code Base
+    # Set the agent to run on
+    runs-on: ubuntu-latest
+
+    ##################
+    # Load all steps #
+    ##################
+    steps:
+      ##########################
+      # Checkout the code base #
+      ##########################
+      - name: Checkout Code
+        uses: actions/checkout@v4.1.0
+        with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
+
+      ################################
+      # Run Linter against code base #
+      ################################
+      - name: Lint Code Base
+        uses: github/super-linter@v5
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          DEFAULT_BRANCH: master
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

install.sh

@@ -9,26 +9,31 @@ fi
 username=$(id -u -n 1000)
 builddir=$(pwd)
 
-# Enable contrib to have wider range of packages
+# Enable repos to have wider range of packages
 
 sed -r -i 's/^deb(.*)$/deb\1 contrib/g' /etc/apt/sources.list
+sed -r -i 's/^deb(.*)$/deb\1 non-free/g' /etc/apt/sources.list
+sed -r -i 's/^deb(.*)$/deb\1 non-free-firmware/g' /etc/apt/sources.list
 
 # Update packages list and update system
+
 apt update
 apt upgrade -y
 
 # Install nala
+
 apt install nala -y
 
 # Making .config and Moving config files and background to Pictures
+
 cd $builddir
 mkdir -p /home/$username/.config
 mkdir -p /home/$username/.fonts
 cp -R dotconfig/* /home/$username/.config/
 chown -R $username:$username /home/$username
 
 # Installing Essential Programs 
-nala install kde-plasma-desktop lsb-release firefox-esr firefox-esr-l10n* flatpak sddm vim ttf-mscorefonts-installer dolphin python3.11-venv python3.11 findutils -y
+nala install kde-plasma-desktop lsb-release flatpak sddm vim ttf-mscorefonts-installer dolphin python3.11-venv python3.11 findutils -y
 
 # Install Default Applications
 
@@ -47,7 +52,13 @@ xargs -a $builddir/pkg-files/flatpak.txt flatpak install -y
 
 xargs -a $builddir/pkg-files/optional.txt nala install -y
 
-# load KDE config and font install
+# Install Scratch 3.0
+
+wget https://github.com/redshaderobotics/scratch3.0-linux/releases/download/3.3.0/scratch-desktop_3.3.0_amd64.deb -O $builddir/pkg-files/scratch.deb
+
+nala install $builddir/pkg-files/scratch.deb -y
+
+# Font Install
 cd $builddir 
 nala install fonts-font-awesome -y
 wget https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip
@@ -56,7 +67,6 @@ wget https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/Meslo.zip
 unzip Meslo.zip -d /home/$username/.fonts
 wget https://github.com/justfont/open-huninn-font/releases/download/v2.0/jf-openhuninn-2.0.ttf
 mv jf-openhuninn-2.0.ttf /home/$username/.fonts
-mv dotfonts/fontawesome/otfs/*.otf /home/$username/.fonts/
 chown $username:$username /home/$username/.fonts/*
 
 # Reloading Font

pkg-files/default.txt

@@ -1,3 +1,5 @@
+audacity
+audacity-data
 libreoffice
 libreoffice-gtk3
 firefox-esr
@@ -14,4 +16,6 @@ inkscape
 ink-generator
 inkscape-open-symbols
 inkscape-textext
-inkscape-tutorials 
+inkscape-tutorials
+fcitx5*
+kde-config-fcitx5

pkg-files/optional.txt

@@ -2,3 +2,5 @@ mixxx
 mixxx-data
 lmms
 lmms-common
+musescore3
+musescore3-common

scripts/script-dev-install.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Checking if is running in Repo Folder
+if [[ "$(basename "$(pwd)" | tr '[:upper:]' '[:lower:]')" =~ ^scripts$ ]]; then
+    echo "You are running this in Schoollinux-v2 Folder."
+    echo "Please use ./install.sh instead"
+    exit
+fi
+
+# Installing git
+
+echo "Installing git."
+sudo apt install -y git
+
+echo "Cloning the School Linux Project"
+git clone -b dev https://github.com/blusewill/Schoollinux-v2
+
+echo "Executing School Linux Script"
+
+cd $HOME/Schoollinux-v2
+
+sudo ./install.sh

scripts/script-install.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Checking if is running in Repo Folder
+if [[ "$(basename "$(pwd)" | tr '[:upper:]' '[:lower:]')" =~ ^scripts$ ]]; then
+    echo "You are running this in Schoollinux-v2 Folder."
+    echo "Please use ./install.sh instead"
+    exit
+fi
+
+# Installing git
+
+echo "Installing git."
+sudo apt install -y git
+
+echo "Cloning the School Linux Project"
+git clone https://github.com/blusewill/Schoollinux-v2
+
+echo "Executing School Linux Script"
+
+cd $HOME/Schoollinux-v2
+
+sudo ./install.sh