Eww Overlay

modules/home/gui/theme/gtk-theme-gen.nix

@@ -15,9 +15,9 @@ in pkgs.stdenv.mkDerivation rec {
     sha256 = "sha256-m7xh/1uIDh2BM0hTPA5QymXQt6yV7mM7Ivg5VaF2PvM=";
   };
 
-  nativeBuildInputs = with pkgs;[ gtk3 sassc ];
-  buildInputs = with pkgs;[ gnome-themes-extra ];
-  propagatedUserEnvPkgs = with pkgs;[ gtk-engine-murrine ];
+  nativeBuildInputs = with pkgs; [ gtk3 sassc ];
+  buildInputs = with pkgs; [ gnome-themes-extra ];
+  propagatedUserEnvPkgs = with pkgs; [ gtk-engine-murrine ];
 
   preInstall = ''
     mkdir -p $out/share/themes
@@ -94,5 +94,4 @@ in pkgs.stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-
 }

modules/home/wayland/apps/eww/bar/eww.yuck

@@ -2,6 +2,7 @@
 
 (include "modules/sys.yuck")
 (include "modules/net.yuck")
+(include "modules/systray.yuck")
 (include "modules/clock.yuck")
 
 (include "windows/calendar.yuck")
@@ -26,6 +27,7 @@
     :valign "end"
     (sys-mod)
     (net-mod)
+    (systray-mod)
     (clock-mod)))
 
 (defwidget center []

modules/home/wayland/apps/eww/bar/modules/systray.yuck

@@ -0,0 +1,15 @@
+
+(defwidget systray-mod []
+  (module
+    (box
+      :orientation "v"
+      (systray
+        :class "tray"
+        :space-evenly "true"
+        :orientation "v"
+        :icon-size 32
+        :prepend-new "false"
+        )
+    )
+  )
+)

modules/nixos/system/nix/default.nix

@@ -25,13 +25,17 @@
     settings = {
       auto-optimise-store = true;
       builders-use-substitutes = true;
-      substituters =
-        [ "https://hyprland.cachix.org" "https://cache.nixos.org" ];
+      substituters = [
+        "https://hyprland.cachix.org"
+        "https://cache.nixos.org"
+        "https://helcel.cachix.org"
+      ];
       trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "helcel.cachix.org-1:95s8D+N2xIHwzmkuu7jMUp9t3rtN4EimafR73jO7GLg="
       ];
     };
   };
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 }

modules/nixos/system/security/sops/default.nix

@@ -1,26 +1,30 @@
 { config, pkgs, ... }:
-let keyFilePath = "/var/lib/sops-nix/age-key.txt";
+let
+  keyFilePath = "/var/lib/sops-nix/age-key.txt";
+  isCI = builtins.elem config.hostcfg.hostname [ "ci" ];
+  sopsSettings = {
+    sops.defaultSopsFile = ./common.yaml;
+    sops.age.keyFile = keyFilePath;
+    sops.age.generateKey = true;
+
+    sops.secrets.wifi = { };
+
+    sops.secrets."${config.hostcfg.hostname}_ssh_priv" = {
+      mode = "0400";
+      owner = config.users.users.sora.name;
+      group = config.users.users.sora.group;
+    };
+    sops.secrets."${config.hostcfg.hostname}_ssh_pub" = {
+      mode = "0400";
+      owner = config.users.users.sora.name;
+      group = config.users.users.sora.group;
+    };
+    sops.secrets."${config.hostcfg.hostname}_wg_priv" = { };
+    sops.secrets."${config.hostcfg.hostname}_wg_pub" = { };
+  };
 in {
-  sops.defaultSopsFile = ./common.yaml;
-  sops.age.keyFile = keyFilePath;
-  sops.age.generateKey = true;
-
-  sops.secrets.wifi = { };
-
-  sops.secrets."${config.hostcfg.hostname}_ssh_priv" = {
-    mode = "0400";
-    owner = config.users.users.sora.name;
-    group = config.users.users.sora.group;
-  };
-  sops.secrets."${config.hostcfg.hostname}_ssh_pub" = {
-    mode = "0400";
-    owner = config.users.users.sora.name;
-    group = config.users.users.sora.group;
-  };
-  sops.secrets."${config.hostcfg.hostname}_wg_priv" = { };
-  sops.secrets."${config.hostcfg.hostname}_wg_pub" = { };
-
   environment.systemPackages = with pkgs; [ sops ];
   environment.sessionVariables.OPS_AGE_KEY_FILE = keyFilePath;
+  inherit (if isCI then { } else sopsSettings) sops;
 
 }