Added flatpak and snap

clayrisser · Mar 4, 2023 · 2a7595b · 2a7595b
1 parent 87b374a
commit 2a7595b
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 28 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -34,6 +34,7 @@
     "drun",
     "figlet",
     "flatpak",
+    "flatpaks",
     "fontconfig",
     "fullscreen",
     "geary",

diff --git a/os/config.yaml b/os/config.yaml
@@ -19,8 +19,10 @@ lb:
   debianInstallerGui: false
 overlays:
   debianInstaller: {}
-  grub: {}
   example: {}
-  # plymouth: {}
-  # sway: {}
+  grub: {}
+  sway: {}
+  # flatpak: {}
   # gnome: {}
+  # plymouth: {}
+  # snap: {}
diff --git a/overlays/flatpak/config.yaml b/overlays/flatpak/config.yaml
@@ -0,0 +1,2 @@
+flatpaks: []
+liveFlatpaks: []
diff --git a/overlays/flatpak/hooks/post-install/flatpak.sh.overlay.tmpl b/overlays/flatpak/hooks/post-install/flatpak.sh.overlay.tmpl
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+flatpak override --filesystem=xdg-config/gtk-3.0
+flatpak override --filesystem=xdg-config/gtk-4.0
+
+{% for flatpak in overlay.config.flatpaks %}
+flatpak install -y {{ flatpak }}
+{% endfor %}
diff --git a/overlays/flatpak/lb/hooks/normal/2010-flatpak.hook.chroot.overlay.tmpl b/overlays/flatpak/lb/hooks/normal/2010-flatpak.hook.chroot.overlay.tmpl
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+flatpak override --filesystem=xdg-config/gtk-3.0
+flatpak override --filesystem=xdg-config/gtk-4.0
+
+{% for flatpak in overlay.config.liveFlatpaks %}
+flatpak install -y {{ flatpak }}
+{% endfor %}
diff --git a/overlays/flatpak/packages/flatpak.yaml b/overlays/flatpak/packages/flatpak.yaml
@@ -0,0 +1 @@
+- flatpak
diff --git a/overlays/gnome/packages/gnome.yaml.overlay.tmpl b/overlays/gnome/packages/gnome.yaml.overlay.tmpl
@@ -40,6 +40,7 @@
 {% if overlay.config.packages.mediumPriority %}
 # MEDIUM PRIORITY
 - baobab # disk usage analyzer
+- drawing # screenshot editor
 - eog # image viewer
 - evince # document viewer
 - gnome-characters # character selection
@@ -60,6 +61,7 @@
 # LOW PRIORITY
 - cheese # camera
 - geary # email
+- gimp # image editor
 - gnome-calculator # calculator
 - gnome-calendar # calendar
 - gnome-clocks # clock

diff --git a/...h/packages/hooks/post-install/plymouth.sh → ...s/plymouth/hooks/post-install/plymouth.sh b/...h/packages/hooks/post-install/plymouth.sh → ...s/plymouth/hooks/post-install/plymouth.sh
diff --git a/overlays/snap/config.yaml b/overlays/snap/config.yaml
@@ -0,0 +1,2 @@
+snaps: []
+liveSnaps: []
diff --git a/overlays/snap/hooks/post-install/snap.sh.overlay.tmpl b/overlays/snap/hooks/post-install/snap.sh.overlay.tmpl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+{% for snap in overlay.config.snaps %}
+snap install {{ snap }}
+{% endfor %}
diff --git a/overlays/snap/lb/hooks/normal/2010-snap.hook.chroot.overlay.tmpl b/overlays/snap/lb/hooks/normal/2010-snap.hook.chroot.overlay.tmpl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+{% for snap in overlay.config.liveSnaps %}
+snap install {{ snap }}
+{% endfor %}
diff --git a/overlays/snap/packages/snap.yaml b/overlays/snap/packages/snap.yaml
@@ -0,0 +1 @@
+- snapd
diff --git a/overlays/sway/filesystem/live_installed/etc/skel/.config/sway/screenshot.sh b/overlays/sway/filesystem/live_installed/etc/skel/.config/sway/screenshot.sh
@@ -53,22 +53,10 @@ case $CHOICE in
     	GEOMETRY="`echo \"$CHOICE\" | cut -d$'\t' -f1`"
         grim -g "$GEOMETRY" "$EXPENDED_FILENAME"
 esac
-# If gimp is installed, prompt the user to edit the captured screenshot
-if command -v gimp $>/dev/null
-then
-    EDIT_CHOICE=`wofi -S dmenu $WOFI_ARGS -lines 2 -p 'Edit Screenshot' << EOF
-yes
-no
-EOF`
-    case $EDIT_CHOICE in
-        yes)
-            gimp "$EXPENDED_FILENAME"
-            ;;
-        no)
-            ;;
-        '')
-            ;;
-    esac
+
+_EDITOR=$(command -v drawing $>/dev/null && echo drawing || (command -v gimp $>/dev/null && echo gimp || true))
+if [ "$_EDITOR" != "" ]; then
+    $_EDITOR "$EXPENDED_FILENAME"
 fi
 wl-copy < "$EXPENDED_FILENAME"
 notify-send "Screenshot" "File saved as <i>'$FILENAME'</i> and copied to the clipboard." -i "$EXPENDED_FILENAME"
