Improved project structure

README.md

@@ -1,2 +1,6 @@
-# edraft_ubuntu_designs
+sh-edraft Debian Installation scripts
 
+
+Run scripts:
+
+bash users/$USER/scripts/script.sh

common/apps/ snap/pycharm.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+install_pycharm() {
+    sudo snap install pycharm-community --classic
+}

common/apps/ snap/simplenote.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+install_simplenote() {
+    sudo snap install simplenote
+}

common/apps/ snap/vscode.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+install_vscode() {
+    sudo snap install --classic code
+}

common/apps/flameshot.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+install_flameshot() {
+    apt-get install flameshot -y
+}

common/apps/git.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+install_git() {
+    sudo apt-get install git-all -y
+}

common/apps/gnome_tweaks.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+install_gnome_tweaks() {
+    sudo apt-get install gnome-tweaks -y
+}

common/apps/ncdu.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+install_ncdu() {
+    sudo apt-get install ncdu -y
+}

common/apps/neofetch.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+install_neofetch() {
+    sudo apt-get install neofetch -y
+    sudo echo "neofetch" >> /home/*/.bashrc
+}

common/apps/stacer.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+install_stacer() {
+    sudo apt-get install stacer -y
+}

common/apps/trash-cli.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+install_trash_cli() {
+    sudo apt-get install trash-cli -y   
+}

common/scripts/first_install.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+first_install() {
+    echo 'Installing:'
+
+    sudo apt-get install net-tools htop tree zip unzip-y
+}

common/themes/grub_theme.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+install_grub_theme() {
+    git clone https://github.com/vinceliuice/grub2-themes.git
+    cd grub2-themes
+    sudo ./install.sh -t $1 -s $2
+    cd ..
+    sudo rm -r grub2-themes
+}

common/themes/orchis.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+install_orchis() {
+    git clone https://github.com/vinceliuice/Orchis-theme
+    cd Orchis-theme
+    ./install.sh -t $1
+    cd ..
+    sudo rm -r Orchis-theme
+}

common/themes/tela_circle_icons.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+install_tela_circle_icons() {
+    git clone https://github.com/vinceliuice/Tela-circle-icon-theme
+    cd Tela-circle-icon-theme
+    ./install.sh -a
+    cd ..
+    sudo rm -r Tela-circle-icon-theme
+}

common/themes/vimix_cursors.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+install_vimix_cursors() {
+    git clone https://github.com/vinceliuice/Vimix-cursors
+    cd Vimix-cursors
+    ./install.sh
+    cd ..
+    sudo rm -r Vimix-cursors
+}

default/install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-source $PWD/apps/lsd.sh
-
-default_install() {
-    echo 'Installing:'
-
-    sudo apt-get install net-tools htop tree zip unzip neofetch trash-cli ncdu -y
-    sudo echo "neofetch" >> /home/*/.bashrc
-
-    install_lsd
-}

default/theme.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-install_theme() {
-    install_orchis
-    install_tela
-    install_vimix
-    install_grub_theme
-}
-
-install_orchis() {
-    git clone https://github.com/vinceliuice/Orchis-theme
-    cd Orchis-theme
-    ./install.sh -t orange
-    cd ..
-    sudo rm -r Orchis-theme
-}
-
-install_tela() {
-    git clone https://github.com/vinceliuice/Tela-circle-icon-theme
-    cd Tela-circle-icon-theme
-    ./install.sh -a
-    cd ..
-    sudo rm -r Tela-circle-icon-theme
-}
-
-install_vimix() {
-    git clone https://github.com/vinceliuice/Vimix-cursors
-    cd Vimix-cursors
-    ./install.sh
-    cd ..
-    sudo rm -r Vimix-cursors
-}
-
-install_grub_theme() {
-    git clone https://github.com/vinceliuice/grub2-themes.git
-    cd grub2-themes
-    sudo ./install.sh -t vimix -s 1080p
-    cd ..
-    sudo rm -r grub2-themes
-}

default_installation.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-source $PWD/default/update.sh
-source $PWD/default/install.sh
-
-update
-default_install

desktop/install.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-source $PWD/apps/chrome.sh
-source $PWD/apps/etcher.sh
-source $PWD/apps/timeshift.sh
-source $PWD/apps/ulauncher.sh
-
-desktop_install() {
-    echo 'Installing:'
-
-    sudo apt-get install stacer gnome-tweaks flameshot -y
-
-    sudo snap install simplenote
-    
-    install_timeshift
-    install_ulauncher
-    install_chrome
-    install_etcher
-
-}

desktop_installation.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-source $PWD/default/update.sh
-source $PWD/default/install.sh
-source $PWD/desktop/install.sh
-
-update
-default_install
-desktop_install

software_dev/install.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-software_dev_install() {
-    sudo snap install --classic code
-    sudo snap install pycharm-community --classic
-
-    sudo apt-get install git-all -y
-}

software_dev_installation.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-source ./default/update.sh
-source ./software_dev/install.sh
-
-update
-software_dev_install

theme_installation.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-source ./default/update.sh
-source ./default/theme.sh
-source ./default/chrome-icon-fix.sh
-
-update
-install_theme
-fix_chrome_icons

users/edraft/scripts/default_installation.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source $PWD/common/scripts/update.sh
+source $PWD/common/scripts/first_install.sh
+
+update
+first_install

users/edraft/scripts/desktop_installation.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source $PWD/common/scripts/update.sh
+source $PWD/common/scripts/install.sh
+
+update
+default_install

users/edraft/scripts/software_dev_installation.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+source $PWD/common/scripts/update.sh
+
+source $PWD/common/apps/snap/pycharm.sh
+source $PWD/common/apps/snap/vscode.sh
+
+update
+install_pycharm
+install_vscode

users/edraft/scripts/theme_installation.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+source $PWD/common/scripts/update.sh
+
+source $PWD/common/themes/orchis.sh
+source $PWD/common/themes/tela_circle_icons.sh
+source $PWD/common/themes/vimix_cursors.sh
+source $PWD/common/themes/grub_theme.sh
+source $PWD/common/themes/chrome-icon-fix.sh
+
+update
+
+install_orchis orange
+install_tela_circle_icons
+install_vimix_cursors
+install_grub_theme vimix 1080p
+
+fix_chrome_icons