leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge: epoch-1.9.0 d'upstream

Browse source 
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	data/cosmic-mimeapps.list
This commit is contained in:
Lionel DARNIS 2026-09-24 20:50:58 +02:00
commit d1f2851ec7
8 changed files with 244 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

623
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "cosmic-session" name = "cosmic-session"
description = "The session manager for the COSMIC desktop environment" description = "The session manager for the COSMIC desktop environment"
version = "1.3.0" version = "1.9.0"
license = "GPL-3.0-only" license = "GPL-3.0-only"
edition = "2024" edition = "2024"
rust-version = "1.93" rust-version = "1.93"

2
data/start-cosmic
View file

@ -24,7 +24,7 @@ if [ -n "${SHELL}" ]; then
# --in-login-shell: our flag to indicate that we don't need to recurse any further # --in-login-shell: our flag to indicate that we don't need to recurse any further
if [ "${1}" != "--in-login-shell" ]; then if [ "${1}" != "--in-login-shell" ]; then
# `-l`: start $SHELL as a login shell so it sources the user's profile. # `-l`: start $SHELL as a login shell so it sources the user's profile.
exec "${SHELL}" -l -c "'${0}' --in-login-shell" exec "${SHELL}" -l -c "${0} --in-login-shell"
fi fi
fi fi

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
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 cosmic-session (1.0.0) noble; urgency=medium
* Initial release * Initial release

2
debian/control vendored
View file

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

41
flake.lock generated
View file

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

5
flake.nix
View file

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

20
src/main.rs
View file

@ -24,8 +24,9 @@ use std::path::PathBuf;
#[cfg(feature = "autostart")] #[cfg(feature = "autostart")]
use std::process::{Command, Stdio}; use std::process::{Command, Stdio};
use std::sync::Arc; use std::sync::Arc;
use systemd::is_systemd_used;
#[cfg(feature = "systemd")] #[cfg(feature = "systemd")]
use systemd::{get_systemd_env, is_systemd_used, spawn_scope}; use systemd::{get_systemd_env, spawn_scope};
use tokio::signal::unix::{SignalKind, signal}; use tokio::signal::unix::{SignalKind, signal};
use tokio::sync::mpsc::{Receiver, Sender}; use tokio::sync::mpsc::{Receiver, Sender};
use tokio::sync::{Mutex, oneshot}; use tokio::sync::{Mutex, oneshot};
@ -46,6 +47,13 @@ const ENVIRONMENT_NAME: &'static str = "COSMIC";
#[tokio::main(flavor = "current_thread")] #[tokio::main(flavor = "current_thread")]
async fn main() -> Result<()> { 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")?; color_eyre::install().wrap_err("failed to install color_eyre error handler")?;
let trace = tracing_subscriber::registry(); let trace = tracing_subscriber::registry();
@ -159,6 +167,13 @@ async fn start(
env_vars.push(("XDG_SESSION_TYPE".to_string(), "wayland".to_string())); env_vars.push(("XDG_SESSION_TYPE".to_string(), "wayland".to_string()));
systemd::set_systemd_environment("XDG_SESSION_TYPE", "wayland").await; 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(),
));
systemd::set_systemd_environment("COSMIC_VERSION", env!("CARGO_PKG_VERSION")).await;
#[cfg(feature = "systemd")] #[cfg(feature = "systemd")]
let _inhibit_fd = if *is_systemd_used() { let _inhibit_fd = if *is_systemd_used() {
match get_systemd_env().await { match get_systemd_env().await {
@ -324,6 +339,9 @@ async fn start(
let span = info_span!(parent: None, "cosmic-osd"); let span = info_span!(parent: None, "cosmic-osd");
start_component("cosmic-osd", span, &process_manager, &env_vars).await; 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"); let span = info_span!(parent: None, "cosmic-bg");
start_component("cosmic-bg", span, &process_manager, &env_vars).await; start_component("cosmic-bg", span, &process_manager, &env_vars).await;