Nickiel/Ewwtilities
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: Nickiel:850c629eca7471d20191e2ea088b744c7be61b20
Branches Tags
Nickiel:main
..
compare: Nickiel:09f272de15116ec688492206af13db59d2a4b9d3
Branches Tags
Nickiel:main

3 commits
850c629eca ... 09f272de15

Author SHA1 Message Date
Nickiel12
09f272de15 updated flake 2023-11-08 20:31:36 -08:00
Nickiel12
3dbbd5713a cleaned up clippy comments 2023-11-08 19:29:18 -08:00
Nickiel12
933fda9b2b cargo fmt 2023-11-08 19:02:59 -08:00
2 changed files with 43 additions and 97 deletions
Show stats Expand all files Collapse all files

93
ewwtilities/src/calendar_background.rs
View file

@ -41,14 +41,14 @@ pub fn run_calendar(args: &CliArgs) {
} }
let value = buffer[21..].to_string(); let value = buffer[21..].to_string();
if value.starts_with("Moonrise") { if let Some(time) = value.strip_prefix("Moonrise") {
moonrise = parse_time(value[8..].trim()); moonrise = parse_time(time.trim());
} else if value.starts_with("Moonset") { } else if let Some(time) = value.strip_prefix("Moonset") {
moonset = parse_time(value[7..].trim()); moonset = parse_time(time.trim());
} else if value.starts_with("Moonday") { } else if let Some(time) = value.strip_prefix("Moonday") {
moonday = parse_time(value[7..].trim()); moonday = parse_time(time.trim());
} else if value.starts_with("Moonphase") { } else if let Some(phase) = value.strip_prefix("Moonphase") {
moonphase = match value[9..].trim()[0..2].parse::<u32>() { moonphase = match phase.trim()[0..2].parse::<u32>() {
Ok(val) => Some(val), Ok(val) => Some(val),
Err(e) => { Err(e) => {
if args.debug { if args.debug {
@ -57,10 +57,10 @@ pub fn run_calendar(args: &CliArgs) {
None None
} }
}; };
} else if value.starts_with("Sunrise") { } else if let Some(time) = value.strip_prefix("Sunrise") {
sunrise = parse_time(value[7..].trim()); sunrise = parse_time(time.trim());
} else if value.starts_with("Sunset") { } else if let Some(time) = value.strip_prefix("Sunset") {
sunset = parse_time(value[6..].trim()); sunset = parse_time(time.trim());
} else { } else {
continue; continue;
} }
@ -83,76 +83,61 @@ pub fn run_calendar(args: &CliArgs) {
moonphase: 0, moonphase: 0,
}; };
if moonphase.is_some() { if let Some(moon_phase) = moonphase {
output_state.moonphase = moonphase.unwrap(); output_state.moonphase = moon_phase;
} }
let now_mins = (Local::now().hour() * 60 +Local::now().minute()) as i32; let now_mins = (Local::now().hour() * 60 + Local::now().minute()) as i32;
if sunrise.is_none() { if sunrise.is_none() {
sunrise = Some(8 * 60 + 0); sunrise = Some(8 * 60);
} }
if sunset.is_none() { if sunset.is_none() {
sunset = Some(18 * 60 + 0); sunset = Some(18 * 60);
} }
let sun_rise = sunrise.clone().unwrap(); let sun_rise = sunrise.unwrap();
let sun_set = sunset.clone().unwrap(); let sun_set = sunset.unwrap();
if now_mins > sun_rise && now_mins < sun_set { if now_mins > sun_rise && now_mins < sun_set {
// it is after sunrise, and before sunset // it is after sunrise, and before sunset
output_state.has_bg = true; output_state.has_bg = true;
output_state.is_sun = true; output_state.is_sun = true;
output_state.gradient_angle_percentage = { output_state.gradient_angle_percentage =
(now_mins - sun_rise) as f32 (now_mins - sun_rise) as f32 / (sun_set - sun_rise) as f32;
/ (sun_set - sun_rise) as f32
};
} else { } else {
// Check if the moon is up // Check if the moon is up
if moonrise.is_some() { if let Some(moon_rise) = moonphase {
let moon_rise = moonrise.clone().unwrap(); if let Some(moon_set) = moonset {
if moonset.is_some() { if now_mins > moon_rise as i32 && now_mins < moon_set {
let moon_set = moonset.clone().unwrap();
if now_mins > moon_rise
&& now_mins < moon_set
{
// moon is up // moon is up
output_state.has_bg = true; output_state.has_bg = true;
output_state.is_sun = false; output_state.is_sun = false;
} }
} else { } else if now_mins > moon_rise as i32 {
if now_mins > moon_rise { output_state.has_bg = true;
output_state.has_bg = true; output_state.is_sun = false;
output_state.is_sun = false;
}
} }
} else { } else if let Some(moon_set) = moonset {
if moonset.is_some() { if now_mins < moon_set {
let moon_set = moonset.clone().unwrap(); // moon is up
if now_mins < moon_set { output_state.has_bg = true;
// moon is up output_state.is_sun = false;
output_state.has_bg = true;
output_state.is_sun = false;
}
} }
} }
if output_state.has_bg == true && output_state.is_sun == false { if output_state.has_bg && !output_state.is_sun {
// moon is up, get the position // moon is up, get the position
if moonrise.is_some() { if let Some(moon_rise) = moonrise {
let moon_rise = moonrise.clone().unwrap(); let moon_day = moonday.unwrap();
let moon_day = moonday.clone().unwrap();
output_state.gradient_angle_percentage = { output_state.gradient_angle_percentage =
(now_mins - moon_rise) as f32 (now_mins - moon_rise) as f32 / moon_day as f32;
/ moon_day as f32
};
} else { } else {
let moon_set = moonset.clone().unwrap(); let moon_set = moonset.unwrap();
let moon_day = moonday.clone().unwrap(); let moon_day = moonday.unwrap();
let begin_mins: i32 = moon_set - moon_day; let begin_mins: i32 = moon_set - moon_day;
let time_since_rise = now_mins + (begin_mins.abs()); let time_since_rise = now_mins + (begin_mins.abs());
output_state.gradient_angle_percentage = time_since_rise as f32 / moon_set as f32; output_state.gradient_angle_percentage = time_since_rise as f32 / moon_set as f32;
} }
} }
} }

47
flake.nix
View file

@ -18,7 +18,7 @@ Some utility commands:
*/ */
{ {
description = ""; description = "A utility written in rust that my eww configuration uses";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
@ -39,8 +39,8 @@ Some utility commands:
cargoHash = nixpkgs.lib.fakeHash; cargoHash = nixpkgs.lib.fakeHash;
}; };
meta = with nixpkgs.lib; { meta = with nixpkgs.lib; {
#homepage = "https://example.com"; homepage = "https://git.nickiel.net";
#license = [ licenses.gpl3 ]; license = [ licenses.gpl3 ];
platforms = [ system ]; platforms = [ system ];
#maintainers = with maintainers; [ ]; #maintainers = with maintainers; [ ];
}; };
@ -61,50 +61,11 @@ Some utility commands:
pname = "ewwtilities"; pname = "ewwtilities";
version = "0.1.0"; version = "0.1.0";
buildAndTestSubdir = "ewwtilities"; buildAndTestSubdir = "ewwtilities";
cargoHash = "sha256-+TaGIiKf+Pz2bTABeG8aCZz0/ZTCKl5398+qbas4Nvo="; cargoHash = "sha256-vY+2bCWlW2SxzAxB9nPighjaa63qW1XttC2vLGqBGWI=";
meta = meta // { meta = meta // {
description = ""; description = "";
}; };
}); });
}; };
/*
nixosModules.default = { config, ... }: let
lib = nixpkgs.lib;
in {
options.services.ewwtilities = {
enable = lib.mkEnableOption (lib.mdDoc "ewwtilities service");
package = lib.mkOption {
type = lib.types.package;
default = self.packages.${system}.ewwtilities;
defaultText = "pkgs.ewwtilities";
description = lib.mdDoc ''
The ewwtilities package that should be used.
'';
};
port = lib.mkOption {
type = lib.types.port;
default = 8000;
description = lib.mdDoc ''
The port at which to run.
'';
};
};
config.systemd.services.ewwtilities = let
cfg = config.services.ewwtilities;
pkg = self.packages.${system}.ewwtilities;
in lib.mkIf cfg.enable {
description = pkg.meta.description;
after = [ "network.target" ];
wantedBy = [ "network.target" ];
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/ewwtilities --port ${builtins.toString cfg.port}
'';
Restart = "always";
DynamicUser = true;
};
};
};
*/
}; };
} }