From 219dead11956dc94eb7f8cb39198f31ac7fc9539 Mon Sep 17 00:00:00 2001 From: JMARyA Date: Thu, 9 Jan 2025 18:43:43 +0100 Subject: [PATCH] fix --- airootfs/etc/skel/Desktop/Copy Configuration.desktop | 7 +++++++ airootfs/etc/skel/Desktop/Install System.desktop | 3 ++- airootfs/etc/skel/Desktop/README.md | 8 +++++--- airootfs/etc/skel/Desktop/config.toml | 1 - packages.x86_64 | 1 + 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 airootfs/etc/skel/Desktop/Copy Configuration.desktop delete mode 120000 airootfs/etc/skel/Desktop/config.toml diff --git a/airootfs/etc/skel/Desktop/Copy Configuration.desktop b/airootfs/etc/skel/Desktop/Copy Configuration.desktop new file mode 100644 index 0000000..55ab423 --- /dev/null +++ b/airootfs/etc/skel/Desktop/Copy Configuration.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Terminal=true +Exec=/usr/bin/cp /usr/share/navinstall/installs/full.toml /home/shadow/Desktop/config.toml +Name=Copy Configuration +Icon=/usr/share/icons/navos/navi.png +Comment=Copy a reference configuration to the Desktop diff --git a/airootfs/etc/skel/Desktop/Install System.desktop b/airootfs/etc/skel/Desktop/Install System.desktop index 7413f98..3ad99c0 100644 --- a/airootfs/etc/skel/Desktop/Install System.desktop +++ b/airootfs/etc/skel/Desktop/Install System.desktop @@ -1,7 +1,8 @@ [Desktop Entry] Type=Application Terminal=true -Exec=/usr/bin/navinstall install /home/shadow/Desktop/config.toml +TerminalOptions=\s--noclose +Exec=/usr/bin/doas /usr/bin/navinstall install /home/shadow/Desktop/config.toml Name=Install navOS Icon=/usr/share/icons/navos/navi.png Comment=Install the System according to config diff --git a/airootfs/etc/skel/Desktop/README.md b/airootfs/etc/skel/Desktop/README.md index c5d27db..dfa6d4d 100644 --- a/airootfs/etc/skel/Desktop/README.md +++ b/airootfs/etc/skel/Desktop/README.md @@ -1,4 +1,5 @@ # Welcome to NavOS! +The default user is `shadow` with password `shadow`. ## Installation The system can be installed with the `navinstall install ` command. @@ -6,6 +7,7 @@ You need to pass a new system configuration which will define the new system. Examples can be found at `/usr/share/navinstall/installs`. ### TLDR -On the desktop you find a full reference configuration which you can edit to configure your new system. -Once you finished configuring your system, click `Install System`. -After the installer finished, you can reboot into your new system. +- Click `Copy Configuration` to copy a reference configuration file to the Desktop. +- Edit `config.toml` to configure your new system +- Click `Install System`. +- Once the installer finished, you can reboot into your new system. diff --git a/airootfs/etc/skel/Desktop/config.toml b/airootfs/etc/skel/Desktop/config.toml deleted file mode 120000 index 139ae40..0000000 --- a/airootfs/etc/skel/Desktop/config.toml +++ /dev/null @@ -1 +0,0 @@ -/usr/share/navinstall/installs/full.toml \ No newline at end of file diff --git a/packages.x86_64 b/packages.x86_64 index fb44277..8bc1ad7 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -8,6 +8,7 @@ navos/navinstall #gui: konsole #gui: firefox #gui: gnome-disk-utility +#gui: kate # misc doas