Merge branch 'live' into blue-build

.github/workflows/build.yml

@@ -26,6 +26,7 @@ jobs:
       matrix:
         recipe:
           - silverflow-nvidia-39.yml
+          - silverflow-nvidia-gts.yml
 
     steps:
       - name: Build Custom Image

README.md

@@ -7,7 +7,7 @@ SilverFlow is based on [ublue-os/startingpoint](https://github.com/ublue-os/star
 ## Installation
 
 > [!WARNING]
-> Currently, the system is undergoing constant changes, such as system hardening, package replacement or other experiments (not sure how long). There is a chance of abandoning the system again!
+> Currently, the system is undergoing constant changes, such as system hardening, package replacement or other experiments (not sure how long).
 
 > [!NOTE]
 > I recommend either using one of the main uBlue images or creating your own

boot_menu.yml

@@ -1,5 +1,5 @@
 ublue_variants:
-  - label: C0dePlayer/silverflow
+  - label: c0deplayer/silverflow
     ks: /kickstart/ublue-os.ks
     flavors:
       - label: silverflow-nvidia

build.sh

@@ -10,7 +10,7 @@ set -oue pipefail
 
 export CONFIG_DIRECTORY="/tmp/config"
 RECIPE_FILE="$CONFIG_DIRECTORY/$RECIPE"
-MODULE_DIRECTORY="/tmp/modules"
+export MODULE_DIRECTORY="/tmp/modules"
 
 # https://mikefarah.gitbook.io/yq/usage/tips-and-tricks#yq-in-a-bash-loop
 get_yaml_array() {

config/common_modules/akmods.yml

@@ -3,4 +3,3 @@ install:
   - openrazer
   - winesync
   - ryzen-smu
-  - zenergy

config/common_modules/default-flatpaks.yml

@@ -2,7 +2,12 @@ type: default-flatpaks
 system:
   repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
   repo-name: flathub
-  repo-title: "Flathub (system-wide)"
+  repo-title: "Flathub (System)"
+
+user:
+  repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
+  repo-name: flathub
+  repo-title: "Flathub (User)"
   install:
     - org.gnome.Calculator
     - org.gnome.Calendar
@@ -21,3 +26,5 @@ system:
     - com.mattjakeman.ExtensionManager
     - io.missioncenter.MissionCenter
     - com.github.marhkb.Pods
+    - org.gtk.Gtk3theme.adw-gtk3
+    - org.gtk.Gtk3theme.adw-gtk3-dark

config/common_modules/rpm-ostree.yml

@@ -11,8 +11,7 @@ install:
   - polychromatic
   - openrazer-meta
 remove:
-  - firefox
-  - firefox-langpacks
+  - gnome-tweaks
   - gnome-software
   - gnome-software-rpm-ostree
   - gnome-tour

config/common_modules/scripts.yml

@@ -2,6 +2,5 @@ type: script
 scripts:
   - file-permissions.sh
   - power-scheduler.sh
-  - brave-browser.sh
   - systemwide-themes.sh
   - signing.sh

config/files/usr/etc/dconf/db/local.d/01-silverflow

@@ -4,11 +4,15 @@ clock-show-weekday=true
 cursor-theme='Bibata-Modern-Classic'
 document-font-name='Inter 11'
 font-antialiasing='rgba'
+icon-theme='MoreWaita'
 font-name='Inter 11'
 monospace-font-name='Hack Nerd Font Mono 10'
 show-battery-percentage=true
 text-scaling-factor=1.2
 
+[org/gnome/desktop/datetime]
+automatic-timezone=true
+
 [org/gnome/nautilus/preferences]
 default-folder-viewer='icon-view'
 search-filter-time-type='last_modified'

config/files/usr/share/ublue-os/firstboot/yafti.yml

@@ -18,7 +18,8 @@ screens:
       show_terminal: true
       package_manager: yafti.plugin.flatpak
       package_manager_defaults:
-        system: true
+        system: false
+        user: true
       groups:
         DefaultPlus Apps:
           description: Additional default applications for all desktop environments.
@@ -27,24 +28,19 @@ screens:
             - Fedora Media Writer: org.fedoraproject.MediaWriter
             - Mozilla Firefox: org.mozilla.firefox
             - FreeFileSync: org.freefilesync.FreeFileSync
-            - Proton VPN (Unofficial!): com.protonvpn.www
         Web Browsers:
           description: Additional browsers to complement or replace Firefox.
           default: false
           packages:
             - Brave: com.brave.Browser
             - GNOME Web: org.gnome.Epiphany
             - Google Chrome: com.google.Chrome
-            - Microsoft Edge: com.microsoft.Edge
-            - Opera: com.opera.Opera
         Gaming:
           description: "Rock and Stone!"
           default: false
           packages:
             - Bottles: com.usebottles.bottles
             - Discord: com.discordapp.Discord
-            - ArmCord (Custom Discord Client): xyz.armcord.ArmCord
-            - WebCord (Custom Discord Client): io.github.spacingbat3.webcord
             - Heroic Games Launcher: com.heroicgameslauncher.hgl
             - Steam: com.valvesoftware.Steam
             - Lutris: net.lutris.Lutris
@@ -75,7 +71,7 @@ screens:
             - ZapZap: com.rtosta.zapzap
             - Caprine: com.sindresorhus.Caprine
             - Materialgram: io.github.kukuruzka165.materialgram
-            - Upscayl: org.upscayl.Upscayl
+            - Upscaler: io.gitlab.theevilskeleton.Upscaler
 
   can-we-harden-your-kargs:
     source: yafti.screen.consent

config/silverflow-nvidia-gts.yml

@@ -0,0 +1,15 @@
+name: silverflow-nvidia
+description: SilverFlow GTS (Grand-Touring Support)
+base-image: ghcr.io/ublue-os/silverblue-nvidia
+image-version: 38
+
+modules:
+  - from-file: common_modules/files.yml
+  - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/default-flatpaks.yml
+  - from-file: common_modules/yafti.yml
+  - from-file: common_modules/fonts.yml
+  - from-file: common_modules/bling.yml
+  - from-file: common_modules/systemd.yml
+  - from-file: common_modules/image-cleaner.yml
+  - from-file: common_modules/scripts.yml