diff --git a/debian/calamares-settings-tileos-miracle.postrm b/debian/calamares-settings-tileos-miracle.postrm new file mode 100755 index 0000000..b23834b --- /dev/null +++ b/debian/calamares-settings-tileos-miracle.postrm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +case "$1" in + remove) + # Restore original Calamares icon + dpkg-divert --quiet --rename --package calamares-settings-tileos-miracle \ + --remove /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/calamares-settings-tileos-miracle.preinst b/debian/calamares-settings-tileos-miracle.preinst new file mode 100755 index 0000000..34d6c55 --- /dev/null +++ b/debian/calamares-settings-tileos-miracle.preinst @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +case "$1" in + install|upgrade) + # Hide upstream calamares icon when this package is installed + dpkg-divert --quiet --package calamares-settings-tileos-miracle \ + --divert /usr/share/applications/calamares.desktop.orig \ + --rename /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/calamares-settings-tileos-niri.postrm b/debian/calamares-settings-tileos-niri.postrm new file mode 100755 index 0000000..5129c09 --- /dev/null +++ b/debian/calamares-settings-tileos-niri.postrm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +case "$1" in + remove) + # Restore original Calamares icon + dpkg-divert --quiet --rename --package calamares-settings-tileos-niri \ + --remove /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/calamares-settings-tileos-niri.preinst b/debian/calamares-settings-tileos-niri.preinst new file mode 100755 index 0000000..be86232 --- /dev/null +++ b/debian/calamares-settings-tileos-niri.preinst @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +case "$1" in + install|upgrade) + # Hide upstream calamares icon when this package is installed + dpkg-divert --quiet --package calamares-settings-tileos-niri \ + --divert /usr/share/applications/calamares.desktop.orig \ + --rename /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/calamares-settings-tileos-qtile.postrm b/debian/calamares-settings-tileos-qtile.postrm new file mode 100755 index 0000000..2e68bf9 --- /dev/null +++ b/debian/calamares-settings-tileos-qtile.postrm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +case "$1" in + remove) + # Restore original Calamares icon + dpkg-divert --quiet --rename --package calamares-settings-tileos-qtile \ + --remove /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/calamares-settings-tileos-qtile.preinst b/debian/calamares-settings-tileos-qtile.preinst new file mode 100755 index 0000000..05beda3 --- /dev/null +++ b/debian/calamares-settings-tileos-qtile.preinst @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +case "$1" in + install|upgrade) + # Hide upstream calamares icon when this package is installed + dpkg-divert --quiet --package calamares-settings-tileos-qtile \ + --divert /usr/share/applications/calamares.desktop.orig \ + --rename /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/calamares-settings-tileos-river.postrm b/debian/calamares-settings-tileos-river.postrm new file mode 100755 index 0000000..529bd99 --- /dev/null +++ b/debian/calamares-settings-tileos-river.postrm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +case "$1" in + remove) + # Restore original Calamares icon + dpkg-divert --quiet --rename --package calamares-settings-tileos-river \ + --remove /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/calamares-settings-tileos-river.preinst b/debian/calamares-settings-tileos-river.preinst new file mode 100755 index 0000000..6e2409f --- /dev/null +++ b/debian/calamares-settings-tileos-river.preinst @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +case "$1" in + install|upgrade) + # Hide upstream calamares icon when this package is installed + dpkg-divert --quiet --package calamares-settings-tileos-river \ + --divert /usr/share/applications/calamares.desktop.orig \ + --rename /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/calamares-settings-tileos-sway.postrm b/debian/calamares-settings-tileos-sway.postrm new file mode 100755 index 0000000..2ae3ec5 --- /dev/null +++ b/debian/calamares-settings-tileos-sway.postrm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +case "$1" in + remove) + # Restore original Calamares icon + dpkg-divert --quiet --rename --package calamares-settings-tileos-sway \ + --remove /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/calamares-settings-tileos-sway.preinst b/debian/calamares-settings-tileos-sway.preinst new file mode 100755 index 0000000..6656c31 --- /dev/null +++ b/debian/calamares-settings-tileos-sway.preinst @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +case "$1" in + install|upgrade) + # Hide upstream calamares icon when this package is installed + dpkg-divert --quiet --package calamares-settings-tileos-sway \ + --divert /usr/share/applications/calamares.desktop.orig \ + --rename /usr/share/applications/calamares.desktop + ;; +esac + +#DEBHELPER# diff --git a/debian/changelog b/debian/changelog index 104cace..50cf68f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +calamares-settings-tileos (2.0.4~tileos) unstable; urgency=medium + + * Remove upstream Calamares .desktop file + * Small fixes + + -- Aleksey Samoilov Sat, 21 Jun 2025 17:12:25 +0400 + calamares-settings-tileos (2.0.3~tileos) unstable; urgency=medium * Add F2FS support diff --git a/miracle/modules/displaymanager.conf b/miracle/modules/displaymanager.conf index 23f24cc..a58380e 100644 --- a/miracle/modules/displaymanager.conf +++ b/miracle/modules/displaymanager.conf @@ -6,7 +6,7 @@ greetd: greeter_group: "_greetd" defaultDesktopEnvironment: - executable: "miracle-wm" + executable: "start-miracle-wm" desktopFile: "miracle-wm" basicSetup: false diff --git a/miracle/modules/packages.conf b/miracle/modules/packages.conf index b85e1b1..fff4aba 100644 --- a/miracle/modules/packages.conf +++ b/miracle/modules/packages.conf @@ -1,9 +1,5 @@ backend: apt -skip_if_no_internet: false -update_db: true -update_system: false - operations: - remove: - 'live-boot' @@ -15,4 +11,4 @@ operations: - 'live-tools' - 'live-task-localisation' - 'live-task-recommended' - - 'calamares-settings-tileos-sway' + - 'calamares-settings-tileos-miracle' diff --git a/niri/modules/packages.conf b/niri/modules/packages.conf index e8b016b..53f44e8 100644 --- a/niri/modules/packages.conf +++ b/niri/modules/packages.conf @@ -1,9 +1,5 @@ backend: apt -skip_if_no_internet: false -update_db: true -update_system: false - operations: - remove: - 'live-boot' @@ -15,4 +11,4 @@ operations: - 'live-tools' - 'live-task-localisation' - 'live-task-recommended' - - 'calamares-settings-tileos-river' + - 'calamares-settings-tileos-niri' diff --git a/qtile/modules/packages.conf b/qtile/modules/packages.conf index b85e1b1..bd296d9 100644 --- a/qtile/modules/packages.conf +++ b/qtile/modules/packages.conf @@ -1,9 +1,5 @@ backend: apt -skip_if_no_internet: false -update_db: true -update_system: false - operations: - remove: - 'live-boot' @@ -15,4 +11,4 @@ operations: - 'live-tools' - 'live-task-localisation' - 'live-task-recommended' - - 'calamares-settings-tileos-sway' + - 'calamares-settings-tileos-qtile' diff --git a/river/modules/packages.conf b/river/modules/packages.conf index e8b016b..6e21574 100644 --- a/river/modules/packages.conf +++ b/river/modules/packages.conf @@ -1,9 +1,5 @@ backend: apt -skip_if_no_internet: false -update_db: true -update_system: false - operations: - remove: - 'live-boot' diff --git a/sway/modules/packages.conf b/sway/modules/packages.conf index e18bae0..a77083c 100644 --- a/sway/modules/packages.conf +++ b/sway/modules/packages.conf @@ -11,4 +11,4 @@ operations: - 'live-tools' - 'live-task-localisation' - 'live-task-recommended' - - 'calamares-settings-debian' + - 'calamares-settings-tileos-sway'