From b80a0c50aa34423ec2d66cd8d8a6824ec008d41d Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Mon, 21 Aug 2023 15:44:17 +0800
Subject: [PATCH] workflows/mosey-branch/desktop-session: 2023-08-13 ->
 2023-08-21

---
 .../config/desktop-session/default.nix             | 11 +++++++----
 .../config/desktop-session/meson.build             | 14 ++++++++------
 .../config/desktop-session/mosey-branch.desktop    |  1 -
 .../config/desktop-session/mosey-branch.desktop.in |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix b/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix
index 647bdd41..9643a388 100644
--- a/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix
+++ b/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix
@@ -7,17 +7,16 @@
 , gnome
 
 # This is the prefix used for the installed files in the output.
-, prefix ? "one.foodogsquared.MoseyBranch"
+, prefix ? "one.foodogsquared.MoseyBranch."
 , serviceScript ? "Hyprland"
 
 , agsScript ? "ags"
 , polkitScript ? "polkit"
-, ibusScript ? "ibus start"
 }:
 
 stdenv.mkDerivation rec {
   pname = "mosey-branch-custom-desktop-session";
-  version = "2023-08-13";
+  version = "2023-08-21";
 
   src = ./.;
   nativeBuildInputs = [
@@ -30,7 +29,6 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dservice_script=${serviceScript}"
     "-Dags_script=${agsScript}"
-    "-Dibus_script=${ibusScript}"
     "-Dpolkit_script=${polkitScript}"
   ];
 
@@ -42,6 +40,11 @@ stdenv.mkDerivation rec {
       --prefix PATH : "${lib.makeBinPath [ gnome.gnome-session ]}"
   '';
 
+  postFixup = ''
+    mkdir -p $out/share/wayland-sessions
+    ln -s $out/share/applications/${prefix}desktop $out/share/wayland-sessions
+  '';
+
   meta = with lib; {
     description = "Custom desktop files for the custom desktop environment";
     license = licenses.gpl3Plus;
diff --git a/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build b/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build
index 0ace71a9..c0d241a8 100644
--- a/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build
+++ b/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build
@@ -1,5 +1,5 @@
 project('mosey-branch',
-  version: '2023-08-11',
+  version: '2023-08-21',
   license: 'GPL-3.0-or-later',
   meson_version: '>=0.54.0',
 )
@@ -8,10 +8,11 @@ app_id = 'one.foodogsquared.MoseyBranch'
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
-systemddir = join_paths(prefix, 'share/systemd')
+systemddir = join_paths(datadir, 'systemd')
 applicationsdir = join_paths(datadir, 'applications')
 systemduserdir = join_paths(systemddir, 'user')
-autostartdir = join_paths(prefix, 'etc/xdg/autostart')
+gsd_schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
+autostartdir = join_paths(gsd_schemadir, 'etc', 'autostart')
 unit_name_template = app_id + '.@0@.@1@'
 
 required_components = {
@@ -53,7 +54,7 @@ endforeach
 
 # Installing the Wayland session desktop entry.
 desktopentryconf = configuration_data()
-desktopentryconf.set('session_script', get_option('session_script'))
+desktopentryconf.set('prefix', prefix)
 configure_file(
   input: 'mosey-branch.desktop',
   output: 'mosey-branch.desktop',
@@ -73,6 +74,7 @@ configure_file(
   install: true,
 )
 
+# This is both for the systemd- and non-systemd-managed GNOME sessions.
 serviceconf = configuration_data()
 serviceconf.set('script', get_option('service_script'))
 configure_file(
@@ -94,13 +96,13 @@ configure_file(
 # Setting up for installing with the core services systemd units.
 required_services = []
 foreach name, component : required_components
-  required_services += unit_name_template.format(name, 'target')
+  required_services += app_id + name
 endforeach
 
 gnomesessionconf = configuration_data()
 gnomesessionconf.set(
   'required_components',
-  ';'.join(required_services + [ (app_id + '.target') ]) + ';'
+  ';'.join([ app_id ] + required_services) + ';'
 )
 configure_file(
   input: 'mosey-branch.session',
diff --git a/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop b/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop
index 2836e06c..d9641b52 100644
--- a/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop
+++ b/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop
@@ -3,4 +3,3 @@ Name=Mosey Branch
 Comment=foodogsquared's Hyprland-based desktop environment setup
 Exec=@prefix@/bin/mosey-branch-session
 Type=Application
-DesktopNames=Mosey Branch
diff --git a/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop.in b/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop.in
index 856df2b0..1f9f62d8 100644
--- a/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop.in
+++ b/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop.in
@@ -6,7 +6,7 @@ Exec=@script@
 Categories=wlroots;Core;
 OnlyShowIn=Mosey Branch;
 NoDisplay=true
-X-GNOME-Autostart-Phase=DisplayServer
+X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=windowmanager;
 X-GNOME-Autostart-Notify=true
 X-GNOME-AutoRestart=false