Some changes

jitcos · Jan 25, 2024 · b88ea71 · b88ea71
1 parent 28362ac
commit b88ea71
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# CABOs
+# cabos
 
 > **Warning**
 > Startingpoint was recently rewritten, and this version is considered a "1.0" *semi-*stable release.
@@ -73,7 +73,7 @@ The `latest` tag will automatically point to the latest build. That build will s
 
 ## ISO
 
-This template includes a simple Github Action to build and release an ISO of your image. 
+This template includes a simple Github Action to build and release an ISO of your image.
 
 To run the action, simply edit the `boot_menu.yml` by changing all the references to startingpoint to your repository. This should trigger the action automatically.
 

diff --git a/boot_menu.yml b/boot_menu.yml
@@ -2,4 +2,4 @@ ublue_variants:
   - label: m0ngr31/cabos
     ks: /kickstart/ublue-os.ks
     flavors:
-      - label: CABOs
+      - label: cabos
diff --git a/config/common_modules/initramfs-setup.yml b/config/common_modules/initramfs-setup.yml
diff --git a/config/common_modules/rpm-ostree.yml b/config/common_modules/rpm-ostree.yml
@@ -3,6 +3,7 @@ repos:
   - https://copr.fedorainfracloud.org/coprs/kylegospo/system76-scheduler/repo/fedora-%OS_VERSION%/kylegospo-system76-scheduler-fedora-%OS_VERSION%.repo
   - https://copr.fedorainfracloud.org/coprs/szydell/system76/repo/fedora-%OS_VERSION%/szydell-system76-fedora-%OS_VERSION%.repo
   - https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-%OS_VERSION%/ublue-os-staging-fedora-%OS_VERSION%.repo
+  - https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-%OS_VERSION%/kylegospo-prompt-fedora-%OS_VERSION%.repo
 
 install:
   - gnome-shell-extension-caffeine
@@ -18,6 +19,9 @@ install:
   - zsh
   - gnome-boxes
   - code
+  - prompt
+  - vte291
+  - vte-profile
   - docker-ce
   - docker-ce-cli
   - docker-buildx-plugin
@@ -52,4 +56,5 @@ remove:
   - gnome-shell-extension-launch-new-instance
   - gnome-shell-extension-places-menu
   - gnome-shell-extension-window-list
-  - gnome-classic-session
+  - gnome-classic-session
+  - gnome-terminal
diff --git a/config/files/usr/bin/dx-user-gsettings b/config/files/usr/bin/dx-user-gsettings
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # SCRIPT VERSION
-USER_SETUP_VER=1
+USER_SETUP_VER=2
 USER_SETUP_VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/cabos/gsettings-configured"
 USER_SETUP_VER_RAN=$(cat "$USER_SETUP_VER_FILE")
 
@@ -62,6 +62,23 @@ gsettings set org.gnome.shell.extensions.dash-to-panel isolate-workspaces true
 
 gsettings set org.gnome.shell.app-switcher current-workspace-only true
 
+# Terminal theme
+PROFILE_UUID=$(uuidgen)
+
+gsettings set org.gnome.Terminal.ProfilesList list "$(gsettings get org.gnome.Terminal.ProfilesList list | sed "s/]/, '$PROFILE_UUID']/")"
+
+dconf write "/org/gnome/terminal/legacy/profiles:/:$PROFILE_UUID/audible-bell" false
+dconf write "/org/gnome/terminal/legacy/profiles:/:$PROFILE_UUID/background-color" "'#3C3C4C4C5555'"
+dconf write "/org/gnome/terminal/legacy/profiles:/:$PROFILE_UUID/bold-color-same-as-fg" true
+dconf write "/org/gnome/terminal/legacy/profiles:/:$PROFILE_UUID/font" "'FiraMono Nerd Font 12'"
+dconf write "/org/gnome/terminal/legacy/profiles:/:$PROFILE_UUID/foreground-color" "'#C5C5D4D4DDDD'"
+dconf write "/org/gnome/terminal/legacy/profiles:/:$PROFILE_UUID/palette" "['rgb(60, 76, 85)', 'rgb(223, 140, 140)', 'rgb(168, 206, 147)', 'rgb(218, 218, 147)', 'rgb(131, 175, 229)', 'rgb(154, 147, 225)', 'rgb(127, 193, 202)', 'rgb(197, 212, 221)', 'rgb(137, 155, 166)', 'rgb(242, 195, 143)', 'rgb(168, 206, 147)', 'rgb(218, 218, 147)', 'rgb(131, 175, 229)', 'rgb(209, 142, 194)', 'rgb(127, 193, 202)', 'rgb(230, 238, 243)']"
+dconf write "/org/gnome/terminal/legacy/profiles:/:$PROFILE_UUID/use-system-font" false
+dconf write "/org/gnome/terminal/legacy/profiles:/:$PROFILE_UUID/use-theme-colors" false
+dconf write "/org/gnome/terminal/legacy/profiles:/:$PROFILE_UUID/visible-name" "'Lucid'"
+
+gsettings set org.gnome.Terminal.ProfilesList default "'$PROFILE_UUID'"
+
 # Prevent future executions
 echo "Writing state file"
 echo "$USER_SETUP_VER" > "$USER_SETUP_VER_FILE"
