diff --git a/build.sh b/build.sh index 16f179b..75d3b47 100755 --- a/build.sh +++ b/build.sh @@ -66,7 +66,7 @@ build () { # remove old configs and copy over new rm -rf config auto - cp -r "$BASE_DIR"/etc/* . + cp -r "$BASE_DIR"/etc/$DESKTOP/* . # Make sure conffile specified as arg has correct name cp -f "$BASE_DIR"/"$CONFIG_FILE" terraform.conf diff --git a/etc/config/includes.chroot/etc/greetd/config.toml b/etc/config/includes.chroot/etc/greetd/config.toml deleted file mode 100644 index e4a88ea..0000000 --- a/etc/config/includes.chroot/etc/greetd/config.toml +++ /dev/null @@ -1,10 +0,0 @@ -[terminal] -vt = 7 - -[default_session] -command = "cage -s -d -- regreet" -user = "_greetd" - -[initial_session] -command = "sway" -user = "tileos" diff --git a/etc/auto/config b/etc/sway/auto/config similarity index 96% rename from etc/auto/config rename to etc/sway/auto/config index 94d86b0..272b511 100755 --- a/etc/auto/config +++ b/etc/sway/auto/config @@ -12,7 +12,7 @@ lb config noauto \ --archive-areas "main contrib non-free non-free-firmware" \ --parent-archive-areas "main contrib non-free non-free-firmware" \ --linux-packages linux-image \ - --bootappend-live "boot=live components username=tileos quiet splash" \ + --bootappend-live "boot=live username=tileos quiet splash" \ --mirror-bootstrap "$MIRROR_URL" \ --parent-mirror-bootstrap "$MIRROR_URL" \ --mirror-chroot-security "http://deb.debian.org/debian-security/" \ diff --git a/etc/config/archives/tileos.key b/etc/sway/config/archives/tileos.key similarity index 100% rename from etc/config/archives/tileos.key rename to etc/sway/config/archives/tileos.key diff --git a/etc/config/archives/tileos.list b/etc/sway/config/archives/tileos.list similarity index 100% rename from etc/config/archives/tileos.list rename to etc/sway/config/archives/tileos.list diff --git a/etc/sway/config/bootloaders/grub-pc/dejavu-bold-14.pf2 b/etc/sway/config/bootloaders/grub-pc/dejavu-bold-14.pf2 new file mode 100644 index 0000000..9b093b2 Binary files /dev/null and b/etc/sway/config/bootloaders/grub-pc/dejavu-bold-14.pf2 differ diff --git a/etc/sway/config/bootloaders/grub-pc/dejavu-bold-16.pf2 b/etc/sway/config/bootloaders/grub-pc/dejavu-bold-16.pf2 new file mode 100644 index 0000000..11e7f7a Binary files /dev/null and b/etc/sway/config/bootloaders/grub-pc/dejavu-bold-16.pf2 differ diff --git a/etc/sway/config/bootloaders/grub-pc/grub.cfg b/etc/sway/config/bootloaders/grub-pc/grub.cfg new file mode 100644 index 0000000..ee80890 --- /dev/null +++ b/etc/sway/config/bootloaders/grub-pc/grub.cfg @@ -0,0 +1,61 @@ +load function_video { + if [ x$feature_all_video_module = xy ] + then + insmod all_video + else + insmod video_bochs + insmod video_cirrus + if test "${grub_platform}" == "efi" + then + insmod efi_gop + insmod efi_uga + elif test "${grub_platform}" == "pc" + then + insmod vbe + insmod vga + fi + fi +} + +set color_normal=white/black +set color_highlight=black/light-gray +set timeout=10 +set timeout_style=menu + +set theme=/boot/grub/tileos-theme/theme.txt + +if loadfont /boot/grub/dejavu-bold-14.pf2 +then + set gfxmode=auto + export gfxmode + load_video + insmod gfxterm + terminal_output gfxterm + insmod gfxmenu + insmod png + export theme +fi + + +menuentry "Start TileOS" { + set gfxpayload=keep + linux @KERNEL_LIVE@ @APPEND_LIVE@ + initrd @INITRD_LIVE@ + +} + +# Memtest (if any) +if [ "${grub_platform}" = "pc" ] -a @ENABLE_MEMTEST@; then + source /boot/grub/memtest.cfg +fi + +# Firmware setup (UEFI) +if [ "${grub_platform}" = "efi" ]; then + menuentry "UEFI Firmware Settings" { + fwsetup + } +fi + +menuentry "Power Off" --class shutdown { + halt +} diff --git a/etc/sway/config/bootloaders/grub-pc/memtest.cfg b/etc/sway/config/bootloaders/grub-pc/memtest.cfg new file mode 100644 index 0000000..454804b --- /dev/null +++ b/etc/sway/config/bootloaders/grub-pc/memtest.cfg @@ -0,0 +1,3 @@ +menuentry "Memory Diagnostic Tool (@MEMTEST_VERSION@)" --hotkey=m { + linux16 @MEMTEST_BIN@ +} diff --git a/etc/sway/config/bootloaders/grub-pc/tileos-theme/background.png b/etc/sway/config/bootloaders/grub-pc/tileos-theme/background.png new file mode 100644 index 0000000..cfcdc0a Binary files /dev/null and b/etc/sway/config/bootloaders/grub-pc/tileos-theme/background.png differ diff --git a/etc/sway/config/bootloaders/grub-pc/tileos-theme/logo.png b/etc/sway/config/bootloaders/grub-pc/tileos-theme/logo.png new file mode 100644 index 0000000..260e301 Binary files /dev/null and b/etc/sway/config/bootloaders/grub-pc/tileos-theme/logo.png differ diff --git a/etc/sway/config/bootloaders/grub-pc/tileos-theme/theme.txt b/etc/sway/config/bootloaders/grub-pc/tileos-theme/theme.txt new file mode 100644 index 0000000..f519cf4 --- /dev/null +++ b/etc/sway/config/bootloaders/grub-pc/tileos-theme/theme.txt @@ -0,0 +1,61 @@ +title-text: "" +desktop-image: "background.png" +desktop-color: "#000000" +title-color: "#ffffff" +title-font: "DejaVu Sans Bold 16" +message-font: "Unifont Regular 16" + +terminal-left: "0" +terminal-top: "0" +terminal-width: "100%" +terminal-height: "100%" +terminal-border: "0" + +# Logo image ++ image { + left = 50%-270 + top = 50%-200 + file = "logo.png" +} + +#help bar at the bottom ++ label { + top = 100%-50 + left = 0 + width = 100% + height = 20 + text = "@KEYMAP_SHORT@" + align = "center" + color = "#ffffff" + font = "DejaVu Sans Bold 14" +} + +#boot menu ++ boot_menu { + left = 50%-125 + width = 500 + top = 50%+100 + height = 300 + + item_font = "DejaVu Sans Bold 14" + item_color = "#999" + selected_item_font = "DejaVu Sans Bold 14" + selected_item_color= "#fff" + + item_height = 26 + item_padding = 0 + item_icon_space = 0 + item_spacing = 1 + scrollbar = false +} + +# Show a countdown message using the label component ++ label { + top = 55% + left = 35% + width = 30% + align = "center" + id = "__timeout__" + text = "Booting in %d seconds" + color = "#f6f6f6" +} diff --git a/etc/sway/config/bootloaders/isolinux/hdt.c32 b/etc/sway/config/bootloaders/isolinux/hdt.c32 new file mode 120000 index 0000000..f84c641 --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/hdt.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios/hdt.c32 \ No newline at end of file diff --git a/etc/sway/config/bootloaders/isolinux/isolinux.bin b/etc/sway/config/bootloaders/isolinux/isolinux.bin new file mode 120000 index 0000000..33a2ad6 --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/isolinux.bin @@ -0,0 +1 @@ +/usr/lib/ISOLINUX/isolinux.bin \ No newline at end of file diff --git a/etc/sway/config/bootloaders/isolinux/isolinux.cfg b/etc/sway/config/bootloaders/isolinux/isolinux.cfg new file mode 100644 index 0000000..0fa3783 --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/isolinux.cfg @@ -0,0 +1,3 @@ +default vesamenu.c32 +include stdmenu.cfg +include live.cfg diff --git a/etc/sway/config/bootloaders/isolinux/ldlinux.c32 b/etc/sway/config/bootloaders/isolinux/ldlinux.c32 new file mode 120000 index 0000000..df554c7 --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/ldlinux.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios/ldlinux.c32 \ No newline at end of file diff --git a/etc/sway/config/bootloaders/isolinux/libcom32.c32 b/etc/sway/config/bootloaders/isolinux/libcom32.c32 new file mode 120000 index 0000000..44ab36b --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/libcom32.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios/libcom32.c32 \ No newline at end of file diff --git a/etc/sway/config/bootloaders/isolinux/libgpl.c32 b/etc/sway/config/bootloaders/isolinux/libgpl.c32 new file mode 120000 index 0000000..81c83fb --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/libgpl.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios/libgpl.c32 \ No newline at end of file diff --git a/etc/sway/config/bootloaders/isolinux/libmenu.c32 b/etc/sway/config/bootloaders/isolinux/libmenu.c32 new file mode 120000 index 0000000..2491ff9 --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/libmenu.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios/libmenu.c32 \ No newline at end of file diff --git a/etc/sway/config/bootloaders/isolinux/libutil.c32 b/etc/sway/config/bootloaders/isolinux/libutil.c32 new file mode 120000 index 0000000..478194e --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/libutil.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios/libutil.c32 \ No newline at end of file diff --git a/etc/sway/config/bootloaders/isolinux/live.cfg.in b/etc/sway/config/bootloaders/isolinux/live.cfg.in new file mode 100644 index 0000000..35897e6 --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/live.cfg.in @@ -0,0 +1,31 @@ +prompt 0 + +MENU HIDDEN +MENU AUTOBOOT Booting TileOS live disk in # seconds +timeout 50 + +label live-@FLAVOUR@ + menu label ^Start TileOS + menu default + linux @LINUX@ + initrd @INITRD@ + append @APPEND_LIVE@ + +MENU SEPARATOR + +label live-failsafe + menu label Start TileOS (Safe Graphics) + set gfxpayload=keep + linux @LINUX@ + initrd @INITRD@ + append @APPEND_LIVE_FAILSAFE@ + +MENU SEPARATOR + +label hd + menu label ^Boot from first hard disk + localboot 0x80 +MENU SEPARATOR +LABEL power + MENU LABEL ^Power Off + COM32 poweroff.c32 diff --git a/etc/sway/config/bootloaders/isolinux/menu.c32 b/etc/sway/config/bootloaders/isolinux/menu.c32 new file mode 120000 index 0000000..86c360d --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/menu.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios/menu.c32 \ No newline at end of file diff --git a/etc/sway/config/bootloaders/isolinux/poweroff.c32 b/etc/sway/config/bootloaders/isolinux/poweroff.c32 new file mode 100644 index 0000000..435b764 Binary files /dev/null and b/etc/sway/config/bootloaders/isolinux/poweroff.c32 differ diff --git a/etc/sway/config/bootloaders/isolinux/stdmenu.cfg b/etc/sway/config/bootloaders/isolinux/stdmenu.cfg new file mode 100644 index 0000000..cb7f674 --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/stdmenu.cfg @@ -0,0 +1,42 @@ +menu hshift 13 +menu width 49 +menu margin 8 + +# Override the default radial gradient background with black +menu background #ff000000 + +# Title bar +menu color title 0 #ffffffff #00000000 * + +# Border Area +menu color border * #00000000 #00000000 none + +# Unselected menu item +menu color unsel 0 #999999 #00000000 * + +# Unselected hotkey +menu color hotkey 0 #999999 #00000000 none + +# Selection bar +menu color sel 0 #ffffff #00000000 none + +# Selected hotkey +menu color hotsel 0 #ffffffff #00000000 none + +# Press [Tab] message +menu color tabmsg 0 #f6f6f6 #00000000 none + +# Timeout message +menu color timeout_msg 0 #f6f6f6 #00000000 none + +# Timeout counter +menu color timeout * #ffffffff #00000000 none + +# Command line +menu color cmdline 0 #ffffffff #00000000 none + +# Command line marker +menu color cmdmark 0 #00000000 #00000000 none + +# Helptest +menu color help 0 #ffffffff #00000000 none diff --git a/etc/sway/config/bootloaders/isolinux/vesamenu.c32 b/etc/sway/config/bootloaders/isolinux/vesamenu.c32 new file mode 120000 index 0000000..84e2eff --- /dev/null +++ b/etc/sway/config/bootloaders/isolinux/vesamenu.c32 @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios/vesamenu.c32 \ No newline at end of file diff --git a/etc/sway/config/hooks/live/000-remove-blacklisted-packages.chroot b/etc/sway/config/hooks/live/000-remove-blacklisted-packages.chroot new file mode 100755 index 0000000..bb5c77c --- /dev/null +++ b/etc/sway/config/hooks/live/000-remove-blacklisted-packages.chroot @@ -0,0 +1,7 @@ +#!/bin/sh + +echo "P: Begin executing remove-blacklisted-packages chroot hook..." + +apt-get autoremove --purge -f -q -y \ + systemsettings \ + zutty diff --git a/etc/config/hooks/live/999-cleanup-apt-cache.chroot b/etc/sway/config/hooks/live/999-cleanup-apt-cache.chroot similarity index 100% rename from etc/config/hooks/live/999-cleanup-apt-cache.chroot rename to etc/sway/config/hooks/live/999-cleanup-apt-cache.chroot diff --git a/etc/config/hooks/live/set-disk-info.binary b/etc/sway/config/hooks/live/set-disk-info.binary similarity index 100% rename from etc/config/hooks/live/set-disk-info.binary rename to etc/sway/config/hooks/live/set-disk-info.binary diff --git a/etc/config/includes.binary/.disk/base_installable b/etc/sway/config/includes.binary/.disk/base_installable similarity index 100% rename from etc/config/includes.binary/.disk/base_installable rename to etc/sway/config/includes.binary/.disk/base_installable diff --git a/etc/config/includes.binary/.disk/cd_type b/etc/sway/config/includes.binary/.disk/cd_type similarity index 100% rename from etc/config/includes.binary/.disk/cd_type rename to etc/sway/config/includes.binary/.disk/cd_type diff --git a/etc/config/includes.binary/.disk/info b/etc/sway/config/includes.binary/.disk/info similarity index 100% rename from etc/config/includes.binary/.disk/info rename to etc/sway/config/includes.binary/.disk/info diff --git a/etc/sway/config/includes.chroot/etc/greetd/config.toml b/etc/sway/config/includes.chroot/etc/greetd/config.toml new file mode 100644 index 0000000..08a4edf --- /dev/null +++ b/etc/sway/config/includes.chroot/etc/greetd/config.toml @@ -0,0 +1,10 @@ +[terminal] +vt = 7 + +[default_session] +command = "tuigreet --remember --time --issue --asterisks --cmd start-sway" +user = "_greetd" + +[initial_session] +command = "start-sway" +user = "tileos" diff --git a/etc/config/includes.chroot/usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf b/etc/sway/config/includes.chroot/usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf similarity index 100% rename from etc/config/includes.chroot/usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf rename to etc/sway/config/includes.chroot/usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_install b/etc/sway/config/package-lists.calamares/desktop.list.chroot_install similarity index 100% rename from etc/config/package-lists.calamares/desktop.list.chroot_install rename to etc/sway/config/package-lists.calamares/desktop.list.chroot_install diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_live b/etc/sway/config/package-lists.calamares/desktop.list.chroot_live similarity index 100% rename from etc/config/package-lists.calamares/desktop.list.chroot_live rename to etc/sway/config/package-lists.calamares/desktop.list.chroot_live