diff --git a/flake.nix b/flake.nix index 45296e4..4c153a0 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,8 @@ inputs = { #dev stuff - pydev.url ="./system/extras/pydev/"; - currents.url = "github:autumnalmusing/currents/handler"; + # pydev.url ="./system/extras/pydev/"; + currents.url = "github:autumnalmusing/currents/main"; #regular flakes nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; @@ -26,7 +26,7 @@ lix-module, lix, home-manager, - pydev, + # pydev, currents, nixos-wsl, ... diff --git a/home/autumn/sysconfs/yukigekko.nix b/home/autumn/sysconfs/yukigekko.nix index 3214122..81fcc73 100644 --- a/home/autumn/sysconfs/yukigekko.nix +++ b/home/autumn/sysconfs/yukigekko.nix @@ -4,7 +4,6 @@ obsidian vscodium-fhs vesktop - avizo ]; programs.bash.initExtra= ''fish''; imports = [ @@ -14,6 +13,6 @@ # ../../packages/twmn/twmn.nix ../../packages/mako/mako.nix ../../packages/fuzzel/fuzzel.nix - ../../packages/avizo/avizo.nix + # ../../packages/avizo/avizo.nix ]; } diff --git a/home/packages/alacritty/alacritty.nix b/home/packages/alacritty/alacritty.nix index b497d02..b88e235 100644 --- a/home/packages/alacritty/alacritty.nix +++ b/home/packages/alacritty/alacritty.nix @@ -4,7 +4,6 @@ programs.alacritty = { enable = true; - theme = "everforest_dark"; settings = { font = { italic = { @@ -21,6 +20,36 @@ blur = true; padding = {x=0;y=15;}; }; + colors = { + primary = { + background = "#2b3339"; + foreground = "#d3c6aa"; + }; + cursor = { + text = "#2b3339"; + cursor = "#d3c6aa"; + }; + normal = { + black = "#323c41"; + red = "#e67e80"; + green = "#a7c080"; + yellow = "#dbbc7f"; + blue = "#7fbbb3"; + magenta = "#d699b6"; + cyan = "#83c092"; + white = "#d3c6aa"; + }; + bright = { + black = "#445055"; + red = "#e67e80"; + green = "#a7c080"; + yellow = "#dbbc7f"; + blue = "#7fbbb3"; + magenta = "#d699b6"; + cyan = "#83c092"; + white = "#9da9a0"; + }; + }; }; }; } diff --git a/home/packages/avizo/avizo.nix b/home/packages/avizo/avizo.nix index cabcfef..47d92d5 100644 --- a/home/packages/avizo/avizo.nix +++ b/home/packages/avizo/avizo.nix @@ -1,6 +1,6 @@ {config, pkgs, ...}: { - home.packages.avizo.enable = true; + services.avizo.enable = true; home.file = { "config.ini" = { enable = true; diff --git a/home/packages/currents/currents.nix b/home/packages/currents/currents.nix new file mode 100644 index 0000000..79e2aca --- /dev/null +++ b/home/packages/currents/currents.nix @@ -0,0 +1,33 @@ +{config, pkgs, ...}: +{ + services.currents = { + enable = true; + weather = { + apiKeyFile = "/run/secrets/currentsApiKey"; + location = "Denver, US"; + units = "imperial"; + provider = "openweathermap"; + apiDailyLimit = 1000; + }; + notifications = { + urgency = "normal"; + sound = false; + }; + polling = { + intervalSeconds = 300; + retryAttempts = 3; + retryDelaySeconds = 60; + }; + forecastHighlights = { + temperature = { + high = 80.0; + highColor = "red"; + low = 45; + lowColor = "cyan"; + }; + # humidity = { + + # }; + }; + }; +} diff --git a/home/packages/waybar/waybar.nix b/home/packages/waybar/waybar.nix index 2584f30..65b2b85 100644 --- a/home/packages/waybar/waybar.nix +++ b/home/packages/waybar/waybar.nix @@ -155,7 +155,7 @@ }; }; "custom/currents"= { - interval= 30; + interval= 150; exec= "/home/autumn/.local/bin/currents --output"; return-type= "json"; }; diff --git a/system/defaults/services.nix b/system/defaults/services.nix index 089da15..8d23f79 100644 --- a/system/defaults/services.nix +++ b/system/defaults/services.nix @@ -14,5 +14,6 @@ playerctld.enable = true; printing.enable = true; pulseaudio.enable = false; + tailscale.enable = true; }; } diff --git a/system/packages/endlessh/endlessh.nix b/system/packages/endlessh/endlessh.nix new file mode 100644 index 0000000..1fe315c --- /dev/null +++ b/system/packages/endlessh/endlessh.nix @@ -0,0 +1,7 @@ +{config, pkgs, ...}: +{ + services.endlessh = { + enable = true; + port = 22; + }; +}