From f7116d268aff3fae88d8de408e8c807295618a5c Mon Sep 17 00:00:00 2001 From: delta Date: Tue, 4 Apr 2023 15:43:40 +0200 Subject: restructure and improve config --- .config/awesome/ui/fresnel/lenses/.gitignore | 2 - .config/awesome/ui/fresnel/lenses/Cargo.toml | 18 ---- .config/awesome/ui/fresnel/lenses/install.log | 10 -- .config/awesome/ui/fresnel/lenses/liblenses.so | 1 - .config/awesome/ui/fresnel/lenses/rustfmt.toml | 3 - .../awesome/ui/fresnel/lenses/src/application.rs | 107 --------------------- .../awesome/ui/fresnel/lenses/src/calculator.rs | 25 ----- .config/awesome/ui/fresnel/lenses/src/entry.rs | 20 ---- .config/awesome/ui/fresnel/lenses/src/lib.rs | 16 --- 9 files changed, 202 deletions(-) delete mode 100644 .config/awesome/ui/fresnel/lenses/.gitignore delete mode 100644 .config/awesome/ui/fresnel/lenses/Cargo.toml delete mode 100644 .config/awesome/ui/fresnel/lenses/install.log delete mode 120000 .config/awesome/ui/fresnel/lenses/liblenses.so delete mode 100644 .config/awesome/ui/fresnel/lenses/rustfmt.toml delete mode 100644 .config/awesome/ui/fresnel/lenses/src/application.rs delete mode 100644 .config/awesome/ui/fresnel/lenses/src/calculator.rs delete mode 100644 .config/awesome/ui/fresnel/lenses/src/entry.rs delete mode 100644 .config/awesome/ui/fresnel/lenses/src/lib.rs (limited to '.config/awesome/ui/fresnel/lenses') diff --git a/.config/awesome/ui/fresnel/lenses/.gitignore b/.config/awesome/ui/fresnel/lenses/.gitignore deleted file mode 100644 index 4fffb2f..0000000 --- a/.config/awesome/ui/fresnel/lenses/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/Cargo.lock diff --git a/.config/awesome/ui/fresnel/lenses/Cargo.toml b/.config/awesome/ui/fresnel/lenses/Cargo.toml deleted file mode 100644 index 4dcb8bc..0000000 --- a/.config/awesome/ui/fresnel/lenses/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "lenses" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -freedesktop_entry_parser = "1.3.0" -meval = "0.2.0" -mlua = { version = "0.8.7", features = [ "module", "lua54", "serialize" ] } -parking_lot = "0.12.1" -rayon = "1.6.1" -serde = { version = "1.0.152", features = [ "derive" ] } -url = "2.3.1" - -[lib] -crate-type = ["cdylib"] diff --git a/.config/awesome/ui/fresnel/lenses/install.log b/.config/awesome/ui/fresnel/lenses/install.log deleted file mode 100644 index c0f5d63..0000000 --- a/.config/awesome/ui/fresnel/lenses/install.log +++ /dev/null @@ -1,10 +0,0 @@ -[03:45:24 2023-02-24] FETCHING Version 2.16.1 -[03:45:24 2023-02-24] CREATING /home/delta/.spicetify -[03:45:24 2023-02-24] DOWNLOADING https://github.com/spicetify/spicetify-cli/releases/download/v2.16.1/spicetify-2.16.1-linux-amd64.tar.gz -[03:45:34 2023-02-24] EXTRACTING /home/delta/.spicetify/spicetify.tar.gz -[03:45:34 2023-02-24] SETTING EXECUTABLE PERMISSIONS TO /home/delta/.spicetify/spicetify -[03:45:34 2023-02-24] REMOVING /home/delta/.spicetify/spicetify.tar.gz -[03:45:34 2023-02-24] APPENDING /home/delta/.spicetify to PATH in /home/delta/.config/fish/config.fish -[03:45:34 2023-02-24] Restart your shell to have spicetify in your PATH. -[03:45:34 2023-02-24] spicetify v2.16.1 was installed successfully to /home/delta/.spicetify -[03:45:34 2023-02-24] Run 'spicetify --help' to get started diff --git a/.config/awesome/ui/fresnel/lenses/liblenses.so b/.config/awesome/ui/fresnel/lenses/liblenses.so deleted file mode 120000 index 5f7fc45..0000000 --- a/.config/awesome/ui/fresnel/lenses/liblenses.so +++ /dev/null @@ -1 +0,0 @@ -target/liblenses.so \ No newline at end of file diff --git a/.config/awesome/ui/fresnel/lenses/rustfmt.toml b/.config/awesome/ui/fresnel/lenses/rustfmt.toml deleted file mode 100644 index 36afbbd..0000000 --- a/.config/awesome/ui/fresnel/lenses/rustfmt.toml +++ /dev/null @@ -1,3 +0,0 @@ -imports_layout = "Vertical" -unstable_features = true -group_imports = "StdExternalCrate" diff --git a/.config/awesome/ui/fresnel/lenses/src/application.rs b/.config/awesome/ui/fresnel/lenses/src/application.rs deleted file mode 100644 index 0cf6c1a..0000000 --- a/.config/awesome/ui/fresnel/lenses/src/application.rs +++ /dev/null @@ -1,107 +0,0 @@ -use std::{ - fs::read_dir, - path::PathBuf, -}; - -use freedesktop_entry_parser as fd; -use mlua::prelude::*; -use parking_lot::Mutex; -use rayon::prelude::*; -use url::Url; - -use crate::entry::{ - entries_to_lua_table, - Entry, -}; - -fn parse_entry<'a>(entry: fd::Entry, path: PathBuf) -> Result { - let section = entry.section("Desktop Entry"); - let name = section.attr("Name").ok_or(())?.to_string(); - - if section.attr("Type").ok_or(())? != "Application" { - return Err(()); - } - - match section.attr("OnlyShowIn") { - Some(_) => return Err(()), - None => {} - } - - match section.attr("Hidden") { - Some(_) => return Err(()), - None => {} - } - - match section.attr("NoDisplay") { - Some(_) => return Err(()), - None => {} - } - - let exec = section.attr("Exec").ok_or(())?.to_string(); - let mut new_exec = exec.clone(); - for (index, _) in exec.match_indices("%") { - match exec.chars().nth(index + 1).unwrap().to_ascii_lowercase() { - 'i' => match section.attr("Icon") { - Some(icon) => new_exec.replace_range(index..index + 2, &format!("--icon {}", icon)), - None => {} - }, - 'c' => new_exec.replace_range(index..index + 2, &name), - 'k' => new_exec.replace_range(index..index + 2, Url::from_file_path(&path)?.as_str()), - - 'f' | 'u' | 'v' | 'm' | 'd' | 'n' => new_exec.replace_range(index..index + 2, ""), - _ => continue, - } - } - - Ok(Entry { - message: name, - exec: Some(( - new_exec, - section - .attr("Terminal") - .unwrap_or("false") - .parse() - .map_err(drop)?, - )), - provider: "Application".to_string(), - }) -} - -pub fn query(lua: &Lua, input: String) -> LuaResult { - let applications_dir = "/usr/share/applications"; - let entries = read_dir(applications_dir)? - .map(|result| result.map(|e| e.path())) - .collect::, std::io::Error>>()?; - - let entries = entries - .into_iter() - .filter(|e| match e.extension() { - Some(ext) if ext == "desktop" => true, - None | _ => false, - }) - .collect::>(); - - let mut parsed_entries: Mutex> = Mutex::new(Vec::new()); - - entries.into_par_iter().for_each(|path| { - let entry = match fd::parse_entry(&path) { - Ok(entry) => entry, - Err(_) => return, - }; - - match parse_entry(entry, path) { - Ok(parsed_entry) => parsed_entries.lock().push(parsed_entry), - Err(_) => return, - } - }); - - Ok(entries_to_lua_table( - parsed_entries - .get_mut() - .iter() - .filter(|entry| entry.message.to_lowercase().contains(&input)) - .map(|entry| (*entry).clone()) - .collect(), - lua, - )) -} diff --git a/.config/awesome/ui/fresnel/lenses/src/calculator.rs b/.config/awesome/ui/fresnel/lenses/src/calculator.rs deleted file mode 100644 index 792985d..0000000 --- a/.config/awesome/ui/fresnel/lenses/src/calculator.rs +++ /dev/null @@ -1,25 +0,0 @@ -use meval::eval_str; -use mlua::prelude::*; - -use crate::entry::{ - entries_to_lua_table, - Entry, -}; - -pub fn query(lua: &Lua, input: String) -> LuaResult { - println!("{:?}", input); - let result = match eval_str(input.trim()) { - Ok(ok) => ok.to_string(), - Err(_) => return Ok(lua.create_table()?), - }; - - Ok(entries_to_lua_table( - vec![Entry { - message: result, - exec: None, - // icon: '', - provider: "Calculator".to_string(), - }], - lua, - )) -} diff --git a/.config/awesome/ui/fresnel/lenses/src/entry.rs b/.config/awesome/ui/fresnel/lenses/src/entry.rs deleted file mode 100644 index d6e7467..0000000 --- a/.config/awesome/ui/fresnel/lenses/src/entry.rs +++ /dev/null @@ -1,20 +0,0 @@ -use mlua::{ - prelude::*, - LuaSerdeExt, -}; -use serde::Serialize; - -#[derive(Serialize, Clone)] -pub struct Entry { - pub message: String, - pub exec: Option<(String, bool)>, - // pub icon: char, - pub provider: String, -} - -pub fn entries_to_lua_table(entries: Vec, lua: &Lua) -> LuaTable { - match lua.to_value(&entries).unwrap() { - LuaValue::Table(t) => t, - _ => unreachable!(), - } -} diff --git a/.config/awesome/ui/fresnel/lenses/src/lib.rs b/.config/awesome/ui/fresnel/lenses/src/lib.rs deleted file mode 100644 index e4fc881..0000000 --- a/.config/awesome/ui/fresnel/lenses/src/lib.rs +++ /dev/null @@ -1,16 +0,0 @@ -mod application; -mod calculator; -mod entry; - -use mlua::prelude::*; - -#[mlua::lua_module] -fn lenses(lua: &Lua) -> LuaResult { - let exports = lua.create_table()?; - // lua.create_fun - // exports.push(application::query)?; - exports.set("1", lua.create_function(calculator::query)?)?; - exports.set("2", lua.create_function(application::query)?)?; - - Ok(exports) -} -- cgit v1.2.3