bump flake.lock && bump dependencies with appropriate changes to code && change version 1.3.0-dev -> 1.3.0

Author: id3v1669

Cargo.lock

@@ -10,7 +10,7 @@
 rustPlatform.buildRustPackage rec {
 
   pname = "swhkd";
-  version = "1.3.0-dev";
+  version = "1.3.0";
 
   src = lib.cleanSource ./.;
 

flake.lock

@@ -2,33 +2,25 @@
 description = "Sxhkd clone for Wayland (works on TYY and X11 too)"
 edition = "2021"
 name = "Simple-Wayland-HotKey-Daemon"
-version = "1.3.0-dev"
-authors = [
-	"Shinyzenith <aakashsensharma@gmail.com>\n",
-	"Angelo Fallaria <ba.fallaria@gmail.com>\n",
-	"EdenQwQ <lsahlm1eden@gmail.com>\n",
-]
+version = "1.3.0"
 
 [build-dependencies]
-flate2 = "1.0.24"
+flate2 = "1.0.30"
 
 [dependencies]
-clap = { version = "4.1.0", features = ["derive"] }
-env_logger = "0.9.0"
-evdev = { version = "0.12.0", features = ["tokio"] }
-itertools = "0.10.3"
-log = "0.4.14"
-nix = "0.23.1"
-signal-hook = "0.3.13"
+clap = { version = "4.5.8", features = ["derive"] }
+env_logger = "0.11.3"
+evdev = { version = "0.12.2", features = ["tokio"] }
+itertools = "0.13.0"
+log = "0.4.22"
+nix = "0.26.4"
+signal-hook = "0.3.17"
 signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"] }
-sysinfo = "0.23.5"
-tokio = { version = "1.24.2", features = ["full"] }
-tokio-stream = "0.1.8"
+sysinfo = "0.30.12"
+tokio = { version = "1.38.0", features = ["full"] }
+tokio-stream = "0.1.15"
 tokio-udev = "0.9.1"
 
-[features]
-rfkill = []
-
 [[bin]]
 name = "swhkd"
 path = "src/daemon.rs"

swhkd.nix

@@ -164,6 +164,7 @@ impl PartialEq for KeyBinding {
 
 pub trait Prefix {
     fn send(self) -> Self;
+    #[cfg(test)]
     fn on_release(self) -> Self;
 }
 
@@ -189,6 +190,7 @@ impl Prefix for KeyBinding {
         self.send = true;
         self
     }
+    #[cfg(test)]
     fn on_release(mut self) -> Self {
         self.on_release = true;
         self
@@ -241,6 +243,7 @@ impl Prefix for Hotkey {
         self.keybinding.send = true;
         self
     }
+    #[cfg(test)]
     fn on_release(mut self) -> Self {
         self.keybinding.on_release = true;
         self

swhkd/Cargo.toml

@@ -4,7 +4,7 @@ use config::Hotkey;
 use evdev::{AttributeSet, Device, InputEventKind, Key};
 use nix::{
     sys::stat::{umask, Mode},
-    unistd::{Group, Uid},
+    unistd::{Group, Uid}
 };
 use signal_hook::consts::signal::*;
 use signal_hook_tokio::Signals;
@@ -19,7 +19,7 @@ use std::{
     path::{Path, PathBuf},
     process::{exit, id},
 };
-use sysinfo::{ProcessExt, System, SystemExt};
+use sysinfo::System;
 use tokio::select;
 use tokio::time::Duration;
 use tokio::time::{sleep, Instant};
@@ -470,7 +470,7 @@ pub fn setup_swhkd(invoking_uid: u32, runtime_path: String) {
         let mut sys = System::new_all();
         sys.refresh_all();
         for (pid, process) in sys.processes() {
-            if pid.to_string() == swhkd_pid && process.exe() == env::current_exe().unwrap() {
+            if pid.to_string() == swhkd_pid && process.exe() == env::current_exe().unwrap().parent() {
                 log::error!("Swhkd is already running!");
                 log::error!("pid of existing swhkd process: {}", pid.to_string());
                 log::error!("To close the existing swhkd process, run `sudo killall swhkd`");

swhkd/src/config.rs

@@ -3,9 +3,9 @@ use evdev::{
     AttributeSet, Key, RelativeAxisType, SwitchType,
 };
 
-use nix::ioctl_none;
-use std::fs::File;
-use std::os::unix::io::AsRawFd;
+//use nix::ioctl_none;
+//use std::fs::File;
+//use std::os::unix::io::AsRawFd;
 
 #[cfg(feature = "rfkill")]
 ioctl_none!(rfkill_noinput, b'R', 1);

swhkd/src/daemon.rs

@@ -3,19 +3,14 @@ description = "Server for swhkd to run shell commands at invoking user level."
 edition = "2021"
 license = "BSD-2-Clause"
 name = "swhks"
-version = "1.3.0-dev"
-authors = [
-	"Shinyzenith <aakashsensharma@gmail.com>\n",
-	"Angelo Fallaria <ba.fallaria@gmail.com>\n",
-	"EdenQwQ <lsahlm1eden@gmail.com>\n",
-]
+version = "1.3.0"
 
 [dependencies]
-env_logger = "0.9.0"
-log = "0.4.14"
-nix = "0.23.1"
-sysinfo = "0.23.5"
-clap = { version = "4.1.0", features = ["derive"] }
+env_logger = "0.11.3"
+log = "0.4.22"
+nix = "0.26.4"
+sysinfo = "0.30.12"
+clap = { version = "4.5.8", features = ["derive"] }
 
 [[bin]]
 name = "swhks"

swhkd/src/uinput.rs

@@ -13,7 +13,7 @@ use std::{
     path::{Path, PathBuf},
     process::{exit, id, Command, Stdio},
 };
-use sysinfo::{ProcessExt, System, SystemExt};
+use sysinfo::System;
 
 mod environ;
 
@@ -85,7 +85,7 @@ fn main() -> std::io::Result<()> {
         let mut sys = System::new_all();
         sys.refresh_all();
         for (pid, process) in sys.processes() {
-            if pid.to_string() == swhks_pid && process.exe() == env::current_exe().unwrap() {
+            if pid.to_string() == swhks_pid && process.exe() == env::current_exe().unwrap().parent() {
                 log::error!("Server is already running!");
                 exit(1);
             }