From 7d97a7825c1d1a94a5b34e580e2d5c5c2def16a9 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 21 Dec 2022 10:12:29 -0600 Subject: [PATCH 1/2] fixing clock_full --- eww/eww.yuck | 8 +++++--- eww/notifications.yuck | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eww/eww.yuck b/eww/eww.yuck index 2fc21d3..7dd95a1 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -5,6 +5,7 @@ (include "battery.yuck") (defpoll clock_time :interval "5s" "date '+\%l:\%M \%p'") +(defpoll clock_full :interval "5s" "date '+\%b \%d, \%Y, \%l:\%M \%p'") (defpoll clock_date :interval "1h" "date '+%b %d, %Y'") (defpoll calendar_day :interval "2h" "date '+%d'") (defpoll calendar_year :interval "2h" "date '+%Y'") @@ -97,6 +98,7 @@ (scale :class "volbar" :value volume_percent + :draw-value: true :orientation "h" :tooltip "${volume_percent}%" :max 100 @@ -201,10 +203,10 @@ :orientation "h" :spacing "0" (label - :text clock_time + :text {HOST == "kaladin" ? clock_full : clock_time} :class "clock_time_class" ) (revealer :transition "slideleft" - :reveal time_rev + :reveal {HOST == "kaladin" ? false : time_rev} :duration "250ms" (button :class "clock_date_class" @@ -296,7 +298,7 @@ :geometry (geometry :x "15px" :y "10px" - :width "99%" + :width "80%" :height "30px" :anchor "bottom center") :stacking "fg" diff --git a/eww/notifications.yuck b/eww/notifications.yuck index 0395f1f..8a99ba6 100644 --- a/eww/notifications.yuck +++ b/eww/notifications.yuck @@ -1,3 +1,4 @@ + (defwindow notifications :geometry (geometry :x "0px" :y "0px" From f1307d56ed69eaac7869a54b8caeddb6e3e39e62 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 21 Dec 2022 10:42:23 -0600 Subject: [PATCH 2/2] adding hyprland cachix --- README.org | 7 ++++++- flake.nix | 1 - system/kaladin/configuration.nix | 6 ++++++ system/syl/configuration.nix | 6 ++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/README.org b/README.org index c73ca84..0d00257 100644 --- a/README.org +++ b/README.org @@ -37,7 +37,6 @@ Both include the home-manager module. Primarily I chose that route so that I cou }; hyprland = { url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; }; eww = { url = "github:elkowar/eww"; @@ -173,6 +172,12 @@ nix = { I use plasma and awesome mostly as my desktop. Also all desktops will likely need ntfs support in order to work with windows devices. #+NAME: desktop #+begin_src nix +# This adds hyprland cache to cachix +nix.settings = { + substituters = ["https://hyprland.cachix.org"]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; +}; + boot.supportedFilesystems = [ "ntfs" ]; services.xserver = { enable = true; diff --git a/flake.nix b/flake.nix index e3aab30..76c0da2 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ }; hyprland = { url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; }; eww = { url = "github:elkowar/eww"; diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index f110645..7080572 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -85,6 +85,12 @@ Option "TripleBuffer" "on" ''; + # This adds hyprland cache to cachix + nix.settings = { + substituters = ["https://hyprland.cachix.org"]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + }; + boot.supportedFilesystems = [ "ntfs" ]; services.xserver = { enable = true; diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index e6b4d43..4ff13fc 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -78,6 +78,12 @@ services.xserver.videoDrivers = ["intel"]; + # This adds hyprland cache to cachix + nix.settings = { + substituters = ["https://hyprland.cachix.org"]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + }; + boot.supportedFilesystems = [ "ntfs" ]; services.xserver = { enable = true;