From c7751c2cd292d9228ae92b1b61c835d511eecc23 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sun, 7 Mar 2021 17:40:20 +0100 Subject: [PATCH] Improved project structure --- README.md | 6 ++- common/apps/ snap/pycharm.sh | 5 +++ common/apps/ snap/simplenote.sh | 5 +++ common/apps/ snap/vscode.sh | 5 +++ {apps => common/apps}/chrome.sh | 0 {apps => common/apps}/etcher.sh | 0 common/apps/flameshot.sh | 5 +++ common/apps/git.sh | 5 +++ common/apps/gnome_tweaks.sh | 5 +++ {apps => common/apps}/lsd.sh | 0 common/apps/ncdu.sh | 5 +++ common/apps/neofetch.sh | 6 +++ common/apps/stacer.sh | 5 +++ {apps => common/apps}/timeshift.sh | 0 common/apps/trash-cli.sh | 5 +++ {apps => common/apps}/ulauncher.sh | 0 common/scripts/first_install.sh | 7 ++++ {default => common/scripts}/update.sh | 0 {default => common/themes}/chrome-icon-fix.sh | 0 common/themes/grub_theme.sh | 9 +++++ common/themes/orchis.sh | 9 +++++ common/themes/tela_circle_icons.sh | 9 +++++ common/themes/vimix_cursors.sh | 9 +++++ default/install.sh | 12 ------ default/theme.sh | 40 ------------------- default_installation.sh | 7 ---- desktop/install.sh | 20 ---------- desktop_installation.sh | 9 ----- software_dev/install.sh | 8 ---- software_dev_installation.sh | 7 ---- theme_installation.sh | 9 ----- users/bianyx/config/hello-world.conf | 0 users/bianyx/scripts/hello-world.sh | 0 {config => users/edraft/config}/arc-menu-conf | 0 .../edraft/config}/arc-menu-template | 0 .../edraft/config}/dash-to-panel-conf | 0 users/edraft/scripts/default_installation.sh | 7 ++++ users/edraft/scripts/desktop_installation.sh | 7 ++++ .../scripts/software_dev_installation.sh | 10 +++++ users/edraft/scripts/theme_installation.sh | 18 +++++++++ 40 files changed, 141 insertions(+), 113 deletions(-) create mode 100644 common/apps/ snap/pycharm.sh create mode 100644 common/apps/ snap/simplenote.sh create mode 100644 common/apps/ snap/vscode.sh rename {apps => common/apps}/chrome.sh (100%) rename {apps => common/apps}/etcher.sh (100%) create mode 100644 common/apps/flameshot.sh create mode 100644 common/apps/git.sh create mode 100644 common/apps/gnome_tweaks.sh rename {apps => common/apps}/lsd.sh (100%) create mode 100644 common/apps/ncdu.sh create mode 100644 common/apps/neofetch.sh create mode 100644 common/apps/stacer.sh rename {apps => common/apps}/timeshift.sh (100%) create mode 100644 common/apps/trash-cli.sh rename {apps => common/apps}/ulauncher.sh (100%) create mode 100644 common/scripts/first_install.sh rename {default => common/scripts}/update.sh (100%) rename {default => common/themes}/chrome-icon-fix.sh (100%) create mode 100644 common/themes/grub_theme.sh create mode 100644 common/themes/orchis.sh create mode 100644 common/themes/tela_circle_icons.sh create mode 100644 common/themes/vimix_cursors.sh delete mode 100644 default/install.sh delete mode 100644 default/theme.sh delete mode 100644 default_installation.sh delete mode 100644 desktop/install.sh delete mode 100644 desktop_installation.sh delete mode 100644 software_dev/install.sh delete mode 100644 software_dev_installation.sh delete mode 100644 theme_installation.sh create mode 100644 users/bianyx/config/hello-world.conf create mode 100644 users/bianyx/scripts/hello-world.sh rename {config => users/edraft/config}/arc-menu-conf (100%) rename {config => users/edraft/config}/arc-menu-template (100%) rename {config => users/edraft/config}/dash-to-panel-conf (100%) create mode 100644 users/edraft/scripts/default_installation.sh create mode 100644 users/edraft/scripts/desktop_installation.sh create mode 100644 users/edraft/scripts/software_dev_installation.sh create mode 100644 users/edraft/scripts/theme_installation.sh diff --git a/README.md b/README.md index 718410c..6cb48d7 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ -# edraft_ubuntu_designs +sh-edraft Debian Installation scripts + +Run scripts: + +bash users/$USER/scripts/script.sh diff --git a/common/apps/ snap/pycharm.sh b/common/apps/ snap/pycharm.sh new file mode 100644 index 0000000..3813536 --- /dev/null +++ b/common/apps/ snap/pycharm.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +install_pycharm() { + sudo snap install pycharm-community --classic +} diff --git a/common/apps/ snap/simplenote.sh b/common/apps/ snap/simplenote.sh new file mode 100644 index 0000000..5c6d859 --- /dev/null +++ b/common/apps/ snap/simplenote.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +install_simplenote() { + sudo snap install simplenote +} diff --git a/common/apps/ snap/vscode.sh b/common/apps/ snap/vscode.sh new file mode 100644 index 0000000..79ab7b2 --- /dev/null +++ b/common/apps/ snap/vscode.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +install_vscode() { + sudo snap install --classic code +} \ No newline at end of file diff --git a/apps/chrome.sh b/common/apps/chrome.sh similarity index 100% rename from apps/chrome.sh rename to common/apps/chrome.sh diff --git a/apps/etcher.sh b/common/apps/etcher.sh similarity index 100% rename from apps/etcher.sh rename to common/apps/etcher.sh diff --git a/common/apps/flameshot.sh b/common/apps/flameshot.sh new file mode 100644 index 0000000..8a07092 --- /dev/null +++ b/common/apps/flameshot.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +install_flameshot() { + apt-get install flameshot -y +} \ No newline at end of file diff --git a/common/apps/git.sh b/common/apps/git.sh new file mode 100644 index 0000000..1edbaf5 --- /dev/null +++ b/common/apps/git.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +install_git() { + sudo apt-get install git-all -y +} \ No newline at end of file diff --git a/common/apps/gnome_tweaks.sh b/common/apps/gnome_tweaks.sh new file mode 100644 index 0000000..19c37d9 --- /dev/null +++ b/common/apps/gnome_tweaks.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +install_gnome_tweaks() { + sudo apt-get install gnome-tweaks -y +} \ No newline at end of file diff --git a/apps/lsd.sh b/common/apps/lsd.sh similarity index 100% rename from apps/lsd.sh rename to common/apps/lsd.sh diff --git a/common/apps/ncdu.sh b/common/apps/ncdu.sh new file mode 100644 index 0000000..f6dca9e --- /dev/null +++ b/common/apps/ncdu.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +install_ncdu() { + sudo apt-get install ncdu -y +} \ No newline at end of file diff --git a/common/apps/neofetch.sh b/common/apps/neofetch.sh new file mode 100644 index 0000000..08bb727 --- /dev/null +++ b/common/apps/neofetch.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +install_neofetch() { + sudo apt-get install neofetch -y + sudo echo "neofetch" >> /home/*/.bashrc +} \ No newline at end of file diff --git a/common/apps/stacer.sh b/common/apps/stacer.sh new file mode 100644 index 0000000..8923b60 --- /dev/null +++ b/common/apps/stacer.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +install_stacer() { + sudo apt-get install stacer -y +} \ No newline at end of file diff --git a/apps/timeshift.sh b/common/apps/timeshift.sh similarity index 100% rename from apps/timeshift.sh rename to common/apps/timeshift.sh diff --git a/common/apps/trash-cli.sh b/common/apps/trash-cli.sh new file mode 100644 index 0000000..3a9d235 --- /dev/null +++ b/common/apps/trash-cli.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +install_trash_cli() { + sudo apt-get install trash-cli -y +} \ No newline at end of file diff --git a/apps/ulauncher.sh b/common/apps/ulauncher.sh similarity index 100% rename from apps/ulauncher.sh rename to common/apps/ulauncher.sh diff --git a/common/scripts/first_install.sh b/common/scripts/first_install.sh new file mode 100644 index 0000000..af45f69 --- /dev/null +++ b/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 +} diff --git a/default/update.sh b/common/scripts/update.sh similarity index 100% rename from default/update.sh rename to common/scripts/update.sh diff --git a/default/chrome-icon-fix.sh b/common/themes/chrome-icon-fix.sh similarity index 100% rename from default/chrome-icon-fix.sh rename to common/themes/chrome-icon-fix.sh diff --git a/common/themes/grub_theme.sh b/common/themes/grub_theme.sh new file mode 100644 index 0000000..4edec7d --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/themes/orchis.sh b/common/themes/orchis.sh new file mode 100644 index 0000000..4b41203 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/themes/tela_circle_icons.sh b/common/themes/tela_circle_icons.sh new file mode 100644 index 0000000..e7494f0 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/common/themes/vimix_cursors.sh b/common/themes/vimix_cursors.sh new file mode 100644 index 0000000..6140b1a --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/default/install.sh b/default/install.sh deleted file mode 100644 index 5b65b8d..0000000 --- a/default/install.sh +++ /dev/null @@ -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 -} diff --git a/default/theme.sh b/default/theme.sh deleted file mode 100644 index de2cda2..0000000 --- a/default/theme.sh +++ /dev/null @@ -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 -} \ No newline at end of file diff --git a/default_installation.sh b/default_installation.sh deleted file mode 100644 index e172de1..0000000 --- a/default_installation.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -source $PWD/default/update.sh -source $PWD/default/install.sh - -update -default_install diff --git a/desktop/install.sh b/desktop/install.sh deleted file mode 100644 index 02b8179..0000000 --- a/desktop/install.sh +++ /dev/null @@ -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 - -} \ No newline at end of file diff --git a/desktop_installation.sh b/desktop_installation.sh deleted file mode 100644 index 5bfc179..0000000 --- a/desktop_installation.sh +++ /dev/null @@ -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 diff --git a/software_dev/install.sh b/software_dev/install.sh deleted file mode 100644 index 0e35110..0000000 --- a/software_dev/install.sh +++ /dev/null @@ -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 -} \ No newline at end of file diff --git a/software_dev_installation.sh b/software_dev_installation.sh deleted file mode 100644 index 66e2cfd..0000000 --- a/software_dev_installation.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -source ./default/update.sh -source ./software_dev/install.sh - -update -software_dev_install diff --git a/theme_installation.sh b/theme_installation.sh deleted file mode 100644 index b4eda00..0000000 --- a/theme_installation.sh +++ /dev/null @@ -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 diff --git a/users/bianyx/config/hello-world.conf b/users/bianyx/config/hello-world.conf new file mode 100644 index 0000000..e69de29 diff --git a/users/bianyx/scripts/hello-world.sh b/users/bianyx/scripts/hello-world.sh new file mode 100644 index 0000000..e69de29 diff --git a/config/arc-menu-conf b/users/edraft/config/arc-menu-conf similarity index 100% rename from config/arc-menu-conf rename to users/edraft/config/arc-menu-conf diff --git a/config/arc-menu-template b/users/edraft/config/arc-menu-template similarity index 100% rename from config/arc-menu-template rename to users/edraft/config/arc-menu-template diff --git a/config/dash-to-panel-conf b/users/edraft/config/dash-to-panel-conf similarity index 100% rename from config/dash-to-panel-conf rename to users/edraft/config/dash-to-panel-conf diff --git a/users/edraft/scripts/default_installation.sh b/users/edraft/scripts/default_installation.sh new file mode 100644 index 0000000..a55c42d --- /dev/null +++ b/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 diff --git a/users/edraft/scripts/desktop_installation.sh b/users/edraft/scripts/desktop_installation.sh new file mode 100644 index 0000000..2f33856 --- /dev/null +++ b/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 diff --git a/users/edraft/scripts/software_dev_installation.sh b/users/edraft/scripts/software_dev_installation.sh new file mode 100644 index 0000000..95d1484 --- /dev/null +++ b/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 diff --git a/users/edraft/scripts/theme_installation.sh b/users/edraft/scripts/theme_installation.sh new file mode 100644 index 0000000..33e4aaf --- /dev/null +++ b/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