Some changes

jitcos · May 10, 2024 · 9be0056 · 9be0056
1 parent 7ded663
commit 9be0056
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 101 deletions.
diff --git a/.github/workflows/release-iso-40.yml b/.github/workflows/release-iso-40.yml
diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml
@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: write
     container:
-      image: fedora:39
+      image: fedora:40
       options: --privileged
     steps:
       - uses: actions/checkout@v4
@@ -23,7 +23,7 @@ jobs:
         with:
           image-name: ${{ github.event.repository.name }}
           installer-repo: releases
-          installer-major-version: 39
+          installer-major-version: 40
           boot-menu-path: boot_menu.yml
       - name: install github CLI
         run: |

diff --git a/README.md b/README.md
@@ -56,14 +56,10 @@ Installed akmods:
 Installed extensions:
 * [Blur My Shell](https://github.com/aunetx/blur-my-shell)
 * [Caffeine](https://github.com/eonpatapon/gnome-shell-extension-caffeine)
-* [Hide Universal Access](https://extensions.gnome.org/extension/2398/hide-universal-access/)
+* [Just Perfect](https://extensions.gnome.org/extension/3843/just-perfection/)
 * [Dash to Panel](https://extensions.gnome.org/extension/1160/dash-to-panel/)
 * [GSConnect](https://extensions.gnome.org/extension/1319/gsconnect/)
 * [AppIndicator Support](https://extensions.gnome.org/extension/615/appindicator-support/)
-* [Start Overlay in Application View](https://github.com/Hexcz/Start-Overlay-in-Application-View-for-Gnome-40-)
-* [WorkspaceSwitcherWrapAround](https://github.com/theychx/WorkspaceSwitcherWrapAround)
-* [disable-workspace-animation](https://github.com/ethnarque/gnome-disable-workspace-animation)
-* [disable-workspace-switcher](https://github.com/cleardevice/gnome-disable-workspace-switcher)
 * [Hibernate Status Button](https://extensions.gnome.org/extension/755/hibernate-status-button/)
 
 Installed flatpaks:
@@ -225,6 +221,3 @@ rpm-ostree rebase ostree-image-signed:docker://ghcr.io/jitcos/cabos:20230403
 Optional config:
 * `ujust configure-grub`: Hide GRUB text output on boot (if you want to make boot process faster [press Shift on boot if you need to see boot menu])
 * `ujust enable-hibernation`: Setup new swapfile and change configurations to allow your computer to hibernate or suspend-to-hibernate
-
-# Recommended Extensions
-* [Grand Theft Focus](https://extensions.gnome.org/extension/5410/grand-theft-focus/) - Just be sure to configure Telegram/WhatsApp properly
diff --git a/boot_menu.yml b/boot_menu.yml
@@ -1,56 +1,43 @@
 ublue_variants:
   - label: jitcos/cabos
-    ks: /kickstart/ublue-os.ks
-    flavors:
-      - label: cabos [GNOME]
-        info: cabos (Default)
-  - label: jitcos/cabos-cinnamon
     ks: /kickstart/ublue-os.ks
     flavors:
       - label: cabos
-        info: cabos [Cinnamon]
+        info: GNOME
+      - label: cabos-cinnamon
+        info: Cinnamon
   - label: jitcos/cabos-nvidia
     ks: /kickstart/ublue-os-nvidia.ks
     flavors:
       - label: cabos-nvidia
-        info: cabos [GNOME] (For NVIDIA GPUs)
-  - label: jitcos/cabos-nvidia
-    ks: /kickstart/ublue-os-nvidia.ks
-    flavors:
+        info: GNOME
       - label: cabos-cinnamon-nvidia
-        info: cabos [Cinnamon] (For NVIDIA GPUs)
+        info: Cinnamon
   - label: jitcos/cabos-asus
-    ks: /kickstart/ublue-os.ks
+    ks: /kickstart/ublue-os-asus.ks
     flavors:
       - label: cabos-asus
-        info: cabos [GNOME] (ASUS Edition)
-  - label: jitcos/cabos-asus
-    ks: /kickstart/ublue-os.ks
-    flavors:
+        info: GNOME
       - label: cabos-cinnamon-asus
-        info: cabos [Cinnamon] (ASUS Edition)
+        info: Cinnamon
   - label: jitcos/cabos-asus-nvidia
     ks: /kickstart/ublue-os-nvidia.ks
     flavors:
       - label: cabos-asus-nvidia
-        info: cabos [GNOME] (ASUS Edition for NVIDIA GPUs)
-  - label: jitcos/cabos-cinnamon-asus-nvidia
-    ks: /kickstart/ublue-os-nvidia.ks
-    flavors:
+        info: GNOME
       - label: cabos-cinnamon-asus-nvidia
-        info: cabos [Cinnamon] (ASUS Edition for NVIDIA GPUs)
+        info: Cinnamon
   - label: jitcos/cabos-surface
-    ks: /kickstart/ublue-os.ks
-    flavors:
-      - label: cabos-surface
-        info: cabos [GNOME] (Surface Edition)
-  - label: jitcos/cabos-cinnamon-surface
-    ks: /kickstart/ublue-os.ks
+    ks: /kickstart/ublue-os-surface.ks
     flavors:
       - label: cabos-surface
-        info: cabos [Cinnamon] (Surface Edition)
-  - label: jitcos/cabos-cinnamon-surface-nvidia
+        info: GNOME
+      - label: cabos-cinnamon-surface
+        info: Cinnamon
+  - label: jitcos/cabos-surface-nvidia
     ks: /kickstart/ublue-os-nvidia.ks
     flavors:
+      - label: cabos-surface-nvidia
+        info: GNOME
       - label: cabos-cinnamon-surface-nvidia
-        info: cabos [Cinnamon] (Surface Edition for NVIDIA GPUs)
+        info: Cinnamon
diff --git a/config/files/etc/zshrc b/config/files/etc/zshrc
@@ -0,0 +1,96 @@
+if [ -n "$CONTAINER_ID" ]; then
+  # Inside of a distrobox container
+  export XDG_CONFIG_HOME="$HOME/.config/contexts/$CONTAINER_ID"
+  export NVM_DIR="$HOME/.config/contexts/$CONTAINER_ID/.nvm"
+  export PYENV_ROOT="$HOME/.config/contexts/$CONTAINER_ID/.pyenv"
+
+  SETUP_DONE="$XDG_CONFIG_HOME/setup-done"
+
+  if ! [ -f "$SETUP_DONE" ]; then
+    if [ -n "$SETUP_DEV_TOOLS" ]; then
+      echo 'Running initial setup...'
+
+      # Install oh-my-zsh
+      git clone https://github.com/ohmyzsh/ohmyzsh.git "$XDG_CONFIG_HOME/oh-my-zsh"
+      cp $XDG_CONFIG_HOME/oh-my-zsh/templates/zshrc.zsh-template "$XDG_CONFIG_HOME/.zshrc"
+      sed -i 's/export ZSH=\$HOME\/.oh-my-zsh/export ZSH=\$XDG_CONFIG_HOME\/oh-my-zsh/' "$XDG_CONFIG_HOME/.zshrc"
+
+      # Spaceship theme
+      ZSH_CUSTOM="$XDG_CONFIG_HOME/oh-my-zsh/custom"
+      git clone https://github.com/denysdovhan/spaceship-prompt.git "$ZSH_CUSTOM/themes/spaceship-prompt" --depth=1
+      ln -s "$ZSH_CUSTOM/themes/spaceship-prompt/spaceship.zsh-theme" "$ZSH_CUSTOM/themes/spaceship.zsh-theme"
+      sed -i 's/^ZSH_THEME="robbyrussell"/ZSH_THEME="spaceship"/' "$XDG_CONFIG_HOME/.zshrc"
+
+      # nvm
+      nvm_setup='[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+      [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'
+
+      echo "$nvm_setup" >> "$XDG_CONFIG_HOME/.zshrc"
+
+      git clone https://github.com/nvm-sh/nvm.git "$NVM_DIR"
+      bash -c 'cd "$NVM_DIR" && git checkout `git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1)`'
+      \. "$NVM_DIR/nvm.sh"
+
+      nvm install 8 ; nvm install 12
+      nvm install 14 ; npm install -g npm@7
+      nvm install 18 ; nvm alias default 18
+
+      # pyenv
+      git clone https://github.com/pyenv/pyenv.git "$PYENV_ROOT"
+      git clone https://github.com/pyenv/pyenv-virtualenv.git "$PYENV_ROOT/plugins/pyenv-virtualenv"
+
+      echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> "$XDG_CONFIG_HOME/.zshrc"
+      echo 'eval "$(pyenv init -)"' >> "$XDG_CONFIG_HOME/.zshrc"
+
+      "$PYENV_ROOT/bin/pyenv" install 3.10.13; "$PYENV_ROOT/bin/pyenv" install 2.7.18
+      "$PYENV_ROOT/bin/pyenv" virtualenv 2.7.18 local2
+      "$PYENV_ROOT/bin/pyenv" global 3.10.13 local2
+
+      echo 1 > "$SETUP_DONE"
+    fi
+  fi
+  unset SETUP_DONE
+
+  if [ -f "$XDG_CONFIG_HOME/.zshrc" ]; then
+    source "$XDG_CONFIG_HOME/.zshrc"
+  fi
+
+  if [ -d "$XDG_CONFIG_HOME/config.d/" ]; then
+    files=("$XDG_CONFIG_HOME/config.d/"*.zsh)
+    if [ ${#files[@]} -gt 0 ]; then
+      for conf in "${files[@]}"; do
+        source "$conf"
+      done
+      unset conf
+    fi
+    unset files
+  fi
+else
+  # localhost
+  if [ -f "$HOME/.config/contexts/localhost/.zshrc" ]; then
+    source "$HOME/.config/contexts/localhost/.zshrc"
+  fi
+
+  if [ -d "$HOME/.config/contexts/localhost/config.d/" ]; then
+    files=("$HOME/.config/contexts/localhost/config.d/"*.zsh)
+    if [ ${#files[@]} -gt 0 ]; then
+      for conf in "${files[@]}"; do
+        source "$conf"
+      done
+      unset conf
+    fi
+    unset files
+  fi
+fi
+
+# Load seperated config files
+if [ -d "$HOME/.config/contexts/config.d/" ]; then
+  files=("$HOME/.config/contexts/config.d/"*.zsh)
+  if [ ${#files[@]} -gt 0 ]; then
+    for conf in "${files[@]}"; do
+      source "$conf"
+    done
+    unset conf
+  fi
+  unset files
+fi
diff --git a/...ema-overrides/zz01-cabos.gschema.override → ...ema-overrides/zz99-cabos.gschema.override b/...ema-overrides/zz01-cabos.gschema.override → ...ema-overrides/zz99-cabos.gschema.override
@@ -71,6 +71,15 @@ enabled=false
 hide-overview-on-startup=true
 isolate-workspaces=true
 
+[org.gnome.shell.extensions.just-perfection]
+workspace-wrap-around=true
+workspace-popup=false
+window-demands-attention-focus=true
+world-clock=false
+keyboard-layout=false
+accessibility-menu=false
+startup-status=0
+
 [org.gnome.shell.app-switcher]
 current-workspace-only=true
 

diff --git a/recipes/common_modules/gnome-extensions/39.yml b/recipes/common_modules/gnome-extensions/39.yml
@@ -1,14 +1,9 @@
 type: gnome-extensions
 install:
-  - workspace-switch-wraparoundtheychx.org.v11
-  - hide-universal-accessakiirui.github.io.v16
-  - disable-workspace-animationethnarque.v5
-  - disable-workspace-switcher-overlaycleardevice.v2
-  - start-overlay-in-application-viewHex_cz.v6
+  - just-perfection-desktopjust-perfection.v28
   - hibernate-statusdromi.v38
   - caffeinepatapon.info.v54
   - gsconnectandyholmes.github.io.v56
   - dash-to-paneljderose9.github.com.v60
   - blur-my-shellaunetx.v58
-  - appindicatorsupportrgcjonas.gmail.com.v58
-  - grand-theft-focuszalckos.github.com.v6
+  - appindicatorsupportrgcjonas.gmail.com.v58
diff --git a/recipes/common_modules/gnome-extensions/40.yml b/recipes/common_modules/gnome-extensions/40.yml
@@ -1,14 +1,9 @@
 type: gnome-extensions
 install:
-  # - workspace-switch-wraparoundtheychx.org.v11
-  - hide-universal-accessakiirui.github.io.v17
-  - disable-workspace-animationethnarque.v5
-  - disable-workspace-switcher-overlaycleardevice.v2
-  # - start-overlay-in-application-viewHex_cz.v6
+  - just-perfection-desktopjust-perfection.v28
   - hibernate-statusdromi.v40
   - caffeinepatapon.info.v54
   - gsconnectandyholmes.github.io.v57
   - dash-to-paneljderose9.github.com.v62
   - blur-my-shellaunetx.v61
-  - appindicatorsupportrgcjonas.gmail.com.v58
-  - grand-theft-focuszalckos.github.com.v6
+  - appindicatorsupportrgcjonas.gmail.com.v58