`8661e62`

fix compositor kill: use pkill -f for NixOS wrappers, kill garchomp on exit

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: 8661e62f824ad214065773a508140c9529baa455
Parents: 772a119
Tree: 0d1f974

3 changed files

Status	File	+	-
M	`.gitignore`	1	0
M	`gar/src/config/mod.rs`	9	8
M	`gar/src/x11/events.rs`	7	4

.gitignoremodified

  docs/
  target/
  CLAUDE.md
 +flake.lock

gar/src/config/mod.rsmodified

                  // picom will be started by write_picom_config -> reload_picom
+             }
              "garchomp" => {
 -                // Kill any existing compositor first
 -                let _ = Command::new("pkill").arg("picom").status();
 -                let _ = Command::new("pkill").arg("garchomp").status();
 +                // Kill any existing compositor first (use -f for NixOS wrappers)
 +                let _ = Command::new("pkill").args(["-f", "picom"]).status();
 +                let _ = Command::new("pkill").args(["-f", "garchomp"]).status();
                  std::thread::sleep(std::time::Duration::from_millis(100));
+             }
              "none" => {
                  tracing::info!("Compositor disabled (compositor=none)");
 -                // Kill any running compositor
 -                let _ = Command::new("pkill").arg("picom").status();
 -                let _ = Command::new("pkill").arg("garchomp").status();
 +                // Kill any running compositor (use -f for NixOS wrappers)
 +                let _ = Command::new("pkill").args(["-f", "picom"]).status();
 +                let _ = Command::new("pkill").args(["-f", "garchomp"]).status();
+             }
              _ => {
                  tracing::warn!("Unknown compositor '{}', defaulting to picom", self.compositor);
      /// Stop any running compositor.
      pub fn stop_compositor() {
          use std::process::Command;
 -        let _ = Command::new("pkill").arg("picom").status();
 -        let _ = Command::new("pkill").arg("garchomp").status();
 +        // Use -f to match full command line (needed for NixOS wrappers)
 +        let _ = Command::new("pkill").args(["-f", "picom"]).status();
 +        let _ = Command::new("pkill").args(["-f", "garchomp"]).status();
+     }
      /// Apply screen timeout/DPMS settings using xset

gar/src/x11/events.rsmodified

+         }
          self.garnotify_process = None;
 -        // Kill picom to prevent compositor effects from bleeding into the greeter
 -        tracing::info!("Killing picom...");
 +        // Kill compositor to prevent overlay from bleeding into the greeter
 +        tracing::info!("Killing compositor...");
 +        // Use -f to match against full command line (needed for NixOS wrappers)
          let _ = std::process::Command::new("pkill")
 -            .arg("-x")
 -            .arg("picom")
 +            .args(["-f", "garchomp"])
 +            .status();
 +        let _ = std::process::Command::new("pkill")
 +            .args(["-f", "picom"])
              .status();
          // Signal systemd that graphical session has ended