Add Niri edition

Update to 1.2.1

See merge request tile-os/iso-builder!2

.gitignore

@@ -1,3 +1,4 @@
 tmp/*
 builds/*
 artifacts/*
+build

README.md

@@ -10,16 +10,14 @@ Clone this project & cd into it:
 
     git clone https://gitlab.com/tile-os/iso-builder && cd iso-builder
 
-Configure the channel in the etc/terraform.conf (`dev`, `stable`).
+See `./build --help` for available options
-Configure desktop by export `DESKTOP` variable. May be a `river` or `sway`. 
 
-Run the build for Sway:
+Run the build for TileOS Sway stable edition:
 
     docker run --privileged -i -v /proc:/proc \
         -v ${PWD}:/working_dir \
         -w /working_dir \
-        -e DESKTOP=sway \
         debian:latest \
-        /bin/bash -s etc/terraform.conf < build.sh
+        ./build --desktop sway --release stable
 
-When done, your image will be in the `builds` folder.
+When done, your image will be in the `builds/amd64` folder.

build

@@ -0,0 +1,176 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Where we are
+BASE_DIR="$PWD"
+
+# Build directory
+TMP_DIR="$BASE_DIR/tmp"
+
+# Output directory
+BUILDS_DIR="$BASE_DIR/builds"
+
+# Get config
+CONFIG_FILE="etc/options"
+source "$BASE_DIR"/"$CONFIG_FILE"
+
+# TileOS edition
+DESKTOP=
+
+# Repo channel
+CHANNEL=
+
+# Release variant
+RELEASE=
+
+# Needs for lb config script
+export DESKTOP CHANNEL
+
+# check for root permissions
+if [[ "$(id -u)" != 0 ]]; then
+  echo "E: Requires root permissions" > /dev/stderr
+  exit 1
+fi
+
+# List of available options
+show_help() {
+    echo "Using: $0 [OPTIONS]"
+    echo
+    echo "Options:"
+    echo "  --desktop <desktop_name>     Desktop variant (sway, river, qtile)"
+    echo "  --release <release_variant>  Release variant (stable, beta, testing)"
+    echo "  --help                       Shows this message"
+    echo
+    exit 0
+}
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --desktop)
+            DESKTOP="$2"
+            shift 2
+            ;;
+        --release)
+            RELEASE="$2"
+            shift 2
+            ;;
+        --help)
+            show_help
+            ;;
+        *) 
+            echo "Unknown option: $1"
+            show_help
+            ;;
+    esac
+done
+
+case "$DESKTOP" in
+  sway|river|qtile|miracle|niri)
+    ;;
+  *)
+    echo "Error: Invalid value for --desktop!"
+    show_help
+    ;;
+esac
+
+case "$RELEASE" in
+  stable|beta|testing)
+    ;;
+  *)
+    echo "Error; Invalid value for --release!"
+    show_help
+    ;;
+esac
+
+if [ "$RELEASE" == stable ]; then
+  CHANNEL="stable"
+elif [ "$RELEASE" == beta ]; then
+  # Beta releases use stable repo channel
+  CHANNEL="stable"
+elif [ "$RELEASE" == testing ]; then
+  CHANNEL="testing"
+fi
+
+# Check required dependencies (on Debian or Ubuntu)
+check_deps() {
+  apt update -y && apt install -y lsb-release
+
+  dist="$(lsb_release -i -s)"
+
+  if [ "$dist" == "Debian" ]; then
+    apt install -y binutils patch zstd live-build
+    apt install -y ./debs/debian-keyring*.deb
+  else
+    apt install -y binutils patch zstd debootstrap
+    apt install -y ./debs/*.deb
+  fi
+}
+
+# Cleanup build environment
+cleanup() {
+    lb clean
+    rm -rf "$TMP_DIR"
+}
+
+# live-build ISO building
+build() {
+    
+      echo -e "
+#------------------#
+# START BUILD #
+#------------------#
+"
+
+    mkdir -p "$TMP_DIR/$ARCH"
+    cd "$TMP_DIR/$ARCH" || exit
+
+    # remove old configs and copy over new
+    rm -rf config auto
+    cp -r "$BASE_DIR"/etc/"$DESKTOP"/* .
+    # Make sure conffile specified as arg has correct name
+    cp -f "$BASE_DIR"/"$CONFIG_FILE" options
+
+    # Symlink chosen package lists to where live-build will find them
+    ln -s "package-lists.$PACKAGE_LISTS_SUFFIX" "config/package-lists"
+
+    # Configure build
+    lb config
+
+    # Start build
+    lb build
+}
+
+# Make the final ISO
+make_iso() {
+
+      echo -e "
+#---------------------------#
+# MOVE OUTPUT TO BUILDS DIR #
+#---------------------------#
+"
+    YYYYMMDD="$(date +%Y%m%d%H%M)"
+    OUTPUT_DIR="$BUILDS_DIR/$ARCH"
+    mkdir -p "$OUTPUT_DIR"
+
+    if [ "$RELEASE" == testing ]; then
+      FNAME="tileos-$DESKTOP-$VERSION-$RELEASE-$YYYYMMDD-$OUTPUT_SUFFIX-$ARCH"
+    elif [ "$RELEASE" == beta ]; then
+      FNAME="tileos-$DESKTOP-$VERSION-$RELEASE-$OUTPUT_SUFFIX-$ARCH"
+    elif [ "$RELEASE" == stable ]; then
+      FNAME="tileos-$DESKTOP-$VERSION-$OUTPUT_SUFFIX-$ARCH"
+    fi
+
+    mv "$TMP_DIR/$ARCH/live-image-$ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
+    md5sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.md5.txt"
+    sha256sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.sha256.txt"
+}
+
+# remove old builds before creating new ones
+rm -rf "$BUILDS_DIR"
+
+check_deps
+cleanup
+build
+make_iso
+cleanup

build.sh

@@ -1,115 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# check for root permissions
-if [[ "$(id -u)" != 0 ]]; then
-  echo "E: Requires root permissions" > /dev/stderr
-  exit 1
-fi
-
-# get config
-if [ -n "$1" ]; then
-  CONFIG_FILE="$1"
-else
-  CONFIG_FILE="etc/terraform.conf"
-fi
-
-BASE_DIR="$PWD"
-TMP_DIR="$BASE_DIR/tmp"
-BUILDS_DIR="$BASE_DIR/builds"
-source "$BASE_DIR"/"$CONFIG_FILE"
-
-echo -e "
-#----------------------#
-# INSTALL DEPENDENCIES #
-#----------------------#
-"
-
-# Use system live-build if running on Debian
-apt-get update && apt-get install -y lsb-release
-
-dist="$(lsb_release -i -s)"
-
-if [ "$dist" == "Debian" ]; then
-  apt-get install -y binutils patch zstd live-build
-  dpkg -i ./debs/debian-keyring*.deb
-else
-  apt-get install -y binutils patch zstd debootstrap
-  dpkg -i ./debs/*.deb
-fi
-# Increase number of blocks for creating efi.img.
-# This prevents error with "Disk full" on the lb binary_grub-efi stage
-patch -f -d /usr/lib/live/build/ < increase_number_of_blocks.patch
-
-build () {
-  BUILD_ARCH="$1"
-
-  if [ -d "$TMP_DIR" ]; then
-    rm -rf "$TMP_DIR"
-    mkdir -p "$TMP_DIR/$BUILD_ARCH"
-  else
-    mkdir -p "$TMP_DIR/$BUILD_ARCH"
-  fi
-
-  cd "$TMP_DIR/$BUILD_ARCH" || exit
-
-  # remove old configs and copy over new
-  rm -rf config auto
-  cp -r "$BASE_DIR"/etc/$DESKTOP/* .
-  # Make sure conffile specified as arg has correct name
-  cp -f "$BASE_DIR"/"$CONFIG_FILE" terraform.conf
-
-  # Symlink chosen package lists to where live-build will find them
-  ln -s "package-lists.$PACKAGE_LISTS_SUFFIX" "config/package-lists"
-
-  echo -e "
-#------------------#
-# LIVE-BUILD CLEAN #
-#------------------#
-"
-  lb clean
-
-  echo -e "
-#-------------------#
-# LIVE-BUILD CONFIG #
-#-------------------#
-"
-  lb config
-
-  echo -e "
-#------------------#
-# LIVE-BUILD BUILD #
-#------------------#
-"
-  lb build
-
-  echo -e "
-#---------------------------#
-# MOVE OUTPUT TO BUILDS DIR #
-#---------------------------#
-"
-
-    YYYYMMDD="$(date +%Y%m%d%H%M)"
-    OUTPUT_DIR="$BUILDS_DIR/$BUILD_ARCH"
-    mkdir -p "$OUTPUT_DIR"
-    if [ "$CHANNEL" == testing ]; then
-      FNAME="tileos-$DESKTOP-$VERSION-$CHANNEL-$YYYYMMDD-$OUTPUT_SUFFIX-$ARCH"
-    elif [ "$CHANNEL" == stable ] && [ "$BETA" == true ]; then
-      FNAME="tileos-$DESKTOP-$VERSION-beta-$OUTPUT_SUFFIX-$ARCH"
-    elif [ "$CHANNEL" == stable ] && [ "$BETA" == false ]; then
-      FNAME="tileos-$DESKTOP-$VERSION-$OUTPUT_SUFFIX-$ARCH"
-    else
-      echo -e "Error: invalid channel name!"
-    fi
-    mv "$TMP_DIR/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
-
-    md5sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.md5.txt"
-    sha256sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.sha256.txt"
-}
-
-# remove old builds before creating new ones
-rm -rf "$BUILDS_DIR"
-
-build "$ARCH"
-

etc/miracle/auto/clean

@@ -0,0 +1,5 @@
+#! /bin/sh
+set -e
+
+export LB_LINUX_FLAVOURS="none"
+lb clean noauto "$@"

etc/miracle/auto/config

@@ -2,8 +2,10 @@
 
 set -e
 
-. ./terraform.conf
+# Include common options
+. ./options
 
+# live-build configuration
 lb config noauto \
     --architectures "$ARCH" \
     --mode debian \
@@ -11,12 +13,12 @@ lb config noauto \
     --parent-distribution "$BASECODENAME" \
     --archive-areas "main contrib non-free non-free-firmware" \
     --parent-archive-areas "main contrib non-free non-free-firmware" \
-    --linux-packages linux-image-lts linux-headers-lts \
+    --linux-packages linux-image linux-headers \
     --bootappend-live "boot=live username=tileos hostname=tileos quiet splash" \
     --mirror-bootstrap "$MIRROR_URL" \
     --parent-mirror-bootstrap "$MIRROR_URL" \
-    --mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --mirror-chroot-security "$MIRROR_SECURITY" \
-    --parent-mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --parent-mirror-chroot-security "$MIRROR_SECURITY" \
     --apt-source-archives false \
     --parent-mirror-binary "$MIRROR_URL" \
     --keyring-packages "debian-keyring tileos-archive-keyring" \
@@ -36,7 +38,7 @@ lb config noauto \
 
 # replace channel and suite
 sed -i "s/@CHANNEL/$CHANNEL/" config/archives/*.list*
-sed -i "s/@BASECODENAME/$BASECODENAME/" config/archives/*.list*
+sed -i "s/@CODENAME/$CODENAME/" config/archives/*.list*
 
 # replace desktop
 sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_install

etc/miracle/config/archives/mesa.list

@@ -1 +1 @@
-deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main
+# deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main

etc/miracle/config/archives/mozilla.key

@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyUMPpq
+/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIEdiG/
+e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcmjwlD
+T9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54t+Z+
+ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIzivGJpW
+QdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAHNVEFydGlmYWN0IFJlZ2lz
+dHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBvc2l0
+b3J5LXNpZ25lckBnb29nbGUuY29tPsLAjgQTAQoAOBYhBDW6oLM+nrOW9ZyoOMC6
+XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6XObc
+YxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wWqgVC
+7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFOMdLf
+ILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY89IDq
+fHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EPD02G
+C3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu4fH8
+XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU=
+=QnvN
+-----END PGP PUBLIC KEY BLOCK-----

etc/miracle/config/archives/mozilla.list

@@ -0,0 +1 @@
+deb https://packages.mozilla.org/apt mozilla main

etc/miracle/config/archives/tileos.list

@@ -1 +1 @@
-deb https://repo.tile-os.com/@CHANNEL/ @BASECODENAME main
+deb https://repo.tile-os.com/@CHANNEL/ @CODENAME main

etc/miracle/config/archives/vscode.key

@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
-LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
-7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
-OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
-H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
-M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
-ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
-AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
-/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
-MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
-7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
-KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
-XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
-NdCFTW7wY0Fb1fWJ+/KTsC4=
-=J6gs
------END PGP PUBLIC KEY BLOCK-----

etc/miracle/config/archives/vscode.list

@@ -1,3 +0,0 @@
-### THIS FILE IS AUTOMATICALLY CONFIGURED ###
-# You may comment out this entry, but any other modifications may be lost.
-deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main

etc/miracle/config/includes.chroot/etc/greetd/config.toml

@@ -2,9 +2,9 @@
 vt = 7
 
 [default_session]
-command = "tuigreet --remember --time --issue --asterisks --cmd miracle-wm"
+command = "tuigreet --remember --time --issue --asterisks --cmd miracle-wm-session"
 user = "_greetd"
  
 [initial_session]
-command = "miracle-wm"
+command = "miracle-wm-session"
 user = "tileos"

etc/niri/auto/clean

@@ -0,0 +1,5 @@
+#! /bin/sh
+set -e
+
+export LB_LINUX_FLAVOURS="none"
+lb clean noauto "$@"

etc/niri/auto/config

@@ -2,8 +2,10 @@
 
 set -e
 
-. ./terraform.conf
+# Include common options
+. ./options
 
+# live-build configuration
 lb config noauto \
     --architectures "$ARCH" \
     --mode debian \
@@ -11,12 +13,12 @@ lb config noauto \
     --parent-distribution "$BASECODENAME" \
     --archive-areas "main contrib non-free non-free-firmware" \
     --parent-archive-areas "main contrib non-free non-free-firmware" \
-    --linux-packages linux-image-lts linux-headers-lts \
+    --linux-packages linux-image linux-headers \
     --bootappend-live "boot=live username=tileos hostname=tileos quiet splash" \
     --mirror-bootstrap "$MIRROR_URL" \
     --parent-mirror-bootstrap "$MIRROR_URL" \
-    --mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --mirror-chroot-security "$MIRROR_SECURITY" \
-    --parent-mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --parent-mirror-chroot-security "$MIRROR_SECURITY" \
     --apt-source-archives false \
     --parent-mirror-binary "$MIRROR_URL" \
     --keyring-packages "debian-keyring tileos-archive-keyring" \
@@ -36,7 +38,7 @@ lb config noauto \
 
 # replace channel and suite
 sed -i "s/@CHANNEL/$CHANNEL/" config/archives/*.list*
-sed -i "s/@BASECODENAME/$BASECODENAME/" config/archives/*.list*
+sed -i "s/@CODENAME/$CODENAME/" config/archives/*.list*
 
 # replace desktop
 sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_install

etc/niri/config/archives/mesa.list

@@ -0,0 +1 @@
+# deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main

etc/niri/config/archives/mozilla.key

@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyUMPpq
+/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIEdiG/
+e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcmjwlD
+T9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54t+Z+
+ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIzivGJpW
+QdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAHNVEFydGlmYWN0IFJlZ2lz
+dHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBvc2l0
+b3J5LXNpZ25lckBnb29nbGUuY29tPsLAjgQTAQoAOBYhBDW6oLM+nrOW9ZyoOMC6
+XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6XObc
+YxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wWqgVC
+7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFOMdLf
+ILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY89IDq
+fHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EPD02G
+C3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu4fH8
+XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU=
+=QnvN
+-----END PGP PUBLIC KEY BLOCK-----

etc/niri/config/archives/mozilla.list

@@ -0,0 +1 @@
+deb https://packages.mozilla.org/apt mozilla main

etc/niri/config/archives/tileos.list

@@ -0,0 +1 @@
+deb https://repo.tile-os.com/@CHANNEL/ @CODENAME main

etc/niri/config/hooks/live/000-remove-blacklisted-packages.chroot

@@ -4,6 +4,8 @@ echo "P: Begin executing remove-blacklisted-packages chroot hook..."
 
 apt-get autoremove --purge -f -q -y \
 	foot \
+	gdm \
+	gnome-shell \
 	imagemagick \
 	imagemagick-* \
 	lxqt-qtplugin \

etc/niri/config/includes.chroot/etc/greetd/config.toml

@@ -2,9 +2,9 @@
 vt = 7
 
 [default_session]
-command = "tuigreet --remember --time --issue --asterisks --cmd start-sway"
+command = "tuigreet --remember --time --issue --asterisks --cmd niri-session"
 user = "_greetd"
  
 [initial_session]
-command = "start-sway"
+command = "niri-session"
 user = "tileos"

etc/options

@@ -2,23 +2,16 @@
 ARCH="amd64"
 
 # base codename
-BASECODENAME="bookworm"
+BASECODENAME="trixie"
 
 # base version
-BASEVERSION="12"
+BASEVERSION="13"
 
 # distribution codename
-CODENAME="t-rex"
+CODENAME="sauropod"
 
 # distribution version
-VERSION="1.2.1"
+VERSION="2.0"
-
-# distribution channel
-CHANNEL="stable"
-#CHANNEL="testing"
-
-# Beta build
-BETA="false"
 
 # distribution name
 NAME="TileOS"
@@ -26,6 +19,9 @@ NAME="TileOS"
 # mirror to fetch packages from
 MIRROR_URL="http://deb.debian.org/debian/"
 
+# debian-security mirror
+MIRROR_SECURITY="http://deb.debian.org/debian-security/"
+
 # suffix for generated .iso files
 OUTPUT_SUFFIX="desktop"
 

etc/qtile/auto/clean

@@ -0,0 +1,5 @@
+#! /bin/sh
+set -e
+
+export LB_LINUX_FLAVOURS="none"
+lb clean noauto "$@"

etc/qtile/auto/config

@@ -2,8 +2,10 @@
 
 set -e
 
-. ./terraform.conf
+# Include common options
+. ./options
 
+# live-build configuration
 lb config noauto \
     --architectures "$ARCH" \
     --mode debian \
@@ -11,12 +13,12 @@ lb config noauto \
     --parent-distribution "$BASECODENAME" \
     --archive-areas "main contrib non-free non-free-firmware" \
     --parent-archive-areas "main contrib non-free non-free-firmware" \
-    --linux-packages linux-image-lts linux-headers-lts \
+    --linux-packages linux-image linux-headers \
     --bootappend-live "boot=live username=tileos hostname=tileos quiet splash" \
     --mirror-bootstrap "$MIRROR_URL" \
     --parent-mirror-bootstrap "$MIRROR_URL" \
-    --mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --mirror-chroot-security "$MIRROR_SECURITY" \
-    --parent-mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --parent-mirror-chroot-security "$MIRROR_SECURITY" \
     --apt-source-archives false \
     --parent-mirror-binary "$MIRROR_URL" \
     --keyring-packages "debian-keyring tileos-archive-keyring" \
@@ -36,7 +38,7 @@ lb config noauto \
 
 # replace channel and suite
 sed -i "s/@CHANNEL/$CHANNEL/" config/archives/*.list*
-sed -i "s/@BASECODENAME/$BASECODENAME/" config/archives/*.list*
+sed -i "s/@CODENAME/$CODENAME/" config/archives/*.list*
 
 # replace desktop
 sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_install

etc/qtile/config/archives/mesa.list

@@ -1 +1 @@
-deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main
+# deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main

etc/qtile/config/archives/mozilla.key

@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyUMPpq
+/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIEdiG/
+e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcmjwlD
+T9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54t+Z+
+ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIzivGJpW
+QdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAHNVEFydGlmYWN0IFJlZ2lz
+dHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBvc2l0
+b3J5LXNpZ25lckBnb29nbGUuY29tPsLAjgQTAQoAOBYhBDW6oLM+nrOW9ZyoOMC6
+XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6XObc
+YxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wWqgVC
+7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFOMdLf
+ILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY89IDq
+fHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EPD02G
+C3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu4fH8
+XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU=
+=QnvN
+-----END PGP PUBLIC KEY BLOCK-----

etc/qtile/config/archives/mozilla.list

@@ -0,0 +1 @@
+deb https://packages.mozilla.org/apt mozilla main

etc/qtile/config/archives/tileos.list

@@ -1 +1 @@
-deb https://repo.tile-os.com/@CHANNEL/ @BASECODENAME main
+deb https://repo.tile-os.com/@CHANNEL/ @CODENAME main

etc/qtile/config/archives/vscode.key

@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
-LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
-7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
-OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
-H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
-M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
-ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
-AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
-/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
-MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
-7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
-KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
-XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
-NdCFTW7wY0Fb1fWJ+/KTsC4=
-=J6gs
------END PGP PUBLIC KEY BLOCK-----

etc/qtile/config/archives/vscode.list

@@ -1,3 +0,0 @@
-### THIS FILE IS AUTOMATICALLY CONFIGURED ###
-# You may comment out this entry, but any other modifications may be lost.
-deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main

etc/qtile/config/hooks/live/000-remove-blacklisted-packages.chroot

@@ -9,4 +9,5 @@ apt-get autoremove --purge -f -q -y \
 	lxqt-qtplugin \
 	lxqt-notificationd \
 	systemsettings \
+	xinit \
 	zutty

etc/river/auto/clean

@@ -0,0 +1,5 @@
+#! /bin/sh
+set -e
+
+export LB_LINUX_FLAVOURS="none"
+lb clean noauto "$@"

etc/river/auto/config

@@ -2,8 +2,10 @@
 
 set -e
 
-. ./terraform.conf
+# Include common options
+. ./options
 
+# live-build configuration
 lb config noauto \
     --architectures "$ARCH" \
     --mode debian \
@@ -11,15 +13,15 @@ lb config noauto \
     --parent-distribution "$BASECODENAME" \
     --archive-areas "main contrib non-free non-free-firmware" \
     --parent-archive-areas "main contrib non-free non-free-firmware" \
-    --linux-packages linux-image-lts linux-headers-lts \
+    --linux-packages linux-image linux-headers \
     --bootappend-live "boot=live username=tileos hostname=tileos quiet splash" \
     --mirror-bootstrap "$MIRROR_URL" \
     --parent-mirror-bootstrap "$MIRROR_URL" \
-    --mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --mirror-chroot-security "$MIRROR_SECURITY" \
-    --parent-mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --parent-mirror-chroot-security "$MIRROR_SECURITY" \
     --apt-source-archives false \
     --parent-mirror-binary "$MIRROR_URL" \
-    --keyring-packages debian-keyring \
+    --keyring-packages "debian-keyring tileos-archive-keyring" \
     --apt-options "--yes --option Acquire::Retries=5 --option Acquire::http::Timeout=100" \
     --cache-packages false \
     --checksums md5 \
@@ -27,7 +29,7 @@ lb config noauto \
     --binary-images iso-hybrid \
     --iso-application "$NAME" \
     --iso-volume "$NAME" \
-    --firmware-chroot true \
+    --firmware-chroot false \
     --zsync false \
     --security true \
     --updates true \
@@ -36,7 +38,7 @@ lb config noauto \
 
 # replace channel and suite
 sed -i "s/@CHANNEL/$CHANNEL/" config/archives/*.list*
-sed -i "s/@BASECODENAME/$BASECODENAME/" config/archives/*.list*
+sed -i "s/@CODENAME/$CODENAME/" config/archives/*.list*
 
 # replace desktop
 sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_install

etc/river/config/archives/mesa.list

@@ -1 +1 @@
-deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main
+# deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main

etc/river/config/archives/mozilla.key

@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyUMPpq
+/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIEdiG/
+e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcmjwlD
+T9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54t+Z+
+ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIzivGJpW
+QdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAHNVEFydGlmYWN0IFJlZ2lz
+dHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBvc2l0
+b3J5LXNpZ25lckBnb29nbGUuY29tPsLAjgQTAQoAOBYhBDW6oLM+nrOW9ZyoOMC6
+XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6XObc
+YxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wWqgVC
+7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFOMdLf
+ILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY89IDq
+fHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EPD02G
+C3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu4fH8
+XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU=
+=QnvN
+-----END PGP PUBLIC KEY BLOCK-----

etc/river/config/archives/mozilla.list

@@ -0,0 +1 @@
+deb https://packages.mozilla.org/apt mozilla main

etc/river/config/archives/tileos.list

@@ -1 +1 @@
-deb https://repo.tile-os.com/@CHANNEL/ @BASECODENAME main
+deb https://repo.tile-os.com/@CHANNEL/ @CODENAME main

etc/river/config/archives/vscode.key

@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
-LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
-7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
-OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
-H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
-M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
-ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
-AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
-/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
-MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
-7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
-KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
-XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
-NdCFTW7wY0Fb1fWJ+/KTsC4=
-=J6gs
------END PGP PUBLIC KEY BLOCK-----

etc/river/config/archives/vscode.list

@@ -1,3 +0,0 @@
-### THIS FILE IS AUTOMATICALLY CONFIGURED ###
-# You may comment out this entry, but any other modifications may be lost.
-deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main

etc/sway/auto/clean

@@ -0,0 +1,5 @@
+#! /bin/sh
+set -e
+
+export LB_LINUX_FLAVOURS="none"
+lb clean noauto "$@"

etc/sway/auto/config

@@ -2,8 +2,10 @@
 
 set -e
 
-. ./terraform.conf
+# Include common options
+. ./options
 
+# live-build configuration
 lb config noauto \
     --architectures "$ARCH" \
     --mode debian \
@@ -11,12 +13,12 @@ lb config noauto \
     --parent-distribution "$BASECODENAME" \
     --archive-areas "main contrib non-free non-free-firmware" \
     --parent-archive-areas "main contrib non-free non-free-firmware" \
-    --linux-packages linux-image-lts linux-headers-lts \
+    --linux-packages linux-image linux-headers \
     --bootappend-live "boot=live username=tileos hostname=tileos quiet splash" \
     --mirror-bootstrap "$MIRROR_URL" \
     --parent-mirror-bootstrap "$MIRROR_URL" \
-    --mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --mirror-chroot-security "$MIRROR_SECURITY" \
-    --parent-mirror-chroot-security "http://deb.debian.org/debian-security/" \
+    --parent-mirror-chroot-security "$MIRROR_SECURITY" \
     --apt-source-archives false \
     --parent-mirror-binary "$MIRROR_URL" \
     --keyring-packages "debian-keyring tileos-archive-keyring" \
@@ -36,7 +38,7 @@ lb config noauto \
 
 # replace channel and suite
 sed -i "s/@CHANNEL/$CHANNEL/" config/archives/*.list*
-sed -i "s/@BASECODENAME/$BASECODENAME/" config/archives/*.list*
+sed -i "s/@CODENAME/$CODENAME/" config/archives/*.list*
 
 # replace desktop
 sed -i "s/@DESKTOP/$DESKTOP/" config/package-lists.calamares/*.chroot_install

etc/sway/config/archives/mesa.list

@@ -1 +1 @@
-deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main
+# deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main

etc/sway/config/archives/mozilla.key

@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyUMPpq
+/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIEdiG/
+e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcmjwlD
+T9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54t+Z+
+ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIzivGJpW
+QdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAHNVEFydGlmYWN0IFJlZ2lz
+dHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBvc2l0
+b3J5LXNpZ25lckBnb29nbGUuY29tPsLAjgQTAQoAOBYhBDW6oLM+nrOW9ZyoOMC6
+XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6XObc
+YxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wWqgVC
+7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFOMdLf
+ILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY89IDq
+fHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EPD02G
+C3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu4fH8
+XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU=
+=QnvN
+-----END PGP PUBLIC KEY BLOCK-----

etc/sway/config/archives/mozilla.list

@@ -0,0 +1 @@
+deb https://packages.mozilla.org/apt mozilla main

etc/sway/config/archives/tileos.list

@@ -1 +1 @@
-deb https://repo.tile-os.com/@CHANNEL/ @BASECODENAME main
+deb https://repo.tile-os.com/@CHANNEL/ @CODENAME main

etc/sway/config/archives/vscode.key

@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
-LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
-7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
-OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
-H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
-M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
-ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
-AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
-/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
-MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
-7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
-KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
-XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
-NdCFTW7wY0Fb1fWJ+/KTsC4=
-=J6gs
------END PGP PUBLIC KEY BLOCK-----

etc/sway/config/archives/vscode.list

@@ -1,3 +0,0 @@
-### THIS FILE IS AUTOMATICALLY CONFIGURED ###
-# You may comment out this entry, but any other modifications may be lost.
-deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main

etc/swayfx/config/archives/mesa.list

@@ -1 +0,0 @@
-deb https://repo.tile-os.com/mesa-@CHANNEL/ @BASECODENAME main

etc/swayfx/config/archives/tileos.list

@@ -1 +0,0 @@
-deb https://repo.tile-os.com/@CHANNEL/ @BASECODENAME main

etc/swayfx/config/archives/vscode.key

@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
-LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
-7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
-OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
-H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
-M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
-ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
-AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
-/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
-MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
-7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
-KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
-XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
-NdCFTW7wY0Fb1fWJ+/KTsC4=
-=J6gs
------END PGP PUBLIC KEY BLOCK-----

etc/swayfx/config/archives/vscode.list

@@ -1,3 +0,0 @@
-### THIS FILE IS AUTOMATICALLY CONFIGURED ###
-# You may comment out this entry, but any other modifications may be lost.
-deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main

increase_number_of_blocks.patch

@@ -1,11 +0,0 @@
---- /usr/lib/live/build/binary_grub-efi	2023-02-19 00:09:59.711144321 +0400
-+++ /usr/lib/live/build/binary_grub-efi.orig	2023-02-19 00:10:30.827749004 +0400
-@@ -255,7 +255,7 @@
- # directories: EFI EFI/boot boot boot/grub
- size=\$((\$size + 4096 * 4))
- 
--blocks=\$(((\$size / 1024 + 55) / 32 * 32 ))
-+blocks=\$(((\$size / 1024 + 1540) / 32 * 32 ))
- 
- rm -f ${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img
- # The VOLID must be (truncated to) a 32bit hexadecimal number