From 33534c42cf030bfee627a0e8cbeec7b13e689466 Mon Sep 17 00:00:00 2001 From: Nico Jensch Date: Fri, 13 Nov 2020 12:44:17 +0100 Subject: [PATCH] Add choices to assistant, remove micro theming to --- .../.config/micro/plug/misspell/README.md | 7 - .../.config/micro/plug/misspell/misspell.lua | 9 - .../.config/micro/plug/misspell/repo.json | 22 - .../micro/plug/monokai-dark/monokai-dark.lua | 3 - .../plug/monokai-dark/monokai-dark.micro | 21 - .../.config/micro/plug/monokai-dark/repo.json | 14 - etc/skel/.config/micro/settings.json | 1 - usr/bin/setup-assistant | 391 +++++++++++++++--- usr/lib/setup-assistant/apply.sh | 2 +- usr/lib/setup-assistant/audio.txt | 22 + usr/lib/setup-assistant/browsers.txt | 16 + usr/lib/setup-assistant/communication.txt | 24 ++ usr/lib/setup-assistant/development.txt | 14 + usr/lib/setup-assistant/graphics.txt | 24 ++ .../{desktop-apps.txt => internet.txt} | 30 +- usr/lib/setup-assistant/mail.txt | 12 + usr/lib/setup-assistant/multimedia.txt | 26 +- usr/lib/setup-assistant/office.txt | 4 +- usr/lib/setup-assistant/video.txt | 12 + ...{virtualisation.txt => virtualization.txt} | 2 +- 20 files changed, 492 insertions(+), 164 deletions(-) delete mode 100644 etc/skel/.config/micro/plug/misspell/README.md delete mode 100644 etc/skel/.config/micro/plug/misspell/misspell.lua delete mode 100644 etc/skel/.config/micro/plug/misspell/repo.json delete mode 100644 etc/skel/.config/micro/plug/monokai-dark/monokai-dark.lua delete mode 100644 etc/skel/.config/micro/plug/monokai-dark/monokai-dark.micro delete mode 100644 etc/skel/.config/micro/plug/monokai-dark/repo.json mode change 100644 => 100755 usr/lib/setup-assistant/apply.sh create mode 100644 usr/lib/setup-assistant/audio.txt create mode 100644 usr/lib/setup-assistant/browsers.txt create mode 100644 usr/lib/setup-assistant/communication.txt create mode 100644 usr/lib/setup-assistant/development.txt create mode 100644 usr/lib/setup-assistant/graphics.txt rename usr/lib/setup-assistant/{desktop-apps.txt => internet.txt} (65%) create mode 100644 usr/lib/setup-assistant/mail.txt create mode 100644 usr/lib/setup-assistant/video.txt rename usr/lib/setup-assistant/{virtualisation.txt => virtualization.txt} (74%) diff --git a/etc/skel/.config/micro/plug/misspell/README.md b/etc/skel/.config/micro/plug/misspell/README.md deleted file mode 100644 index 7c452c3..0000000 --- a/etc/skel/.config/micro/plug/misspell/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Misspell Plugin for Micro - -This repository holds the misspell plugin for micro. - -Install with `> plugin install misspell`, -https://github.com/client9/misspell needs to be in your PATH. -This plugin will lint text for spelling mistakes. diff --git a/etc/skel/.config/micro/plug/misspell/misspell.lua b/etc/skel/.config/micro/plug/misspell/misspell.lua deleted file mode 100644 index 924bbce..0000000 --- a/etc/skel/.config/micro/plug/misspell/misspell.lua +++ /dev/null @@ -1,9 +0,0 @@ -VERSION = "0.2.0" - -local config = import("micro/config") - -function init() - -- uses the default linter plugin - -- matches any filetype - linter.makeLinter("misspell", "", "misspell", {"%f"}, "%f:%l:%c: %m", {}, false, true) -end \ No newline at end of file diff --git a/etc/skel/.config/micro/plug/misspell/repo.json b/etc/skel/.config/micro/plug/misspell/repo.json deleted file mode 100644 index 3208340..0000000 --- a/etc/skel/.config/micro/plug/misspell/repo.json +++ /dev/null @@ -1,22 +0,0 @@ -[{ - "Name": "misspell", - "Description": "plugin that corrects commonly misspelled words", - "Tags": ["spell", "check", "misspell"], - "Website": "https://github.com/onodera-punpun/micro-misspell-plugin", - "Versions": [ - { - "Version": "0.2.0", - "Url": "https://github.com/micro-editor/updated-plugins/releases/download/v1.0.0/misspell-0.2.0.zip", - "Require": { - "micro": ">=2.0.0-1" - } - }, - { - "Version": "0.1.0", - "Url": "https://github.com/onodera-punpun/micro-misspell-plugin/archive/0.1.0.zip", - "Require": { - "micro": ">=1.0.3" - } - } - ] -}] diff --git a/etc/skel/.config/micro/plug/monokai-dark/monokai-dark.lua b/etc/skel/.config/micro/plug/monokai-dark/monokai-dark.lua deleted file mode 100644 index 0252ea4..0000000 --- a/etc/skel/.config/micro/plug/monokai-dark/monokai-dark.lua +++ /dev/null @@ -1,3 +0,0 @@ -VERSION = "0.1.0" - -AddRuntimeFile("monokai-dark", "colorscheme", "monokai-dark.micro") diff --git a/etc/skel/.config/micro/plug/monokai-dark/monokai-dark.micro b/etc/skel/.config/micro/plug/monokai-dark/monokai-dark.micro deleted file mode 100644 index a4eb347..0000000 --- a/etc/skel/.config/micro/plug/monokai-dark/monokai-dark.micro +++ /dev/null @@ -1,21 +0,0 @@ -color-link default "#D5D8D6,#1D0000" -color-link comment "#75715E" -color-link identifier "#66D9EF" -color-link constant "#AE81FF" -color-link constant.string "#E6DB74" -color-link constant.string.char "#BDE6AD" -color-link statement "#F92672" -color-link preproc "#CB4B16" -color-link type "#66D9EF" -color-link special "#A6E22E" -color-link underlined "#D33682" -color-link error "bold #CB4B16" -color-link todo "bold #D33682" -color-link statusline "#282828,#F8F8F2" -color-link indent-char "#505050,#282828" -color-link line-number "#AAAAAA,#282828" -color-link current-line-number "#AAAAAA,#282828" -color-link gutter-error "#CB4B16" -color-link gutter-warning "#E6DB74" -color-link cursor-line "#323232" -color-link color-column "#323232" diff --git a/etc/skel/.config/micro/plug/monokai-dark/repo.json b/etc/skel/.config/micro/plug/monokai-dark/repo.json deleted file mode 100644 index 9d9aa58..0000000 --- a/etc/skel/.config/micro/plug/monokai-dark/repo.json +++ /dev/null @@ -1,14 +0,0 @@ -[{ - "Name": "monokai-dark", - "Description": "A dark monokai colorscheme for micro", - "Tags": ["colorscheme"], - "Versions": [ - { - "Version": "0.1.0", - "Url": "https://github.com/theodus/monokai-dark/archive/0.1.0.zip", - "Require": { - "micro": ">=1.1.3" - } - } - ] -}] diff --git a/etc/skel/.config/micro/settings.json b/etc/skel/.config/micro/settings.json index a0e0ae8..cb79748 100644 --- a/etc/skel/.config/micro/settings.json +++ b/etc/skel/.config/micro/settings.json @@ -1,5 +1,4 @@ { "autosu": true, - "colorscheme": "monokai-dark", "mkparents": true } diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant index be7cf3a..033e28a 100755 --- a/usr/bin/setup-assistant +++ b/usr/bin/setup-assistant @@ -28,7 +28,7 @@ function upgrade2ultimate --text-align=center \ --center \ --text "What about Snaps, Flatpak, Appimage and firmware update support?"; then - echo "sudo pacman -R pamac-aur pamac-tray-appindicator" >> /tmp/setup-assistant/prepare.sh + echo "sudo pacman --noconfirm -R pamac-aur pamac-tray-appindicator" >> /tmp/setup-assistant/prepare.sh echo "pamac-all appimagelauncher fwupd @@ -161,54 +161,294 @@ function upgrade2ultimate fi yad \ - --image='telegram-desktop' \ + --image='firefox' \ --title="Upgrade to ULTIMATE 👾" \ --window-icon='update' \ - --text "Here are some desktop apps that might be useful to you:" \ + --text "Here are some browsers that you can choose from:" \ --geometry=600x400 \ --list \ --checklist \ --column=Install \ --column=Applications \ - --center < /usr/lib/setup-assistant/desktop-apps.txt > /tmp/setup-assistant/desktop-apps.txt + --center < /usr/lib/setup-assistant/browsers.txt > /tmp/setup-assistant/browsers.txt - if grep -R "Telegram" /tmp/setup-assistant/desktop-apps.txt; then - echo "telegram-desktop" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Firefox" /tmp/setup-assistant/browsers.txt; then + echo "firefox" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Joplin" /tmp/setup-assistant/desktop-apps.txt; then - echo "joplin" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Chromium" /tmp/setup-assistant/browsers.txt; then + echo "chromium" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Murmur" /tmp/setup-assistant/desktop-apps.txt; then - echo "murmur" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Opera" /tmp/setup-assistant/browsers.txt; then + echo "opera + opera-ffmpeg-codecs" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Discord" /tmp/setup-assistant/desktop-apps.txt; then - echo "discord" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Otter Browser" /tmp/setup-assistant/browsers.txt; then + echo "otter-browser" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Twitch GUI" /tmp/setup-assistant/desktop-apps.txt; then - echo "streamlink-twitch-gui" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Brave" /tmp/setup-assistant/browsers.txt; then + echo "brave" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Syncthing-GTK" /tmp/setup-assistant/desktop-apps.txt; then - echo "syncthing-gtk" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Falkon" /tmp/setup-assistant/browsers.txt; then + echo "falkon" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Nextcloud-client" /tmp/setup-assistant/desktop-apps.txt; then - echo "nextcloud-client" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Ungoogled" /tmp/setup-assistant/browsers.txt; then + echo "ungoogled-chromium" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Firefox Bitwarden" /tmp/setup-assistant/desktop-apps.txt; then - echo "firefox-extension-bitwarden" >> /tmp/setup-assistant/pkgs.txt - fi - if grep -R "Firefox XDM" /tmp/setup-assistant/desktop-apps.txt; then - echo "firefox-extension-xdm-browser-monitor" >> /tmp/setup-assistant/pkgs.txt - fi - if grep -R "Fractal" /tmp/setup-assistant/desktop-apps.txt; then - echo "fractal" >> /tmp/setup-assistant/pkgs.txt - fi - yad \ + --image='nextcloud-client' \ + --title="Upgrade to ULTIMATE 👾" \ + --window-icon='update' \ + --text "Some general internet applications:" \ + --geometry=600x400 \ + --list \ + --checklist \ + --column=Install \ + --column=Applications \ + --center < /usr/lib/setup-assistant/internet.txt > /tmp/setup-assistant/internet.txt + + if grep -R "Nextcloud-client" /tmp/setup-assistant/internet.txt; then + echo "nextcloud-client" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Firefox Bitwarden" /tmp/setup-assistant/internet.txt; then + echo "firefox-extension-bitwarden" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Firefox XDM" /tmp/setup-assistant/internet.txt; then + echo "firefox-extension-xdm-browser-monitor" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Syncthing-GTK" /tmp/setup-assistant/internet.txt; then + echo "syncthing-gtk" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Filezilla" /tmp/setup-assistant/internet.txt; then + echo "filezilla" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Putty" /tmp/setup-assistant/internet.txt; then + echo "putty" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Nitroshare" /tmp/setup-assistant/internet.txt; then + echo "nitroshare" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Jdownloader2" /tmp/setup-assistant/internet.txt; then + echo "jdownloader2" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Twitch GUI" /tmp/setup-assistant/internet.txt; then + echo "streamlink-twitch-gui" >> /tmp/setup-assistant/pkgs.txt + fi + + + yad \ + --image='telegram-desktop' \ + --title="Upgrade to ULTIMATE 👾" \ + --window-icon='update' \ + --text "Communication software:" \ + --geometry=600x400 \ + --list \ + --checklist \ + --column=Install \ + --column=Applications \ + --center < /usr/lib/setup-assistant/communication.txt > /tmp/setup-assistant/communication.txt + + if grep -R "Telegram Desktop" /tmp/setup-assistant/communication.txt; then + echo "telegram-desktop" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Discord" /tmp/setup-assistant/communication.txt; then + echo "discord" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Element" /tmp/setup-assistant/communication.txt; then + echo "element-desktop" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Wire" /tmp/setup-assistant/communication.txt; then + echo "wire-desktop" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Signal" /tmp/setup-assistant/communication.txt; then + echo "signal-desktop" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Jitsi-Meet" /tmp/setup-assistant/communication.txt; then + echo "jitsi-meet" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Zoom" /tmp/setup-assistant/communication.txt; then + echo "zoom" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Skype" /tmp/setup-assistant/communication.txt; then + echo "skypeforlinux-stable-bin" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Slack" /tmp/setup-assistant/communication.txt; then + echo "slack-desktop" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Whatsapp" /tmp/setup-assistant/communication.txt; then + echo "whatsapp-nativefier" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Mumble" /tmp/setup-assistant/communication.txt; then + echo "mumble" >> /tmp/setup-assistant/pkgs.txt + fi + + + yad \ + --image='thunderbird' \ + --title="Upgrade to ULTIMATE 👾" \ + --window-icon='update' \ + --text "Mail clients:" \ + --geometry=600x400 \ + --list \ + --checklist \ + --column=Install \ + --column=Applications \ + --center < /usr/lib/setup-assistant/mail.txt > /tmp/setup-assistant/mail.txt + + if grep -R "Thunderbird" /tmp/setup-assistant/mail.txt; then + echo "thunderbird" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Kmail" /tmp/setup-assistant/mail.txt; then + echo "kmail" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Geary" /tmp/setup-assistant/mail.txt; then + echo "geary" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Trojita" /tmp/setup-assistant/mail.txt; then + echo "trojita" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Mailspring" /tmp/setup-assistant/mail.txt; then + echo "mailspring" >> /tmp/setup-assistant/pkgs.txt + fi + + + yad \ + --image='audacity' \ + --title="Upgrade to ULTIMATE 👾" \ + --window-icon='update' \ + --text "What about audio software?" \ + --geometry=600x400 \ + --list \ + --checklist \ + --column=Install \ + --column=Applications \ + --center < /usr/lib/setup-assistant/audio.txt >> /tmp/setup-assistant/audio.txt + + if grep -R "Olivia" /tmp/setup-assistant/audio.txt; then + echo "olivia" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Kwave" /tmp/setup-assistant/audio.txt; then + echo "kwave" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Audacity" /tmp/setup-assistant/audio.txt; then + echo "audacity" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Ardour" /tmp/setup-assistant/audio.txt; then + echo "ardour" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "LMMS" /tmp/setup-assistant/audio.txt; then + echo "lmms" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Mixxx" /tmp/setup-assistant/audio.txt; then + echo "mixxx" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "MuseScore" /tmp/setup-assistant/audio.txt; then + echo "musescore" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Rosegarden" /tmp/setup-assistant/audio.txt; then + echo "rosegarden" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Strawberry" /tmp/setup-assistant/audio.txt; then + echo "strawberry" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Bitwig" /tmp/setup-assistant/audio.txt; then + echo "bitwig-studio" >> /tmp/setup-assistant/pkgs.txt + fi + + yad \ + --image='Kdenlive' \ + --title="Upgrade to ULTIMATE 👾" \ + --window-icon='update' \ + --text "What about video editing software?" \ + --geometry=600x400 \ + --list \ + --checklist \ + --column=Install \ + --column=Applications \ + --center < /usr/lib/setup-assistant/video.txt >> /tmp/setup-assistant/video.txt + + if grep -R "Kdenlive" /tmp/setup-assistant/video.txt; then + echo "kdenlive + movit + sox + laspa + opus-tools + frei0r-plugins" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "OBS Studio" /tmp/setup-assistant/video.txt; then + echo "obs-studio" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "SMPlayer" /tmp/setup-assistant/video.txt; then + echo "smplayer + smplayer-skins + smplayer-themes" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Shotcut" /tmp/setup-assistant/video.txt; then + echo "shotcut" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Piviti" /tmp/setup-assistant/video.txt; then + echo "piviti + frei0r-plugins" >> /tmp/setup-assistant/pkgs.txt + fi + + + yad \ --image='gimp' \ --title="Upgrade to ULTIMATE 👾" \ --window-icon='update' \ + --text "What about graphics software?" \ + --geometry=600x400 \ + --list \ + --checklist \ + --column=Install \ + --column=Applications \ + --center < /usr/lib/setup-assistant/graphics.txt >> /tmp/setup-assistant/graphics.txt + + if grep -R "GIMP" /tmp/setup-assistant/graphics.txt; then + echo "gimp" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Krita" /tmp/setup-assistant/graphics.txt; then + echo "krita + krita-plugin-gmic + opencolorio" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Kolourpaint" /tmp/setup-assistant/graphics.txt; then + echo "kolourpaint" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Digikam" /tmp/setup-assistant/graphics.txt; then + echo "digikam" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Inkscape" /tmp/setup-assistant/graphics.txt; then + echo "inkcape" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Blender" /tmp/setup-assistant/graphics.txt; then + echo "blender" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Pencil 2D" /tmp/setup-assistant/graphics.txt; then + echo "pencil2d" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Synfig Studio" /tmp/setup-assistant/graphics.txt; then + echo "synfigstudio" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "DarkTable" /tmp/setup-assistant/graphics.txt; then + echo "darktable" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "FontForge" /tmp/setup-assistant/graphics.txt; then + echo "fontforge" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "MyPaint" /tmp/setup-assistant/graphics.txt; then + echo "mypaint" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "ImageMagick" /tmp/setup-assistant/graphics.txt; then + echo "imagemagick" >> /tmp/setup-assistant/pkgs.txt + fi + + + yad \ + --image='kodi' \ + --title="Upgrade to ULTIMATE 👾" \ + --window-icon='update' \ --text "What about multimedia software?" \ --geometry=600x400 \ --list \ @@ -226,36 +466,79 @@ function upgrade2ultimate if grep -R "Soundconverter" /tmp/setup-assistant/multimedia.txt; then echo "soundconverter" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Piviti" /tmp/setup-assistant/multimedia.txt; then - echo "piviti" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Stremio" /tmp/setup-assistant/multimedia.txt; then + echo "stremio" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Kdenlive" /tmp/setup-assistant/multimedia.txt; then - echo "kdenlive" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Kodi" /tmp/setup-assistant/multimedia.txt; then + echo "kodi + kodi-platform + kodi-eventclients" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Audacity" /tmp/setup-assistant/multimedia.txt; then - echo "audacity" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Mediaelch" /tmp/setup-assistant/multimedia.txt; then + echo "mediaelch" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Subtitlecomposer" /tmp/setup-assistant/multimedia.txt; then + echo "subtitlecomposer" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Kid3" /tmp/setup-assistant/multimedia.txt; then + echo "kid3" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "K3B" /tmp/setup-assistant/multimedia.txt; then + echo "k3b + kaudiocreator + cdpara + cdparanoia + cdrdao + dvd+rw-tools + emovix + transcode + vcdimager + cdrtools" >> /tmp/setup-assistant/pkgs.txt fi if grep -R "Easytag" /tmp/setup-assistant/multimedia.txt; then echo "easytag" >> /tmp/setup-assistant/pkgs.txt - fi - if grep -R "GIMP" /tmp/setup-assistant/multimedia.txt; then - echo "gimp" >> /tmp/setup-assistant/pkgs.txt - fi - if grep -R "Krita" /tmp/setup-assistant/multimedia.txt; then - echo "krita" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Olivia" /tmp/setup-assistant/multimedia.txt; then - echo "olivia" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Plex" /tmp/setup-assistant/multimedia.txt; then + echo "plex-media-player" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Inkscape" /tmp/setup-assistant/multimedia.txt; then - echo "inkscape" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Handbrake" /tmp/setup-assistant/multimedia.txt; then + echo "handbrake" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Blender" /tmp/setup-assistant/multimedia.txt; then - echo "blender" >> /tmp/setup-assistant/pkgs.txt + if grep -R "Qwinff" /tmp/setup-assistant/multimedia.txt; then + echo "qwinff" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Gcolor3" /tmp/setup-assistant/multimedia.txt; then - echo "gcolor3" >> /tmp/setup-assistant/pkgs.txt + + + yad \ + --image='code' \ + --title="Upgrade to ULTIMATE 👾" \ + --window-icon='update' \ + --text "Are you a developer who needs one of these?" \ + --geometry=600x400 \ + --list \ + --checklist \ + --column=Install \ + --column=Applications \ + --center < /usr/lib/setup-assistant/development.txt >> /tmp/setup-assistant/development.txt + if grep -R "Visual Studio" /tmp/setup-assistant/development.txt; then + echo "code" >> /tmp/setup-assistant/pkgs.txt fi + if grep -R "GNU Emacs" /tmp/setup-assistant/development.txt; then + echo "emacs" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "Atom" /tmp/setup-assistant/development.txt; then + echo "atom" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "IntelliJ-IDEA" /tmp/setup-assistant/development.txt; then + echo "intellij-idea-community-edition" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "PyCharm" /tmp/setup-assistant/development.txt; then + echo "pycharm-community-edition" >> /tmp/setup-assistant/pkgs.txt + fi + if grep -R "QtCreator" /tmp/setup-assistant/development.txt; then + echo "qtcreator" >> /tmp/setup-assistant/pkgs.txt + fi + yad \ --image='virtualbox' \ @@ -267,11 +550,11 @@ function upgrade2ultimate --checklist \ --column=Install \ --column=Applications \ - --center < /usr/lib/setup-assistant/virtualisation.txt >> /tmp/setup-assistant/virtualisation.txt - if grep -R "Virtalbox" /tmp/setup-assistant/virtualisation.txt; then + --center < /usr/lib/setup-assistant/virtualization.txt >> /tmp/setup-assistant/virtualization.txt + if grep -R "Virtalbox" /tmp/setup-assistant/virtualization.txt; then echo "garuda-virtualbox" >> /tmp/setup-assistant/pkgs.txt fi - if grep -R "Virt-manager" /tmp/setup-assistant/virtualisation.txt; then + if grep -R "Virt-manager" /tmp/setup-assistant/virtualization.txt; then echo "garuda-virt-manager" >> /tmp/setup-assistant/pkgs.txt echo "sudo systemctl enable --now libvirtd" >> /tmp/setup-assistant/setup_root.sh fi @@ -303,7 +586,7 @@ if ! yad \ --button=Yes:1 \ --text-align=center \ --center \ - --text "Do you want to get a recent mirrorlist and refresh mirrors?"; then + --text "Do you want to get a recent mirrorlist and refresh mirrors?" 💻; then reflector-simple >/dev/null 2>&1 fi @@ -316,7 +599,7 @@ if ! yad \ --button=Yes:1 \ --text-align=center \ --center \ - --text "Update the system? (recommended!)"; then + --text "Update the system? (recommended!) 😊"; then alacritty -e sudo pacman "-Syyu" fi @@ -329,7 +612,7 @@ if ! yad \ --button=Yes:1 \ --text-align=center \ --center \ - --text "Upgrade to Ultimate? (You can select which apps you want!)"; then + --text "Upgrade to Ultimate? (You can select which apps you want!) 🔧"; then upgrade2ultimate fi diff --git a/usr/lib/setup-assistant/apply.sh b/usr/lib/setup-assistant/apply.sh old mode 100644 new mode 100755 index 6ae2ace..a34b03a --- a/usr/lib/setup-assistant/apply.sh +++ b/usr/lib/setup-assistant/apply.sh @@ -5,7 +5,7 @@ fi cat /tmp/setup-assistant/pkgs.txt | sed '/^$/d;s/[[:blank:]]//g' > /tmp/setup-assistant/pkgs-install.txt -sudo pacman --needed -S - < /tmp/setup-assistant/pkgs-install.txt +sudo pacman --needed --noconfirm -S - < /tmp/setup-assistant/pkgs-install.txt if [ -e "/tmp/setup-assistant/setup.sh" ]; then sh /tmp/setup-assistant/setup_root.sh diff --git a/usr/lib/setup-assistant/audio.txt b/usr/lib/setup-assistant/audio.txt new file mode 100644 index 0000000..31ccffc --- /dev/null +++ b/usr/lib/setup-assistant/audio.txt @@ -0,0 +1,22 @@ +true +Olivia (Audio player with YouTube support) +false +Kwave (sound editor by KDE) +false +Audacity (Record/edit audio) +false +Ardour (proffesional-grade audio workstation) +false +LMMS (The Linux MultiMedia Studio) +false +Mixxx (Digital DJ'ing) +false +MuseScore (Sheet music notation) +false +Rosegarden (MIDI/audio sequencer) +false +Strawberry Player (aimed at collectors) +false +Bitwig Studio (Digital audio workstation) +false +None of them \ No newline at end of file diff --git a/usr/lib/setup-assistant/browsers.txt b/usr/lib/setup-assistant/browsers.txt new file mode 100644 index 0000000..91c5b05 --- /dev/null +++ b/usr/lib/setup-assistant/browsers.txt @@ -0,0 +1,16 @@ +true +Firefox (recommended) +false +Chromium +false +Opera +false +Otter Browser +false +Brave (Based on Chromium + privacy stuff) +false +Falkon (KDE browser) +false +Ungoogled Chromium +false +None of them diff --git a/usr/lib/setup-assistant/communication.txt b/usr/lib/setup-assistant/communication.txt new file mode 100644 index 0000000..07c30fd --- /dev/null +++ b/usr/lib/setup-assistant/communication.txt @@ -0,0 +1,24 @@ +true +Telegram Desktop +false +Discord +false +Element (Matrix client) +false +Wire (E2EE messenger) +false +Signal Desktop +false +Jitsi-Meet (Open source webconferencing) +false +Zoom (Proprietary webconferencing) +false +Skype +false +Slack (Messenger) +false +Whatsapp (nativefier) +false +Mumble (Open source Teamspeak clone) +false +No communication software \ No newline at end of file diff --git a/usr/lib/setup-assistant/development.txt b/usr/lib/setup-assistant/development.txt new file mode 100644 index 0000000..e1dc2a7 --- /dev/null +++ b/usr/lib/setup-assistant/development.txt @@ -0,0 +1,14 @@ +true +Visual Studio Code +false +GNU Emacs +false +Atom +false +IntelliJ-IDEA (Community Edition) +false +PyCharm (Community Edition) +false +QtCreator +false +No development software \ No newline at end of file diff --git a/usr/lib/setup-assistant/graphics.txt b/usr/lib/setup-assistant/graphics.txt new file mode 100644 index 0000000..e14a3ef --- /dev/null +++ b/usr/lib/setup-assistant/graphics.txt @@ -0,0 +1,24 @@ +true +GIMP (Advanced image manipulation program) +false +Krita (Paint application by KDE) +false +Kolourpaint (Paint application) +false +Digikam (Photo management app) +false +Inkscape (Vector graphics) +false +Blender (full featured 3D creation suite) +false +Pencil 2D (2D handdrawn animations) +false +Synfig Studio (2D vector animation) +false +DarkTable (Organize & develop raw images) +false +FontForge (Outline & font editor) +false +MyPaint (Digital painting) +false +ImageMagick (edit bmp & svg images) \ No newline at end of file diff --git a/usr/lib/setup-assistant/desktop-apps.txt b/usr/lib/setup-assistant/internet.txt similarity index 65% rename from usr/lib/setup-assistant/desktop-apps.txt rename to usr/lib/setup-assistant/internet.txt index 1f4ff26..412aeff 100644 --- a/usr/lib/setup-assistant/desktop-apps.txt +++ b/usr/lib/setup-assistant/internet.txt @@ -1,22 +1,22 @@ true -Telegram Desktop -false -Joplin (note editor) -false -Murmur (Mumble Client) -false -Discord -false -Twitch GUI -true -Syncthing-GTK (sync files between devices) -true Nextcloud-client (Use our Garuda Cloud to sync dotfiles) true Firefox Bitwarden extension (password manager) -false +true +Xtreme Download Manager +true Firefox XDM extension (download manager) false -Fractal (Matrix client) +Syncthing-GTK (sync files between devices) false -None of them +Filezilla (FTP client) +false +Putty (SSH/Telnet client) +false +Nitroshare (Network file sharing via LAN) +false +Jdownloader2 +false +Twitch GUI +false +None of them \ No newline at end of file diff --git a/usr/lib/setup-assistant/mail.txt b/usr/lib/setup-assistant/mail.txt new file mode 100644 index 0000000..d9128fa --- /dev/null +++ b/usr/lib/setup-assistant/mail.txt @@ -0,0 +1,12 @@ +true +Thunderbird +false +Kmail (KDE mail client) +false +Geary (GNOME mail client) +false +Trojita (Qt mail client) +false +Mailspring +false +No mail client \ No newline at end of file diff --git a/usr/lib/setup-assistant/multimedia.txt b/usr/lib/setup-assistant/multimedia.txt index 510692b..f363540 100644 --- a/usr/lib/setup-assistant/multimedia.txt +++ b/usr/lib/setup-assistant/multimedia.txt @@ -1,28 +1,26 @@ false -Converseen (Image converter) +Stremio (One-stop hub for video content aggregation) false -Transmageddon (Video converter) +Kodi (Entertainment hub) false -Soundconverter +Mediaelch (Media manager for Kodi) false -Piviti (Video editor) +Subtitlecomposer (A KDE subtitle editor) false -Kdenlive (Video editor) -false -Audacity (Audio editor) +Kid3 (KDE Tag editor) false Easytag (Audio tag editor) false -GIMP +Plex desktop client false -Krita (KDE picture editor) +K3B (CD burning application) false -Inkscape +Qwinff (Video converter) false -Blender +Transmageddon (Video converter) false -Olivia (Music player with YouTube support) +Soundkonvertor (Audio converter) false -Gcolor3 +Converseen (Image converter) false -No multimedia software +Handbrake (Video format transcoder) diff --git a/usr/lib/setup-assistant/office.txt b/usr/lib/setup-assistant/office.txt index 4861171..48e7f57 100644 --- a/usr/lib/setup-assistant/office.txt +++ b/usr/lib/setup-assistant/office.txt @@ -1,7 +1,7 @@ true LibreOffice Fresh (Recommended, full featured office suite) false -LibreOffice Still (The same than above, an older version) +LibreOffice Still (The same than above, more stable version) false OnlyOffice (Aims to be compatible with Microsoft Office) false @@ -13,7 +13,7 @@ Free Office false Yozo Office false -Calligra Office +Calligra Suite false Abiword (Simple wordprocessor, recommended for simple writing) false diff --git a/usr/lib/setup-assistant/video.txt b/usr/lib/setup-assistant/video.txt new file mode 100644 index 0000000..c2da500 --- /dev/null +++ b/usr/lib/setup-assistant/video.txt @@ -0,0 +1,12 @@ +true +Kdenlive (Video editor by KDE) +false +OBS Studio (Video recording/streaming) +false +SMPlayer (Build-in codecs, high compatability) +false +Shotcut (Qt-based video editor) +false +Piviti +false +Openshot diff --git a/usr/lib/setup-assistant/virtualisation.txt b/usr/lib/setup-assistant/virtualization.txt similarity index 74% rename from usr/lib/setup-assistant/virtualisation.txt rename to usr/lib/setup-assistant/virtualization.txt index 0712f79..5827509 100644 --- a/usr/lib/setup-assistant/virtualisation.txt +++ b/usr/lib/setup-assistant/virtualization.txt @@ -3,4 +3,4 @@ Virtualbox (most likely easier for beginners) false Virt-manager false -No virtualisation software +No virtualization software