diff --git a/overlays/sway/filesystem/live_installed/usr/local/bin/swaycfg b/overlays/sway/filesystem/live_installed/usr/local/bin/swaycfg
@@ -16,17 +16,17 @@ _set_color_scheme() {
     _COLOR_SCHEME=$1
     _THEME=$(_get_theme)
     if [ "$_COLOR_SCHEME" = "dark" ]; then
-        gsettings set org.gnome.desktop.interface gtk-theme "${_THEME}-dark"
-        gsettings set org.gnome.desktop.wm.preferences theme "${_THEME}-dark"
-        gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
+        gsettings set org.gnome.desktop.interface gtk-theme "${_THEME}-dark" 2>/dev/null || true
+        gsettings set org.gnome.desktop.wm.preferences theme "${_THEME}-dark" 2>/dev/null || true
+        gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' 2>/dev/null || true
         _settings_file_set gtk-theme-name "${_THEME}-dark" $HOME/.gtkrc-2.0
         _settings_file_set gtk-theme-name "${_THEME}-dark" $HOME/.config/gtk-3.0/settings.ini
         _settings_file_set gtk-theme-name "${_THEME}-dark" $HOME/.config/gtk-4.0/settings.ini
         _settings_file_set style "${_THEME}-Dark" $HOME/.config/qt5ct/qt5ct.conf
     else
-        gsettings set org.gnome.desktop.interface gtk-theme "$_THEME"
-        gsettings set org.gnome.desktop.wm.preferences theme "$_THEME"
-        gsettings set org.gnome.desktop.interface color-scheme 'prefer-light'
+        gsettings set org.gnome.desktop.interface gtk-theme "$_THEME" 2>/dev/null || true
+        gsettings set org.gnome.desktop.wm.preferences theme "$_THEME" 2>/dev/null || true
+        gsettings set org.gnome.desktop.interface color-scheme 'prefer-light' 2>/dev/null || true
         _settings_file_set gtk-theme-name "$_THEME" $HOME/.gtkrc-2.0
         _settings_file_set gtk-theme-name "$_THEME" $HOME/.config/gtk-3.0/settings.ini
         _settings_file_set gtk-theme-name "$_THEME" $HOME/.config/gtk-4.0/settings.ini
@@ -36,8 +36,8 @@ _set_color_scheme() {
 
 _set_theme() {
     _THEME=$1
-    gsettings set org.gnome.desktop.interface gtk-theme "$_THEME"
-    gsettings set org.gnome.desktop.wm.preferences theme "$_THEME"
+    gsettings set org.gnome.desktop.interface gtk-theme "$_THEME" 2>/dev/null || true
+    gsettings set org.gnome.desktop.wm.preferences theme "$_THEME" 2>/dev/null || true
     _settings_file_set gtk-theme-name "$_THEME" $HOME/.gtkrc-2.0
     _settings_file_set gtk-theme-name "$_THEME" $HOME/.config/gtk-3.0/settings.ini
     _settings_file_set gtk-theme-name "$_THEME" $HOME/.config/gtk-4.0/settings.ini
@@ -49,7 +49,25 @@ _get_theme() {
 }
 
 _get_color_scheme() {
-    gsettings get org.gnome.desktop.interface color-scheme | grep --color=never -o dark || echo light
+    if gsettings get org.gnome.desktop.interface color-scheme 2>/dev/null >/dev/null; then
+        gsettings get org.gnome.desktop.interface color-scheme | grep --color=never -o dark || echo light
+    else
+        if [ -f "$HOME/.config/gtk-4.0/settings.ini" ]; then
+            echo $(_get_color_scheme_from_file "$HOME/.config/gtk-4.0/settings.ini")
+        elif [ -f "$HOME/.config/gtk-3.0/settings.ini" ]; then
+            echo $(_get_color_scheme_from_file "$HOME/.config/gtk-3.0/settings.ini")
+        elif [ -f "$HOME/.gtkrc-2.0" ]; then
+            echo $(_get_color_scheme_from_file "$HOME/.gtkrc-2.0")
+        fi
+    fi
+}
+
+_get_color_scheme_from_file() {
+    if [ $(cat "$1" | grep gtk-theme-name | sed 's|^gtk-theme-name="\?.\+-\([^-]\+\)|\1|g' | sed 's|"||g') = dark ]; then
+        echo dark
+    else
+        echo light
+    fi
 }
 
 _echo() {