diff --git a/artwork/install-debian.png b/artwork/install-debian.png deleted file mode 100644 index e24ad0b..0000000 Binary files a/artwork/install-debian.png and /dev/null differ diff --git a/calamares/branding/tileos-river/branding.desc b/calamares/branding/tileos-river/branding.desc index 614729c..5fd9683 100644 --- a/calamares/branding/tileos-river/branding.desc +++ b/calamares/branding/tileos-river/branding.desc @@ -11,19 +11,20 @@ strings: versionedName: TileOS 1.0 (t-rex) shortVersionedName: TileOS 1.0 bootloaderEntryName: TileOS + supportUrl: https://github.com/Tile-OS/TileOS/issues images: - productLogo: "debian-logo.png" - productIcon: "debian-logo.png" + productLogo: "tileos-logo.png" + productIcon: "tileos-logo.png" productWelcome: "welcome.png" # productWallpaper: "wallpaper.png" slideshow: "show.qml" style: - sidebarBackground: "#2c3133" - sidebarText: "#FFFFFF" - sidebarTextSelect: "#4d7079" - sidebarTextSelect: "#292F34" + sidebarBackground: "#1e2030" + sidebarText: "#cad3f5" + sidebarTextSelect: "#24273a" + sidebarTextSelect: "#24273a" slideshowAPI: 2 diff --git a/calamares/branding/tileos-river/debian-logo.png b/calamares/branding/tileos-river/debian-logo.png deleted file mode 100644 index 8ad8bae..0000000 Binary files a/calamares/branding/tileos-river/debian-logo.png and /dev/null differ diff --git a/calamares/branding/tileos-river/show.qml b/calamares/branding/tileos-river/show.qml index 81be54d..4149ce3 100644 --- a/calamares/branding/tileos-river/show.qml +++ b/calamares/branding/tileos-river/show.qml @@ -40,7 +40,7 @@ Presentation Text { anchors.horizontalCenter: background1.horizontalCenter anchors.top: background1.bottom - text: qsTr("Welcome to Debian GNU/Linux.
"+ + text: qsTr("Welcome to TileOS 1.0 T-Rex.
"+ "The rest of the installation is automated and should complete in a few minutes.") wrapMode: Text.WordWrap width: 600 diff --git a/calamares/branding/tileos-river/slide1.png b/calamares/branding/tileos-river/slide1.png index ca9f78f..2936b49 100644 Binary files a/calamares/branding/tileos-river/slide1.png and b/calamares/branding/tileos-river/slide1.png differ diff --git a/calamares/branding/tileos-river/stylesheet.qss b/calamares/branding/tileos-river/stylesheet.qss new file mode 100644 index 0000000..44ac77a --- /dev/null +++ b/calamares/branding/tileos-river/stylesheet.qss @@ -0,0 +1,46 @@ +/* + +A branding component can ship a stylesheet (like this one) +which is applied to parts of the Calamares user-interface. +In principle, all parts can be styled through CSS. +Missing parts should be filed as issues. + +The IDs are based on the object names in the C++ code. + +Documentation for styling Qt Widgets through a stylesheet +can be found at + https://doc.qt.io/qt-5/stylesheet-examples.html +In Calamares, styling widget classes is supported (e.g. +using `QComboBox` as a selector). You can also use specific +object names (ids), which you can find through debugging tools. + +*/ + +/* Main application window. */ + +#mainApp { +} + +/*-----QPushButton-----*/ + +QPushButton::flat { + background-color: transparent; + border: none; + color: #cad3f5; +} + +/* Partitioning module. + +#bootInfoIcon { } +#bootInfoLable { } +#deviceInfoIcon { } +#defineInfoLabel { } +#scrollAreaWidgetContents { } +#partitionBarView { } +*/ + +/* Licensing module. + +#licenseItem { } +#licenseItemFullText { } +*/ diff --git a/calamares/branding/tileos-river/tileos-logo.png b/calamares/branding/tileos-river/tileos-logo.png new file mode 100644 index 0000000..e84bb9e Binary files /dev/null and b/calamares/branding/tileos-river/tileos-logo.png differ diff --git a/calamares/modules/netinstall.conf b/calamares/modules/netinstall.conf new file mode 100644 index 0000000..c206558 --- /dev/null +++ b/calamares/modules/netinstall.conf @@ -0,0 +1,12 @@ +groupsUrl: + - file:///etc/calamares/modules/netinstall.yaml + +required: false + +label: + sidebar: "Applications" + sidebar[nl]: "Applicaties" + sidebar[ja]: "アプリケーション" + title: "Applications" + title[nl]: "Applicaties" + title[ja]: "アプリケーション" diff --git a/calamares/modules/netinstall.yaml b/calamares/modules/netinstall.yaml new file mode 100644 index 0000000..6433b4d --- /dev/null +++ b/calamares/modules/netinstall.yaml @@ -0,0 +1,190 @@ +- name: "Accessories" + description: "Accessories" + critical: false + hidden: false + selected: false + expanded: false + packages: + - featherpad + - file-roller + - flameshot + - galculator + - gnome-disk-utility + - keepassxc + - liferea + - mcomix + - mate-calc + - mediainfo-gui + - mintstick + - mousepad + - neovim + - qtpass + - qualculate + - waypipe + - wayvnc +- name: "Development" + description: "Software for developers" + critical: false + hidden: false + selected: false + expanded: false + packages: + - apostrophe + - arduino + - bluefish + - code + - emacs + - geany + - ghex + - git-cola + - gnome-builder + - kate + - kdevelop + - kicad + - meld + - micro + - notepadqq + - qtcreator +- name: "Games" + description: "Game clietns, emulators, etc" + critical: false + hidden: false + selected: false + expanded: false + packages: + - dolphin-emu + - dosbox + - gamehub + - gamemode + - gamescope + - lutris + - mame + - mgba-qt + - mupen64plus-qt + - nestopia + - protontricks + - retroarch + - steam + - stella + - yuzu +- name: "Graphics" + description: "Graphics software" + critical: false + hidden: false + selected: false + expanded: false + packages: + - blender + - darktable + - eom + - gimp + - inkscape + - krita + - lximage-qt + - mypaint + - rawtherapee + - ristretto + - simple-scan + - tupi +- name: "Internet" + description: "Web browsers, mail clietns, torrent clietns, etc" + critical: false + hidden: false + selected: false + expanded: false + packages: + - brave-browser + - chromium + - dino + - epiphany-browser + - falkon + - filezilla + - gajim + - geary + - librewolf + - nheko + - telegram-desktop + - thunderbird + - transmission-gtk + - quassel + - quaternion + - qbittorrent + - qutebrowser +- name: "Multimedia" + description: "Multimedia software (players, audio libraries, etc)" + critical: false + hidden: false + selected: false + expanded: false + packages: + - audacious + - audacity + - cantata + - celluloid + - cheese + - clementine + - easyeffects + - elisa + - handbrake + - kdenlive + - lmms + - mpv + - musikcube + - obs-studio + - pipewire-jack + - sayonara + - shotcut + - strawberry + - vlc + - webcamoid +- name: "Office" + description: "Document viewers, office suite" + critical: false + hidden: false + selected: false + expanded: false + packages: + - libreoffice + - libreoffice-writer + - libreoffice-impress + - libreoffice-calc + - libreoffice-base + - libreoffice-draw + - libreoffice-math + - okular + - onlyoffice-desktopeditors + - qpdfview + - zathura +- name: "System" + description: "Various system software, emulators and VM's" + critical: false + hidden: false + selected: false + expanded: false + packages: + - alacritty + - aqemu + - corectrl + - cpu-x + - distrobox + - drm-info + - firewalld + - firewall-config + - firetools + - gnome-packagekit + - gsmartcontrol + - htop + - inxi + - kitty + - mate-terminal + - opensnitch + - qemu-system + - radeontop + - sakura + - system-config-printer + - terminator + - timeshift + - virt-manager + - waydroid + - xfce4-terminal + - ydotool diff --git a/calamares/modules/packages.conf b/calamares/modules/packages.conf index a77083c..b85e1b1 100644 --- a/calamares/modules/packages.conf +++ b/calamares/modules/packages.conf @@ -1,5 +1,9 @@ backend: apt +skip_if_no_internet: false +update_db: true +update_system: false + operations: - remove: - 'live-boot' diff --git a/calamares/modules/partition.conf b/calamares/modules/partition.conf new file mode 100644 index 0000000..38f3219 --- /dev/null +++ b/calamares/modules/partition.conf @@ -0,0 +1,8 @@ +efiSystemPartition: "/boot/efi" +enableLuksAutomatedPartitioning: true +userSwapChoices: + - none + - file +initialSwapChoice: file +drawNestedPartitions: true +defaultFileSystemType: "ext4" diff --git a/calamares/modules/welcome.conf b/calamares/modules/welcome.conf index e3b2e39..4e94321 100644 --- a/calamares/modules/welcome.conf +++ b/calamares/modules/welcome.conf @@ -1,17 +1,27 @@ --- showSupportUrl: true -showKnownIssuesUrl: true -showReleaseNotesUrl: true +showKnownIssuesUrl: false +showReleaseNotesUrl: false requirements: requiredStorage: 20 requiredRam: 1.0 + internetCheckUrl: https://google.com/ + check: - storage - ram - power - root + - internet required: - storage - ram - root + - internet + +# Try to set language if internet available +geoip: + style: "json" + url: "https://ipapi.co/json" + selector: "country" diff --git a/calamares/settings.conf b/calamares/settings.conf index 34d2b20..a1fe47f 100644 --- a/calamares/settings.conf +++ b/calamares/settings.conf @@ -31,6 +31,14 @@ disable-cancel: false # YAML: boolean. disable-cancel-during-exec: false +# If this is set to true, the "Next" and "Back" button will be hidden once +# you start the 'Installation'. +# +# Default is false, but Calamares will complain if this is not explicitly set. +# +# YAML: boolean. +hide-back-and-next-during-exec: false + # If this is set to true, then once the end of the sequence has # been reached, the quit (done) button is clicked automatically # and Calamares will close. Default is false: the user will see @@ -48,6 +56,7 @@ sequence: - welcome - locale - keyboard + - netinstall - partition - users - summary diff --git a/debian/changelog b/debian/changelog index b82a394..f1a2e03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,11 +4,43 @@ calamares-settings-tileos-river (1.3~tileos) unstable; urgency=medium -- Aleksey Samoilov Mon, 22 May 2023 20:53:08 +0400 -calamares-settings-tileos-river (1.2~tileos) unstable; urgency=medium +calamares-settings-tileos-sway (1.9~tileos) unstable; urgency=medium - * Initial upload + * Require internet for installing + * Update welcome screen - -- Aleksey Samoilov Wed, 17 May 2023 18:33:05 +0400 + -- Aleksey Samoilov Tue, 25 Jul 2023 23:21:11 +0400 + +calamares-settings-tileos-sway (1.8~tileos) unstable; urgency=medium + + * Fix installation script + + -- Aleksey Samoilov Mon, 17 Jul 2023 22:23:32 +0400 + +calamares-settings-tileos-sway (1.7~tileos) unstable; urgency=medium + + * Add more packages to netinstall module + + -- Aleksey Samoilov Wed, 21 Jun 2023 23:46:57 +0400 + +calamares-settings-tileos-sway (1.6~tileos) unstable; urgency=medium + + * Add partition config + + -- Aleksey Samoilov Sat, 10 Jun 2023 23:02:32 +0400 + +calamares-settings-tileos-sway (1.5~tileos) unstable; urgency=medium + + * Styling adjustments + * Fix netinstall.conf + + -- Aleksey Samoilov Thu, 08 Jun 2023 06:35:57 -0400 + +calamares-settings-tileos-sway (1.4~tileos) unstable; urgency=medium + + * Initial netinstall module + + -- Aleksey Samoilov Tue, 06 Jun 2023 22:49:46 +0400 calamares-settings-tileos-sway (1.2~tileos) unstable; urgency=medium diff --git a/debian/install b/debian/install index 8bd5fb1..cf7ff67 100644 --- a/debian/install +++ b/debian/install @@ -3,4 +3,3 @@ calamares-modules/* usr/lib/calamares/modules scripts/* usr/sbin *.desktop usr/share/applications install-tileos usr/bin -artwork/install-debian.png usr/share/pixmaps diff --git a/install-tileos.desktop b/install-tileos.desktop index 75c96fc..f55f5b0 100644 --- a/install-tileos.desktop +++ b/install-tileos.desktop @@ -6,7 +6,7 @@ GenericName=Calamares Installer Exec=install-tileos Comment=Calamares — Installer for TileOS Keywords=calamares;system;install;debian;installer -Icon=install-debian +Icon=calamares Terminal=false Categories=Qt;System; StartupWMClass=calamares