Fix fish, update Calamares config, try to fix GDM, remove stratos getty

StratOS-Linux · Aug 17, 2024 · d288b67 · d288b67
1 parent 046d089
commit d288b67
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/airootfs/etc/calamares b/airootfs/etc/calamares
diff --git a/airootfs/etc/skel/.config/fish/config.fish b/airootfs/etc/skel/.config/fish/config.fish
@@ -8,7 +8,6 @@ if status is-interactive
     else
 	fish_default_key_bindings
     end
-    source ~/.profile
     source ~/.config/fish/aliases
     set -x MANROFFOPT "-c"
     set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"

diff --git a/airootfs/etc/systemd/system/display-manager.service b/airootfs/etc/systemd/system/display-manager.service
@@ -1 +1 @@
-/usr/lib/systemd/system/ly.service
+/usr/lib/systemd/system/gdm.service
diff --git a/airootfs/etc/systemd/system/gdm.service b/airootfs/etc/systemd/system/gdm.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=GNOME Display Manager
+Documentation=man:gdm(1)
+Conflicts[email protected]
+After=systemd-user-sessions.service [email protected] plymouth-quit.service systemd-logind.service
+PartOf=graphical.target
+StartLimitIntervalSec=30
+StartLimitBurst=2
+
+[Service]
+ExecStart=/usr/bin/gdm
+Restart=always
+
+[Install]
+Alias=display-manager.service
diff --git a/airootfs/etc/xdg/autostart/Calamares.desktop b/airootfs/etc/xdg/autostart/Calamares.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Type=Application
 Name=Calamares
-Exec=sudo -E calamares
+Exec=sh -c "sudo -E calamares -D8"
diff --git a/airootfs/usr/local/bin/StratOS-configure-bedrock b/airootfs/usr/local/bin/StratOS-configure-bedrock
@@ -2,3 +2,4 @@
 echo "Setting up Bedrock!"
 # curl -sSL https://github.com/bedrocklinux/bedrocklinux-userland/releases/download/0.7.29/bedrock-linux-0.7.29-x86_64.sh  > ./install-bedrock
 echo 'Not reversible!' | bash /usr/local/bin/install-bedrock-x86_64 --hijack
+rm -f /etc/systemd/system/[email protected]/autologin.conf # don't autologin as stratos anymore