clean up imports

src/lib/cli.rs

@@ -1,4 +1,5 @@
 use clap::{ArgAction, Parser, Subcommand, ValueEnum};
+use clap_complete::aot::{generate, Generator, Shell};
 
 #[derive(Parser)]
 #[command(version, about, long_about = None)]
@@ -210,3 +211,4 @@ pub enum ProfileGetCommand {
     #[clap(alias = "i")]
     Icon,
 }
+

src/lib/launch.rs

@@ -4,9 +4,7 @@ use log::debug;
 
 use crate::{
     config::{Profile, Programs},
-    lib::profile::active_profile,
-    lib::sway_ipc::{get_sway_connection, run_sway_command},
-    utils::SDUError,
+    lib::{profile::active_profile, get_sway_connection, run_sway_command, SDUError},
 };
 
 pub fn launch(

src/lib/lock.rs

@@ -16,7 +16,7 @@ use shellexpand::tilde;
 use xdg::BaseDirectories;
 
 use crate::{
-    config::LockConf, lib::sway_ipc::get_sway_connection, utils::DirectoryType, utils::SDUError,
+    config::LockConf, lib::{sway_ipc::get_sway_connection, DirectoryType, SDUError},
 };
 
 #[derive(Serialize, Deserialize, Debug)]

src/lib/mod.rs

@@ -10,6 +10,7 @@ mod sway;
 mod sway_ipc;
 mod windows;
 mod workspaces;
+mod utils;
 
 pub use {
     cli::{Cli, Commands},
@@ -23,4 +24,5 @@ pub use {
     sway_ipc::{get_sway_connection, run_sway_command},
     windows::get_window_info,
     workspaces::get_workspace_info,
+    utils::{setup_runtime_dir, get_xdg_dirs, SDUError, DirectoryType}
 };

src/lib/power.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
-        config::LockConf, lib::cli::PowerCommand, lib::lock_screen,
-        lib::sway_ipc::get_sway_connection, run_sway_command, utils::SDUError,
+        config::LockConf, lib::cli::PowerCommand, 
+        lib::{lock_screen, get_sway_connection, run_sway_command, SDUError},
     },
     dialog::DialogBox,
     log::debug,

src/lib/profile.rs

@@ -5,12 +5,9 @@ use {
         get_xdg_dirs,
         lib::{
             cli::{ProfileCommand, ProfileGetCommand, ProfileSwitchCommand},
-            get, get_sway_connection, run_sway_command, shortcuts_fn,
+            get, get_sway_connection, run_sway_command, shortcuts_fn, SDUError
         },
         setup_runtime_dir,
-        //lib::shortcuts::shortcuts_fn,
-        //lib::sway_ipc::{get_sway_connection, run_sway_command}
-        utils::SDUError,
     },
     log::{debug, error},
     serde_json::json,

src/lib/shortcuts.rs

@@ -3,9 +3,11 @@ use serde_json::json;
 
 use crate::{
     config::ScriptConf,
-    lib::cli::{ShortcutCommand, ShortcutMode},
-    lib::sway_ipc::{get_sway_connection, run_sway_command},
-    utils::SDUError,
+    lib::{
+        cli::{ShortcutCommand, ShortcutMode},
+        sway_ipc::{get_sway_connection, run_sway_command},
+        SDUError,
+    },
 };
 
 fn print_shortcuts(mode: &ShortcutMode, shortcuts: Vec<ScriptConf>) -> String {

src/lib/sway.rs

@@ -6,8 +6,8 @@ use {
             get_scratchpad_info, get_sway_connection, get_window_info, get_workspace_info,
             profile::profile_from_index,
             sway_ipc::{self, get_sway_info},
+            SDUError
         },
-        utils::SDUError,
     },
     log::debug,
     serde_json::json,

src/lib/sway_ipc.rs

@@ -3,14 +3,13 @@ use {
         config::{Profile, WindowIcon},
         lib::{
             cli::SwayGetCommand, get_scratchpad_info, sway::focused_workspace_profile,
-            windows::get_window_info, workspaces::get_workspace_info,
-        },
-        utils::SDUError,
+            windows::get_window_info, workspaces::get_workspace_info, SDUError
+        }
     },
     log::debug,
     serde_json::{Value, json},
     std::time::Instant,
-    swayipc::{Connection, EventType},
+    swayipc::{Connection, EventType}
 };
 
 #[derive(serde::Serialize)]