diff --git a/static/karbs/css/karbs.css b/static/projects/css/karbs/karbs.css similarity index 100% rename from static/karbs/css/karbs.css rename to static/projects/css/karbs/karbs.css diff --git a/static/main/css/projects.css b/static/projects/css/projects.css similarity index 100% rename from static/main/css/projects.css rename to static/projects/css/projects.css diff --git a/static/main/js/projects.js b/static/projects/js/projects.js similarity index 100% rename from static/main/js/projects.js rename to static/projects/js/projects.js diff --git a/templates/karbs/karbs b/templates/karbs/karbs deleted file mode 100755 index f717cfc..0000000 --- a/templates/karbs/karbs +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# Kristofers Auto Rice Boostrapping Script (KARBS) -# by Kristofers Solo -# License: GNU GPLv3 - -echo "Choose display server (X11 / Wayland)[1/2]: " -read -r USER_INPUT - - -# Get display server type from user -if [ "$USER_INPUT" = 1 ]; then - DISPLAY_SERVER="X11" -elif [ "$USER_INPUT" = 2 ]; then - DISPLAY_SERVER="wayland" -else - echo "Wrong input. Please try again." - exit -fi - - -# Install paru -if pacman -Q paru; then - : -else - sudo pacman -S --noconfirm rust-src git wget fakeroot - git clone https://aur.archlinux.org/paru-bin - cd paru-bin || exit - makepkg -si - cd .. - rm -rf paru-bin -fi - -FILE="pkg-files/$DISPLAY_SERVER-pkgs" - -if [ -f "$FILE" ]; then - paru -Syu --noconfirm --needed - < $FILE -else - curl -LO https://raw.githubusercontent.com/kristoferssolo/karbs/main/$FILE - paru -Syu --noconfirm --needed - < $DISPLAY_SERVER-pkgs - rm -f $DISPLAY_SERVER-pkgs -fi - -git clone https://github.com/kristoferssolo/solorice "$HOME/solorice" -cp -raf "$HOME"/solorice/{./config,./local,.zshenv} "$HOME" -git clone https://github.com/kristoferssolo/SoloVim "$HOME"/.config/nvim -rm -rf "$HOME"/solorice -mkdir -p "$HOME"/{Downloads,Documents,Videos,Music,Pictures/screenshots} - -if [ $DISPLAY_SERVER = "wayland" ]; then - rm -rf "$HOME"/.config/{awesome,picom,sx,zsh/.zprofile-X11} - mv "$HOME"/.config/zsh/.zprofile-wayland "$HOME"/.config/zsh/.zprofile - chsh -s /bin/zsh - zsh - Hyprland -else - rm -rf "$HOME"/.config/{hypr,waybar,zsh/.zprofile-wayland} - mv "$HOME"/.config/zsh/.zprofile-X11 "$HOME"/.config/zsh/.zprofile - git clone https://github.com/streetturtle/awesome-wm-widgets "$HOME"/.config/awesome/awesome-wm-widgets - chsh -s /bin/zsh - zsh - echo -e "\n\n\033[1;31mFor weather widget to work, enter API-key from https://openweathermap.org, latitude and longitude in '~/.config/awesome/weather' file, each on seperate line.\033[0m" - echo "API-key" - echo "latitude" - echo "longitude" - echo -e "\nEverything else is ready to go. You can run 'sx' or reboot." -fi diff --git a/templates/karbs/instructions.html b/templates/projects/karbs/instructions.html similarity index 98% rename from templates/karbs/instructions.html rename to templates/projects/karbs/instructions.html index bb96e10..0b84046 100644 --- a/templates/karbs/instructions.html +++ b/templates/projects/karbs/instructions.html @@ -4,7 +4,7 @@ {% block meta %} + href="{% static 'projects/css/karbs/karbs.css' %}"/> {% endblock %} {% block content %}

Kristofers Auto-Rice Bootsrapping Script (KARBS)

diff --git a/templates/projects/karbs/karbs b/templates/projects/karbs/karbs new file mode 100755 index 0000000..4354256 --- /dev/null +++ b/templates/projects/karbs/karbs @@ -0,0 +1,64 @@ +#!/bin/sh +# Kristofers Auto Rice Bootsrapping Script (KARBS) +# by Kristofers Solo +# License: MIT + +echo "Choose display server (X11 / Wayland)[1/2]: " +read -r USER_INPUT + +# Get display server type from user +if [ "$USER_INPUT" = 1 ]; then + DISPLAY_SERVER="X11" +elif [ "$USER_INPUT" = 2 ]; then + DISPLAY_SERVER="wayland" +else + echo "Wrong input. Please try again." + exit +fi + +# Install paru +if pacman -Q paru; then + : +else + sudo pacman -S --noconfirm rust-src git wget fakeroot + git clone https://aur.archlinux.org/paru-bin + cd paru-bin || exit + makepkg -si + cd .. + rm -rf paru-bin +fi + +FILE="pkg-files/$DISPLAY_SERVER-pkgs" + +if [ -f "$FILE" ]; then + paru -Syu --noconfirm --needed - <$FILE +else + curl -LO https://raw.githubusercontent.com/kristoferssolo/karbs/main/$FILE + paru -Syu --noconfirm --needed - <$DISPLAY_SERVER-pkgs + rm -f $DISPLAY_SERVER-pkgs +fi + +git clone https://github.com/kristoferssolo/solorice "$HOME/solorice" +cp -raf "$HOME"/solorice/{./config,./local,.zshenv} "$HOME" +git clone https://github.com/kristoferssolo/SoloVim "$HOME"/.config/nvim +rm -rf "$HOME"/solorice +mkdir -p "$HOME"/{Downloads,Documents,Videos,Music,Pictures/screenshots} + +if [ $DISPLAY_SERVER = "wayland" ]; then + rm -rf "$HOME"/.config/{awesome,picom,sx,zsh/.zprofile-X11} + mv "$HOME"/.config/zsh/.zprofile-wayland "$HOME"/.config/zsh/.zprofile + chsh -s /bin/zsh + zsh + Hyprland +else + rm -rf "$HOME"/.config/{hypr,waybar,zsh/.zprofile-wayland} + mv "$HOME"/.config/zsh/.zprofile-X11 "$HOME"/.config/zsh/.zprofile + git clone https://github.com/streetturtle/awesome-wm-widgets "$HOME"/.config/awesome/awesome-wm-widgets + chsh -s /bin/zsh + zsh + echo -e "\n\n\033[1;31mFor weather widget to work, enter API-key from https://openweathermap.org, latitude and longitude in '~/.config/awesome/weather' file, each on separate line.\033[0m" + echo "API-key" + echo "latitude" + echo "longitude" + echo -e "\nEverything else is ready to go. You can run 'sx' or reboot." +fi diff --git a/templates/main/projects.html b/templates/projects/projects.html similarity index 95% rename from templates/main/projects.html rename to templates/projects/projects.html index 2e8da97..881a66f 100644 --- a/templates/main/projects.html +++ b/templates/projects/projects.html @@ -4,8 +4,8 @@ {% block meta %} - + href="{% static 'projects/css/projects.css' %}"/> + {% endblock %} {% block content %}