.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,8 @@
-Replace this text with a description of your changes, and why these changes are important. Read and acknowledge the list below. PRs without a completed checkbox will be closed.
+- [ ] I have disclosed use of any AI generated code in my commit messages.
+  - If you are using an LLM, and do not fully understand the changes it is making to the code base, do not create a PR.
+  - In our experience, AI generated code often results in overly complex code that lacks enough context for a proper fix or feature inclusion. This results in considerably longer code reviews. Due to this, AI authored or partially authored PRs may be closed without comment.
+- [ ] I understand these changes in full and will be able to respond to review comments.
+- [ ] My change is accurately described in the commit message.
+- [ ] My contribution is tested and working as described.
+- [ ] I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions.
 
----
-
-- I have not included any LLM (also known as AI) generated content in this PR, including code, comments, and descriptions.
-- I understand these changes in full and will be able to respond to review comments.
-- My change is accurately described in the commit message.
-- My contribution is tested and working as described.
-- I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions.
-- [ ] I have read and followed all of the above requirements. For more information, see our [contributor guide](https://github.com/pop-os/pop/blob/master/CONTRIBUTING.md).

.github/workflows/require-checklist.yml

@@ -1,14 +0,0 @@
-# From https://github.com/mheap/require-checklist-action, license MIT
-name: Require Checklist
-
-on:
-  pull_request:
-    types: [opened, edited, synchronize]
-
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mheap/require-checklist-action@v2
-        with:
-          requireChecklist: true

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cosmic-session"
 description = "The session manager for the COSMIC desktop environment"
-version = "1.10.0"
+version = "1.3.0"
 license = "GPL-3.0-only"
 edition = "2024"
 rust-version = "1.93"
@@ -46,6 +46,6 @@ logind-zbus = { version = "5.3.2", optional = true }
 
 [features]
 systemd = ["dep:zbus_systemd", "dep:tracing-journald"]
-logind = ["dep:logind-zbus"]
+logind = ["systemd", "logind-zbus"]
-default = ["logind", "systemd"]
+default = ["logind"]
 autostart = ["dep:shell-words", "dep:dirs", "dep:freedesktop-desktop-entry"]

cargo.just

@@ -1,70 +0,0 @@
-cargo-target-dir := env('CARGO_TARGET_DIR', 'target')
-
-# Compile with debug profile
-[no-cd]
-build-debug *args:
-    cargo build {{args}}
-
-# Compile with release profile
-[no-cd]
-build-release *args: (build-debug '--release' args)
-
-# Compile with a vendored tarball
-[no-cd]
-build-vendored *args: vendor-extract (build-release '--frozen --offline' args)
-
-# Check for errors and linter warnings
-[no-cd]
-check *args:
-    cargo clippy --all-features {{args}} -- -W clippy::pedantic
-
-# Runs a check with JSON message format for IDE integration
-[no-cd]
-check-json: (check '--message-format=json')
-
-# Remove Cargo build artifacts
-[no-cd]
-clean:
-    cargo clean
-
-# Also remove .cargo and vendored dependencies
-[no-cd]
-clean-dist: clean
-    rm -rf .cargo vendor vendor.tar target
-
-# Run the application for testing purposes
-[no-cd]
-run *args:
-    cargo run {{args}}
-
-# Run `cargo test`
-[no-cd]
-test *args:
-    cargo test {{args}}
-
-# Vendor Cargo dependencies locally
-[no-cd]
-vendor:
-    #!/usr/bin/env bash
-    mkdir -p .cargo
-    cargo vendor --locked | head -n -1 > .cargo/config.toml
-    echo 'directory = "vendor"' >> .cargo/config.toml
-    echo >> .cargo/config.toml
-    echo '[env]' >> .cargo/config.toml
-    if [ -n "${SOURCE_DATE_EPOCH}" ]
-    then
-        source_date="$(date -d "@${SOURCE_DATE_EPOCH}" "+%Y-%m-%d")"
-        echo "VERGEN_GIT_COMMIT_DATE = \"${source_date}\"" >> .cargo/config.toml
-    fi
-    if [ -n "${SOURCE_GIT_HASH}" ]
-    then
-        echo "VERGEN_GIT_SHA = \"${SOURCE_GIT_HASH}\"" >> .cargo/config.toml
-    fi
-    tar pcf vendor.tar .cargo vendor
-    rm -rf .cargo vendor
-
-# Extracts vendored dependencies
-[no-cd]
-vendor-extract:
-    rm -rf vendor
-    tar pxf vendor.tar

data/start-cosmic

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -23,8 +23,8 @@ fi
 if [ -n "${SHELL}" ]; then
     # --in-login-shell: our flag to indicate that we don't need to recurse any further
     if [ "${1}" != "--in-login-shell" ]; then
-        # `-l`: start $SHELL as a login shell so it sources the user's profile.
+        # `exec -l`: like `login`, prefixes $SHELL with a hyphen to start a login shell
-        exec "${SHELL}" -l -c "${0} --in-login-shell"
+        exec bash -c "exec -l '${SHELL}' -c '${0} --in-login-shell'"
     fi
 fi
 
@@ -42,7 +42,7 @@ export DCONF_PROFILE=cosmic
 # Set the QT platform theme to CuteCosmic. Fallback to qt6ct if CuteCosmic is not installed.
 if [ -z "$QT_QPA_PLATFORMTHEME" ]; then
     export QT_QPA_PLATFORMTHEME=cosmic
-    for QT_PLUGIN_PATH in /usr/lib*/qt6/plugins /usr/lib/*/qt6/plugins; do
+    for QT_PLUGIN_PATH in /usr/lib{*,/*}/qt6/plugins; do
         if [ -f "${QT_PLUGIN_PATH}/platformthemes/libcutecosmictheme.so" ]; then
             # CuteCosmic found, no need for a fallback.
             export QT_QPA_PLATFORMTHEME=cosmic
@@ -56,8 +56,8 @@ if [ -z "$QT_QPA_PLATFORMTHEME" ]; then
 fi
 
 # Start gnome keyring components if the daemon is active
-# -> check if $XDG_RUNTIME_DIR/keyring exists
+# -> check if /run/user/$UID/keyring exists
-if [ -d "$XDG_RUNTIME_DIR/keyring" ]; then
+if [ -d "/run/user/$(id -u)/keyring" ]; then
 
     # Use PATH lookup instead of hardcoding /usr/bin
     if command -v gnome-keyring-daemon >/dev/null 2>&1; then
@@ -66,14 +66,13 @@ if [ -d "$XDG_RUNTIME_DIR/keyring" ]; then
         echo "gnome-keyring-daemon not found in PATH" >&2
     fi
 
-    # Preserve an SSH agent configured by the user. Otherwise, use a
+    # Only set SSH_AUTH_SOCK if the socket actually exists. Either
-    # Gnome Keyring SSH socket if one exists.
+    # set the correct one, or don't set one at all. Don't set the
-    if [ -z "$SSH_AUTH_SOCK" ]; then
+    # wrong value.
-        if [ -S "$XDG_RUNTIME_DIR/gcr/ssh" ]; then
+    if [ -S "/run/user/$(id -u)/gcr/ssh" ]; then
-            export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
+        export SSH_AUTH_SOCK="/run/user/$(id -u)/gcr/ssh"
-        elif [ -S "$XDG_RUNTIME_DIR/keyring/ssh" ]; then
+    elif [ -S "/run/user/$(id -u)/keyring/ssh" ]; then
-            export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/keyring/ssh"
+        export SSH_AUTH_SOCK="/run/user/$(id -u)/keyring/ssh"
-        fi
     fi
 fi
 
@@ -85,26 +84,30 @@ if command -v systemctl >/dev/null; then
     # For environment variables already imported into the user's
     # session, if the value imported differs from the value in this
     # environment, update it.
-    systemctl --user show-environment | while IFS= read -r env_var; do
+    mapfile -t existing_env_vars < <(systemctl --user show-environment)
+    for env_var in "${existing_env_vars[@]}"; do
         env_var_name="${env_var%%=*}"
-        env_var_value="$(printenv "${env_var_name}" || true)"
+        env_var_value=${!env_var_name:-}
 
         # Skip current iteration if the environment variable's value
         # in the current envionment is unset.
-        if [ -z "${env_var_value}" ]; then
+        if [[ -z "${env_var_value}" ]]; then
             continue
         fi
 
-        # Skip updating variables where systemd already holds this exact value.
+        env_var_val_str_to_compare="${env_var_name}=${env_var_value}"
-        if [ "${env_var}" = "${env_var_name}=${env_var_value}" ]; then
+        env_var_val_str_to_compare_ansi_c_quoted="${env_var_name}=\$'$(printf '%q' "${env_var_value}")'"
+        if [[ "${env_var}" == "${env_var_val_str_to_compare}" ]]; then
+            continue
+        elif [[ "${env_var}" == "${env_var_val_str_to_compare_ansi_c_quoted}" ]]; then
             continue
         fi
-        systemctl --user import-environment "${env_var_name}" || true
+        systemctl --user import-environment "${env_var_name}" ||:
     done
 fi
 
 # Run cosmic-session
-if [ -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
+if [[ -z "${DBUS_SESSION_BUS_ADDRESS}" ]]; then
     exec /usr/bin/dbus-run-session -- /usr/bin/cosmic-session
 else
     exec /usr/bin/cosmic-session

debian/changelog

@@ -1,15 +1,3 @@
-cosmic-session (1.10.0) noble; urgency=medium
-
-  * Epoch 1.10.0 version update
-
- -- Michael Murphy <michael@mmurphy.dev>  Mon, 05 Oct 2026 21:26:30 +0200
-
-cosmic-session (1.9.0) noble; urgency=medium
-
-  * Epoch 1.9.0 version update
-
- -- Michael Murphy <michael@mmurphy.dev>  Mon, 14 Sep 2026 17:54:45 +0200
-
 cosmic-session (1.0.0) noble; urgency=medium
 
   * Initial release

debian/control

@@ -27,7 +27,6 @@ Depends:
   cosmic-launcher,
   cosmic-notifications,
   cosmic-osd,
-  cosmic-osk,
   cosmic-panel,
   cosmic-randr,
   cosmic-screenshot,
@@ -47,7 +46,6 @@ Recommends:
   cosmic-player,
   cosmic-store,
   cosmic-term,
-  cosmic-viewer,
   cosmic-wallpapers,
   orca,
   system-config-printer,

debian/source/options

@@ -1,6 +0,0 @@
-tar-ignore=.github
-tar-ignore=target/.rustc_info.json
-tar-ignore=target/CACHEDIR.TAG
-tar-ignore=target/debug
-tar-ignore=target/release
-tar-ignore=vendor

flake.lock

@@ -1,12 +1,17 @@
 {
   "nodes": {
     "crane": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1788465171,
+        "lastModified": 1702141249,
-        "narHash": "sha256-Y1/TTVXjYXGF068IThQH9fPSZ0SIE74PABlUxnWTUH0=",
+        "narHash": "sha256-8wDpJKbDTDqFmyJfNEJOLrHYDoEzCjCbmz+lSRoU3CI=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "eb35abda9f232cc6610b1d1e3200d15c49b7ac54",
+        "rev": "62fc1a0cbe144c1014d956e603d56bf1ffe69c7d",
         "type": "github"
       },
       "original": {
@@ -23,11 +28,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1788865058,
+        "lastModified": 1702189261,
-        "narHash": "sha256-ZkvwEHlSa46BkODMEwHCEh9hlUC2igneJ+noEUn9ww4=",
+        "narHash": "sha256-TN6gE1eZddDhAoRrScV6Wji1Nk3uqMIDjGwN5ZesAZk=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "9efa138447c5773995d98d9aafa9eba4982aceab",
+        "rev": "cae060dbaf53430bb2b549ced0affd54d40e6cee",
         "type": "github"
       },
       "original": {
@@ -41,11 +46,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1701680307,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -56,11 +61,11 @@
     },
     "nix-filter": {
       "locked": {
-        "lastModified": 1757882181,
+        "lastModified": 1701697642,
-        "narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=",
+        "narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=",
         "owner": "numtide",
         "repo": "nix-filter",
-        "rev": "59c44d1909c72441144b93cf0f054be7fe764de5",
+        "rev": "c843418ecfd0344ecb85844b082ff5675e02c443",
         "type": "github"
       },
       "original": {
@@ -71,11 +76,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1788865024,
+        "lastModified": 1702206697,
-        "narHash": "sha256-3YkAzvtt4LoE11IcBDzPshIF3fJ0aIoILqE7dAg8CLI=",
+        "narHash": "sha256-vE9oEx3Y8TO5MnWwFlmopjHd1JoEBno+EhsfUCq5iR8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "422d1ae605d7fcd9896412b37dc065c456c0eefb",
+        "rev": "29d6c96900b9b576c2fb89491452f283aa979819",
         "type": "github"
       },
       "original": {
@@ -97,11 +102,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1788794694,
+        "lastModified": 1702153490,
-        "narHash": "sha256-FROpcpM2ELawfxhW8cWuz8m3dp/0EFAFCiK+AbNw95w=",
+        "narHash": "sha256-F98s0+mUHtqiUk9iCApPTy23YMLmcKqTfsShpIPB40Q=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "48d839420745124e85140234ce783ccd90dab24e",
+        "rev": "9d87a23cdef6087c1a0c97980949e2310271a941",
         "type": "github"
       },
       "original": {

flake.nix

@@ -7,6 +7,7 @@
     nix-filter.url = "github:numtide/nix-filter";
     crane = {
       url = "github:ipetkov/crane";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     fenix = {
       url = "github:nix-community/fenix";
@@ -18,7 +19,7 @@
     flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        craneLib = (crane.mkLib pkgs).overrideToolchain fenix.packages.${system}.stable.toolchain;
+        craneLib = crane.lib.${system}.overrideToolchain fenix.packages.${system}.stable.toolchain;
 
         pkgDef = {
           nativeBuildInputs = with pkgs; [ just pkg-config autoPatchelfHook ];
@@ -46,7 +47,7 @@
           inherit cosmic-session;
         };
 
-        packages.default = cosmic-session.overrideAttrs (oldAttrs:  {
+        packages.default = cosmic-session.overrideAttrs (oldAttrs: rec {
         buildPhase = ''
             just prefix=$out xdp_cosmic=/run/current-system/sw/bin/xdg-desktop-portal-cosmic build 
           '';

src/comp.rs

@@ -99,7 +99,6 @@ pub fn run_compositor(
 	process_manager: &ProcessManager,
 	exec: String,
 	args: Vec<String>,
-	env: Vec<(String, String)>,
 	_token: CancellationToken,
 	env_tx: oneshot::Sender<HashMap<String, String>>,
 	session_dbus_tx: mpsc::Sender<SessionRequest>,
@@ -120,26 +119,15 @@ pub fn run_compositor(
 		OwnedFd::from(std_stream)
 	};
 	mark_as_not_cloexec(&comp).expect("Failed to mark fd as not cloexec");
-
 	Ok(tokio::spawn(async move {
 		// Create a new process handler for cosmic-comp, with our compositor socket's
 		// file descriptor as the `COSMIC_SESSION_SOCK` environment variable.
-		let mut comp_env = env;
-		comp_env.push((
-			"COSMIC_SESSION_SOCK".to_string(),
-			comp.as_raw_fd().to_string(),
-		));
-		// NVIDIA keeps a growing pool of pre-rendered compositor frames
-		// (smithay#1562 / cosmic-comp#1179). Cap it to a single buffer.
-		if std::path::Path::new("/proc/driver/nvidia").exists() {
-			comp_env.push(("__GL_MaxFramesAllowed".to_string(), "1".to_string()));
-		}
 		process_manager
 			.start_process(
 				Process::new()
 					.with_executable(exec)
 					.with_args(args)
-					.with_env(comp_env)
+					.with_env([("COSMIC_SESSION_SOCK", comp.as_raw_fd().to_string())])
 					.with_on_exit(move |pman, _, err_code, _will_restart| {
 						let session_dbus_tx = session_dbus_tx.clone();
 						async move {

src/main.rs

@@ -7,7 +7,6 @@ mod comp;
 mod notifications;
 mod process;
 mod service;
-#[cfg(feature = "systemd")]
 mod systemd;
 
 use color_eyre::Result;
@@ -16,13 +15,17 @@ use launch_pad::ProcessManager;
 use launch_pad::process::Process;
 use service::SessionRequest;
 use std::borrow::Cow;
+#[cfg(feature = "autostart")]
+use std::collections::HashSet;
 use std::env;
 use std::os::fd::AsRawFd;
+#[cfg(feature = "autostart")]
+use std::path::PathBuf;
+#[cfg(feature = "autostart")]
+use std::process::{Command, Stdio};
 use std::sync::Arc;
-#[cfg(any(feature = "autostart", feature = "systemd"))]
-use std::{path::Path, sync::OnceLock};
 #[cfg(feature = "systemd")]
-use systemd::{get_systemd_env, spawn_scope};
+use systemd::{get_systemd_env, is_systemd_used, spawn_scope};
 use tokio::signal::unix::{SignalKind, signal};
 use tokio::sync::mpsc::{Receiver, Sender};
 use tokio::sync::{Mutex, oneshot};
@@ -32,30 +35,17 @@ use tracing::Instrument;
 use tracing::metadata::LevelFilter;
 use tracing_subscriber::prelude::*;
 use tracing_subscriber::{EnvFilter, fmt};
-#[cfg(feature = "autostart")]
-use {
-	std::collections::HashSet,
-	std::path::PathBuf,
-	std::process::{Command, Stdio},
-};
 
 use crate::notifications::{
 	DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD, notifications_process,
 };
 #[cfg(feature = "autostart")]
-const AUTOSTART_DIR: &str = "autostart";
+const AUTOSTART_DIR: &'static str = "autostart";
 #[cfg(feature = "autostart")]
-const ENVIRONMENT_NAME: &str = "COSMIC";
+const ENVIRONMENT_NAME: &'static str = "COSMIC";
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<()> {
-	if let Some(arg) = env::args().nth(1)
-		&& (arg == "--version" || arg == "-V")
-	{
-		println!("cosmic-session {}", env!("CARGO_PKG_VERSION"));
-		return Ok(());
-	}
-
 	color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
 
 	let trace = tracing_subscriber::registry();
@@ -145,20 +135,10 @@ async fn start(
 		.await;
 	let token = CancellationToken::new();
 	let (env_tx, env_rx) = oneshot::channel();
-
-	#[cfg(feature = "systemd")]
-	let systemd_env = if *is_systemd_used() {
-		get_systemd_env().await
-	} else {
-		Vec::new()
-	};
-	#[cfg(not(feature = "systemd"))]
-	let systemd_env = Vec::new();
 	let compositor_handle = comp::run_compositor(
 		&process_manager,
 		executable.clone(),
 		args,
-		systemd_env.clone(),
 		token.child_token(),
 		env_tx,
 		session_tx,
@@ -176,49 +156,69 @@ async fn start(
 	);
 
 	// now that cosmic-comp is ready, set XDG_SESSION_TYPE=wayland for new processes
-	env_vars.extend(
+	env_vars.push(("XDG_SESSION_TYPE".to_string(), "wayland".to_string()));
-		systemd_env
-			.into_iter()
-			.chain([("XDG_SESSION_TYPE".to_string(), "wayland".to_string())]),
-	);
-	#[cfg(feature = "systemd")]
 	systemd::set_systemd_environment("XDG_SESSION_TYPE", "wayland").await;
 
-	// expose the session version
-	env_vars.push((
-		"COSMIC_VERSION".to_string(),
-		env!("CARGO_PKG_VERSION").to_string(),
-	));
 	#[cfg(feature = "systemd")]
-	systemd::set_systemd_environment("COSMIC_VERSION", env!("CARGO_PKG_VERSION")).await;
+	let _inhibit_fd = if *is_systemd_used() {
-
+		match get_systemd_env().await {
-	#[cfg(feature = "logind")]
+			Ok(env) => {
-	let _inhibit_fd = match zbus::Connection::system().await {
+				for systemd_env in env {
-		Ok(connection) => match logind_zbus::manager::ManagerProxy::new(&connection).await {
+					// Only update the envvar if unset
-			Ok(proxy) => match proxy
+					if std::env::var_os(&systemd_env.key).is_none() {
-				.inhibit(
+						// Blacklist of envvars that we shouldn't touch (taken from KDE)
-					logind_zbus::manager::InhibitType::HandlePowerKey,
+						if (!systemd_env.key.starts_with("XDG_")
-					"Cosmic Session",
+							|| systemd_env.key == "XDG_DATA_DIRS"
-					"Show confirmation dialog.",
+							|| systemd_env.key == "XDG_CONFIG_DIRS")
-					"block",
+							&& systemd_env.key != "DISPLAY"
-				)
+							&& systemd_env.key != "XAUTHORITY"
-				.await
+							&& systemd_env.key != "WAYLAND_DISPLAY"
-			{
+							&& systemd_env.key != "WAYLAND_SOCKET"
-				Ok(fd) => Some(fd),
+							&& systemd_env.key != "_"
+							&& systemd_env.key != "SHELL"
+							&& systemd_env.key != "SHLVL"
+						{
+							env_vars.push((systemd_env.key, systemd_env.value));
+						}
+					}
+				}
+			}
+			Err(err) => {
+				warn!("Failed to sync systemd environment {}.", err);
+			}
+		};
+		#[cfg(feature = "logind")]
+		match zbus::Connection::system().await {
+			Ok(connection) => match logind_zbus::manager::ManagerProxy::new(&connection).await {
+				Ok(proxy) => match proxy
+					.inhibit(
+						logind_zbus::manager::InhibitType::HandlePowerKey,
+						"Cosmic Session",
+						"Show confirmation dialog.",
+						"block",
+					)
+					.await
+				{
+					Ok(fd) => Some(fd),
+					Err(err) => {
+						error!("Failed to inhibit power key {err:?}");
+						None
+					}
+				},
 				Err(err) => {
-					error!("Failed to inhibit power key {err:?}");
+					error!("Failed to connect to logind manager {err:?}");
 					None
 				}
 			},
 			Err(err) => {
-				error!("Failed to connect to logind manager {err:?}");
+				error!("Failed to connect to system dbus {err:?}");
 				None
 			}
-		},
-		Err(err) => {
-			error!("Failed to connect to system dbus {err:?}");
-			None
 		}
+		#[cfg(not(feature = "logind"))]
+		None
+	} else {
+		None
 	};
 
 	let (settings_exit_tx, settings_exit_rx) = oneshot::channel();
@@ -245,10 +245,8 @@ async fn start(
 	// - cosmic-comp is ready
 	// - we've set any related variables
 	// - cosmic-settings-daemon is ready
-	#[cfg(feature = "systemd")]
 	systemd::start_systemd_target().await;
 	// Always stop the target when the process exits or panics.
-	#[cfg(feature = "systemd")]
 	scopeguard::defer! {
 		systemd::stop_systemd_target();
 	}
@@ -326,9 +324,6 @@ async fn start(
 	let span = info_span!(parent: None, "cosmic-osd");
 	start_component("cosmic-osd", span, &process_manager, &env_vars).await;
 
-	let span = info_span!(parent: None, "cosmic-osk");
-	start_component("cosmic-osk", span, &process_manager, &env_vars).await;
-
 	let span = info_span!(parent: None, "cosmic-bg");
 	start_component("cosmic-bg", span, &process_manager, &env_vars).await;
 
@@ -381,17 +376,17 @@ async fn start(
 			}
 
 			// skip if we have an OnlyShowIn entry that doesn't include COSMIC
-			if let Some(only_show_in) = entry.only_show_in()
+			if let Some(only_show_in) = entry.only_show_in() {
-				&& !only_show_in.contains(&ENVIRONMENT_NAME)
+				if !only_show_in.contains(&ENVIRONMENT_NAME) {
-			{
+					continue;
-				continue;
+				}
 			}
 
 			// ... OR we have a NotShowIn entry that includes COSMIC
-			if let Some(not_show_in) = entry.not_show_in()
+			if let Some(not_show_in) = entry.not_show_in() {
-				&& not_show_in.contains(&ENVIRONMENT_NAME)
+				if not_show_in.contains(&ENVIRONMENT_NAME) {
-			{
+					continue;
-				continue;
+				}
 			}
 
 			info!(
@@ -410,7 +405,7 @@ async fn start(
 						.collect::<Vec<_>>();
 
 					// escape them
-					let escaped_args = shell_words::split(&filtered_args.join(" "));
+					let escaped_args = shell_words::split(&*filtered_args.join(" "));
 					if let Ok(args) = escaped_args {
 						info!("trying to start {} {}", program_name, args.join(" "));
 
@@ -652,11 +647,3 @@ async fn start_component(
 		error!("failed to start {}: {}", cmd, err);
 	}
 }
-
-/// Determine if systemd is used as the init system. This should work on all
-/// linux distributions.
-#[cfg(any(feature = "autostart", feature = "systemd"))]
-fn is_systemd_used() -> &'static bool {
-	static IS_SYSTEMD_USED: OnceLock<bool> = OnceLock::new();
-	IS_SYSTEMD_USED.get_or_init(|| Path::new("/run/systemd/system").exists())
-}

src/systemd.rs

@@ -1,9 +1,28 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+use std::path::Path;
 use std::process::{Command, Stdio};
+use std::sync::OnceLock;
 
 use zbus::Connection;
 use zbus::zvariant::{Array, OwnedValue};
+
+#[derive(Debug)]
+pub struct EnvVar {
+	pub key: String,
+	pub value: String,
+}
+
+impl From<(&str, &str)> for EnvVar {
+	fn from(val: (&str, &str)) -> Self {
+		EnvVar {
+			key: val.0.to_owned(),
+			value: val.1.to_owned(),
+		}
+	}
+}
+
+#[cfg(feature = "systemd")]
 use zbus_systemd::systemd1::ManagerProxy as SystemdManagerProxy;
 
 pub async fn set_systemd_environment(key: &str, value: &str) {
@@ -27,44 +46,29 @@ pub fn stop_systemd_target() {
 	)
 }
 
-async fn load_systemd_env() -> zbus::Result<Vec<String>> {
+/// Determine if systemd is used as the init system. This should work on all
+/// linux distributions.
+pub fn is_systemd_used() -> &'static bool {
+	static IS_SYSTEMD_USED: OnceLock<bool> = OnceLock::new();
+	IS_SYSTEMD_USED.get_or_init(|| Path::new("/run/systemd/system").exists())
+}
+
+#[cfg(feature = "systemd")]
+pub async fn get_systemd_env() -> Result<Vec<EnvVar>, zbus::Error> {
 	let connection = Connection::session().await?;
 	let systemd_manager = SystemdManagerProxy::new(&connection).await?;
-	systemd_manager.environment().await
+	let systemd_env = systemd_manager.environment().await?;
-}
 
-/// Get the systemd user manager environment variables.
+	let mut out: Vec<EnvVar> = Vec::new();
-pub async fn get_systemd_env() -> Vec<(String, String)> {
+	for i in systemd_env {
-	match load_systemd_env().await {
+		if let Some(b) = i.split_once("=") {
-		Ok(env) => {
+			out.push(b.into());
-			env.iter()
-				// split into key value pairs
-				.filter_map(|var| var.split_once("="))
-				.filter(|&(key, _value)| {
-					// Only update the envvar if unset
-					std::env::var_os(key).is_none()
-                              // Blocklist of envvars that we shouldn't touch (taken from KDE)
-                              && (!key.starts_with("XDG_")
-                                      || key == "XDG_DATA_DIRS"
-                                      || key == "XDG_CONFIG_DIRS")
-                              && key != "DISPLAY"
-                              && key != "XAUTHORITY"
-                              && key != "WAYLAND_DISPLAY"
-                              && key != "WAYLAND_SOCKET"
-                              && key != "_"
-                              && key != "SHELL"
-                              && key != "SHLVL"
-				})
-				.map(|(key, value)| (key.to_owned(), value.to_owned()))
-				.collect()
-		}
-		Err(err) => {
-			warn!("Failed to sync systemd environment {}.", err);
-			Vec::new()
 		}
 	}
+	Ok(out)
 }
 
+#[cfg(feature = "systemd")]
 /// Spawn a systemd scope unit with the given name and PIDs.
 pub async fn spawn_scope(mut command: String, pids: Vec<u32>) -> Result<(), zbus::Error> {
 	let connection = Connection::session().await?;