aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ipc/client.rs3
-rw-r--r--src/main.rs5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ipc/client.rs b/src/ipc/client.rs
index 1b44a987..692b39b1 100644
--- a/src/ipc/client.rs
+++ b/src/ipc/client.rs
@@ -1,7 +1,8 @@
use anyhow::{anyhow, bail, Context};
+use niri_ipc::socket::Socket;
use niri_ipc::{
Event, KeyboardLayouts, LogicalOutput, Mode, Output, OutputConfigChanged, Request, Response,
- Socket, Transform,
+ Transform,
};
use serde_json::json;
diff --git a/src/main.rs b/src/main.rs
index bb22e071..4345e81c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,6 +24,7 @@ use niri::utils::spawning::{
use niri::utils::watcher::Watcher;
use niri::utils::{cause_panic, version, IS_SYSTEMD_SERVICE};
use niri_config::Config;
+use niri_ipc::socket::SOCKET_PATH_ENV;
use portable_atomic::Ordering;
use sd_notify::NotifyState;
use smithay::reexports::calloop::EventLoop;
@@ -191,7 +192,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Set NIRI_SOCKET for children.
if let Some(ipc) = &state.niri.ipc_server {
- env::set_var(niri_ipc::SOCKET_PATH_ENV, &ipc.socket_path);
+ env::set_var(SOCKET_PATH_ENV, &ipc.socket_path);
info!("IPC listening on: {}", ipc.socket_path.to_string_lossy());
}
@@ -262,7 +263,7 @@ fn import_environment() {
"WAYLAND_DISPLAY",
"XDG_CURRENT_DESKTOP",
"XDG_SESSION_TYPE",
- niri_ipc::SOCKET_PATH_ENV,
+ SOCKET_PATH_ENV,
]
.join(" ");