build: carve out common recipe bits

yacoob · Nov 28, 2024 · 44e2533 · 44e2533
1 parent 5d380d3
commit 44e2533
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 87 deletions.
diff --git a/files/scripts/os-release-yaucore.sh b/files/scripts/os-release-yaucore.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+sed -i '
+/^PRETTY_NAME=/s/uCore/yaucore/
+' /usr/lib/os-release
diff --git a/files/scripts/os-release.sh → files/scripts/os-release-yaurora.sh b/files/scripts/os-release.sh → files/scripts/os-release-yaurora.sh
diff --git a/recipes/base/chezmoi.yaml b/recipes/base/chezmoi.yaml
@@ -0,0 +1,5 @@
+# set up chezmoi
+type: chezmoi
+repository: https://github.com/yacoob/dotfiles
+all-users: true
+file-conflict-policy: skip
diff --git a/recipes/base/files.yaml b/recipes/base/files.yaml
@@ -0,0 +1,5 @@
+# copy contents of files/system/* directly to the target
+type: files
+files:
+  - source: system
+    destination: /
diff --git a/recipes/base/rpm-ostree.yaml b/recipes/base/rpm-ostree.yaml
@@ -0,0 +1,31 @@
+# add repositories, install RPM packages
+type: rpm-ostree
+repos:
+  - https://copr.fedorainfracloud.org/coprs/atim/bottom/repo/fedora-%OS_VERSION%/atim-bottom-fedora-%OS_VERSION%.repo
+  - https://copr.fedorainfracloud.org/coprs/atim/lazygit/repo/fedora-%OS_VERSION%/atim-lazygit-fedora-%OS_VERSION%.repo
+  - https://copr.fedorainfracloud.org/coprs/faramirza/gdu/repo/fedora-%OS_VERSION%/faramirza-gdu-fedora-%OS_VERSION%.repo
+  - https://repository.mullvad.net/rpm/stable/mullvad.repo
+install:
+  - autorestic
+  - bat
+  - difftastic
+  - direnv
+  - fd-find
+  - gh
+  - git-lfs
+  - lnav
+  - ltrace
+  - neovim
+  - ripgrep
+  - strace
+  - syncthing
+  - tealdeer
+  - ugrep
+  - yq
+  # third party pkgs
+  - bottom
+  - gdu
+  - lazygit
+  - mullvad-vpn
+optfix:
+  - Mullvad VPN
diff --git a/recipes/base/script.yaml b/recipes/base/script.yaml
@@ -0,0 +1,4 @@
+# run shell scripts
+type: script
+scripts:
+  - eget.sh
diff --git a/recipes/yaucore.yaml b/recipes/yaucore.yaml
@@ -7,55 +7,15 @@ image-version: stable
 # NOTE: the order of the modules in this file translates to the order of RUN lines in generated Containerfile.
 #       Which means, keep the least often modified modules at the top, so the whole thing caches better.
 modules:
-  # set up chezmoi
-  - type: chezmoi
-    repository: https://github.com/yacoob/dotfiles
-    all-users: true
-    file-conflict-policy: skip
-
-  # copy contents of files/system/* directly to the target
-  - type: files
-    files:
-      - source: system
-        destination: /
+  - from-file: base/chezmoi.yaml
+  - from-file: base/files.yaml
+  - from-file: base/script.yaml
+  - from-file: base/rpm-ostree.yaml
 
   # run shell scripts
   - type: script
     scripts:
-      - eget.sh
-
-  # add repositories, install RPM packages
-  - type: rpm-ostree
-    repos:
-      - https://copr.fedorainfracloud.org/coprs/atim/bottom/repo/fedora-%OS_VERSION%/atim-bottom-fedora-%OS_VERSION%.repo
-      - https://copr.fedorainfracloud.org/coprs/atim/lazygit/repo/fedora-%OS_VERSION%/atim-lazygit-fedora-%OS_VERSION%.repo
-      - https://copr.fedorainfracloud.org/coprs/faramirza/gdu/repo/fedora-%OS_VERSION%/faramirza-gdu-fedora-%OS_VERSION%.repo
-      - https://repository.mullvad.net/rpm/stable/mullvad.repo
-    install:
-      - ansible
-      - autorestic
-      - bat
-      - difftastic
-      - direnv
-      - fd-find
-      - gh
-      - git-lfs
-      - lnav
-      - ltrace
-      - neovim
-      - ripgrep
-      - strace
-      - syncthing
-      - tealdeer
-      - ugrep
-      - yq
-      # third party pkgs
-      - bottom
-      - gdu
-      - lazygit
-      - mullvad-vpn
-    optfix:
-      - Mullvad VPN
+      - os-release-yaucore.sh
 
   # sign the image
   - type: signing
diff --git a/recipes/yaurora.yaml b/recipes/yaurora.yaml
@@ -7,17 +7,15 @@ image-version: stable
 # NOTE: the order of the modules in this file translates to the order of RUN lines in generated Containerfile.
 #       Which means, keep the least often modified modules at the top, so the whole thing caches better.
 modules:
-  # set up chezmoi
-  - type: chezmoi
-    repository: https://github.com/yacoob/dotfiles
-    all-users: true
-    file-conflict-policy: skip
+  - from-file: base/chezmoi.yaml
+  - from-file: base/files.yaml
+  - from-file: base/script.yaml
+  - from-file: base/rpm-ostree.yaml
 
-  # copy contents of files/system/* directly to the target
-  - type: files
-    files:
-      - source: system
-        destination: /
+  # run shell scripts
+  - type: script
+    scripts:
+      - os-release-yaurora.sh
 
   # install flatpaks
   - type: default-flatpaks
@@ -41,49 +39,17 @@ modules:
         - org.kde.kcalc
         - org.mozilla.Thunderbird
 
-  # run shell scripts
-  - type: script
-    scripts:
-      - eget.sh
-      - os-release.sh
-
   # add repositories, install RPM packages
   - type: rpm-ostree
     repos:
-      - https://copr.fedorainfracloud.org/coprs/atim/bottom/repo/fedora-%OS_VERSION%/atim-bottom-fedora-%OS_VERSION%.repo
-      - https://copr.fedorainfracloud.org/coprs/atim/lazygit/repo/fedora-%OS_VERSION%/atim-lazygit-fedora-%OS_VERSION%.repo
-      - https://copr.fedorainfracloud.org/coprs/faramirza/gdu/repo/fedora-%OS_VERSION%/faramirza-gdu-fedora-%OS_VERSION%.repo
       - https://copr.fedorainfracloud.org/coprs/mdwalters/neovide/repo/fedora-%OS_VERSION%/mdwalters-neovide-fedora-%OS_VERSION%.repo
-      - https://repository.mullvad.net/rpm/stable/mullvad.repo
     install:
-      - autorestic
-      - bat
-      - difftastic
-      - direnv
       - fcitx5
       - fcitx5-mozc
-      - fd-find
-      - gh
-      - git-lfs
       - kcm-fcitx5
-      - lnav
-      - ltrace
-      - neovim
-      - ripgrep
-      - strace
-      - syncthing
-      - tealdeer
       - trash-cli
-      - ugrep
-      - yq
       # third party pkgs
-      - bottom
-      - gdu
-      - lazygit
-      - mullvad-vpn
       - neovide
-    optfix:
-      - Mullvad VPN
 
   # sign the image
   - type: signing