diff --git a/config/files/usr/etc/modprobe.d/modprobe-custom.conf b/config/files/usr/etc/modprobe.d/modprobe-custom.conf
diff --git a/config/files/usr/share/ublue-os/firstboot/yafti.yml b/config/files/usr/share/ublue-os/firstboot/yafti.yml
@@ -1,11 +1,11 @@
-title: Welcome to CABOs
+title: Welcome to cabos
 properties:
   mode: "run-on-change"
 screens:
   first-screen:
     source: yafti.screen.title
     values:
-      title: "Welcome to CABOs"
+      title: "Welcome to cabos"
       icon: "/path/to/icon"
       description: |
         This guided installer will help you get started with your new system.
@@ -84,7 +84,7 @@ screens:
           description: Development tools and IDEs.
           default: false
           packages:
-            - Android Studio: com.google.AndroidStudio
+            - Builder: org.gnome.Builder
             - PyCharm (Community): com.jetbrains.PyCharm-Community
             - PyCharm (Professional): com.jetbrains.PyCharm-Professional
             - IntelliJ IDEA (Community): com.jetbrains.IntelliJ-IDEA-Community
@@ -94,6 +94,7 @@ screens:
             - Rider: com.jetbrains.Rider
             - CLion: com.jetbrains.CLion
             - GoLand: com.jetbrains.GoLand
+            - Android Studio: com.google.AndroidStudio
             - Sublime Text: com.sublimetext.three
             - Insomnia: rest.insomnia.Insomnia
             - Postman: com.getpostman.Postman
@@ -166,4 +167,4 @@ screens:
         - "Install More Applications":
             run: /usr/bin/gnome-software
       description: |
-        Thanks for trying CABOs, we hope you enjoy it!
+        Thanks for trying cabos, we hope you enjoy it!
diff --git a/config/files/usr/share/ublue-os/just/60-custom.just b/config/files/usr/share/ublue-os/just/60-custom.just
@@ -70,7 +70,7 @@ enable-hibernate ACTION="prompt":
   uuid_variable=$(sudo findmnt -no UUID -T /var/swap/swapfile) > /dev/null 2>&1
   swap_offset=$(sudo btrfs inspect-internal map-swapfile -r /var/swap/swapfile) > /dev/null 2>&1
 
-  echo 'Adding resume to Kernel arguments'
+  echo 'Adding resume to kernel arguments'
   sudo rpm-ostree kargs --append="resume=UUID=$uuid_variable resume_offset=$swap_offset" > /dev/null 2>&1
 
   echo 'Adding swap to /etc/fstab'
@@ -138,5 +138,5 @@ enable-hibernate ACTION="prompt":
   echo "$HIBERNATE_PLYMOUTH" | sudo tee /etc/pm/sleep.d/00_plymouth > /dev/null
   sudo chmod +x /etc/pm/sleep.d/00_plymouth > /dev/null 2>&1
 
-  echo "$HIBERNATION_SETUP_VER" | sudo tee "$HIBERNATION_SETUP_VER_FILE"
+  echo "$HIBERNATION_SETUP_VER" | sudo tee "$HIBERNATION_SETUP_VER_FILE" > /dev/null
   echo 'All done! Please reboot to enable the changes.'
diff --git a/config/recipe.yml b/config/recipe.yml
@@ -12,7 +12,6 @@ image-version: 39 # latest is also supported if you want new updates ASAP
 modules:
   - from-file: common_modules/akmods.yml
   - from-file: common_modules/files.yml
-  - from-file: common_modules/initramfs-setup.yml
   - from-file: common_modules/rpm-ostree.yml
   - from-file: common_modules/bling.yml
   - from-file: common_modules/yafti.yml