pass enabled down

flake.lock

@@ -202,11 +202,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1714133690,
-        "narHash": "sha256-vnqz+kFcTQPO0AWPmI9P4j428P4EKRVFjWEamoNPoBU=",
+        "lastModified": 1714248933,
+        "narHash": "sha256-hACvj8q0ucxslZmHf7j6bYlxVeDkJleAW+sCHGv4+2k=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "d9ec2785cb7f6493576232057752688e57925655",
+        "rev": "2e763764bfdaee2039961c6c220b5d6af31712d4",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713989318,
-        "narHash": "sha256-WSsEQQxZQ+bsAWRhi1iXvP8sxgRyNtY3X1V3CfFdP5Q=",
+        "lastModified": 1714171579,
+        "narHash": "sha256-eaWDIvt8ufUKKz3Lc2a3PyemLJG1m9RYlF+HP3hWbaw=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "1cfe2d26a82ce794fd33ec06fa022e68501c5a45",
+        "rev": "126dad854f22fe30e6b82cd21808e76903d90ac5",
         "type": "github"
       },
       "original": {
@@ -442,11 +442,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1714134515,
-        "narHash": "sha256-BJIMHy45EagFDqd9lSzfwaf2IOHK0AeJ1kmQBzPBbtE=",
+        "lastModified": 1714248925,
+        "narHash": "sha256-WqTUJlGR+MpeaM9hNiWJslE2/9K46wrBfLwSALZWkqg=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "92a8f2be2f3ca1ab278f7ed7410865135ee03c74",
+        "rev": "92c4ee347ef9949df8a1280ee0ed9e7670b9628e",
         "type": "github"
       },
       "original": {
@@ -489,16 +489,16 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1714076141,
-        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
+        "lastModified": 1714213793,
+        "narHash": "sha256-Yg5D5LhyAZvd3DZrQQfJAVK8K3TkUYKooFtH1ulM0mw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
+        "rev": "d6f6eb2a984f2ba9a366c31e4d36d65465683450",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -795,11 +795,11 @@
         "zig-overlay": "zig-overlay"
       },
       "locked": {
-        "lastModified": 1714140769,
-        "narHash": "sha256-lsHUbYKRrqPdM38kdjYmcwlw6hG6XoNLFR7FlMPWz+Y=",
+        "lastModified": 1714213794,
+        "narHash": "sha256-8/tQeR3EV9dc8wIDcAqqaah2IZb039euqdT/R62TN/Q=",
         "owner": "zigtools",
         "repo": "zls",
-        "rev": "e96503d9c11c061573fa68cc8aafa575138418a0",
+        "rev": "4efd646c8458077da64ca589241b7d060996faa7",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,7 +4,7 @@
   outputs = inputs: (import ./lib inputs).oizysFlake;
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     stable.url = "github:nixos/nixpkgs/nixos-23.11";
 
     tsm.url = "github:daylinmorgan/tsm?dir=nix";
@@ -34,13 +34,13 @@
       "https://hyprland.cachix.org"
       "https://nixpkgs-wayland.cachix.org"
       "https://daylin.cachix.org"
-   #   "https://cache.garnix.io"
+      #   "https://cache.garnix.io"
     ];
     extra-trusted-public-keys = [
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
       "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
-   #   "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+      #   "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
     ];
   };
 }

hosts/algiz/default.nix

@@ -1,11 +1,9 @@
 {
   self,
   pkgs,
-  lib,
+  enabled,
   ...
-}: let
-  inherit (lib) enabled;
-in {
+}: {
   imports = with self.nixosModules; [
     restic
   ];

hosts/algiz/system.nix

@@ -1,6 +1,8 @@
-{lib, ...}: let
-  inherit (lib) enabled;
-in {
+{
+  lib,
+  enabled,
+  ...
+}: {
   users.motd = lib.mkRune {
     number = "6";
     rune = "algiz";

hosts/mannaz/default.nix

@@ -1,10 +1,8 @@
 {
   self,
-  lib,
+  enabled,
   ...
-}: let
-  inherit (lib) enabled;
-in {
+}: {
   imports = with self.nixosModules; [
     nix-ld
   ];

hosts/mannaz/system.nix

@@ -1,12 +1,11 @@
 {
   config,
   pkgs,
-  lib,
+  enabled,
+  mkRune,
   ...
-}: let
-  inherit (lib) enabled;
-in {
-  users.motd = lib.mkRune {
+}: {
+  users.motd = mkRune {
     number = "2";
     rune = "mannaz";
   };

hosts/othalan/default.nix

@@ -1,10 +1,8 @@
 {
   pkgs,
-  lib,
+  enabled,
   ...
-}: let
-  inherit (lib) enabled;
-in {
+}: {
   oizys = {
     desktop = enabled;
     hyprland = enabled;

hosts/othalan/system.nix

@@ -1,10 +1,9 @@
 {
   pkgs,
-  lib,
+  enabled,
+  mkRune,
   ...
-}: let
-  inherit (lib) enabled;
-in {
+}: {
   networking.networkmanager = enabled;
   services.printing = enabled;
   services.fwupd = enabled;
@@ -28,7 +27,7 @@ in {
     pamixer
   ];
 
-  services.getty.greetingLine = lib.mkRune {
+  services.getty.greetingLine = mkRune {
     rune = "othalan";
     runeKind = "ascii";
   };

lib/default.nix

@@ -3,7 +3,7 @@ inputs: let
   lib = nixpkgs.lib.extend (import ./extended.nix);
 
   inherit (builtins) mapAttrs readDir filter listToAttrs;
-  inherit (lib) nixosSystem genAttrs isNixFile mkDefaultOizysModule mkOizysModule;
+  inherit (lib) nixosSystem genAttrs isNixFile mkDefaultOizysModule mkOizysModule enabled mkRune;
   inherit (lib.filesystem) listFilesRecursive;
 
   inherit (import ./find-modules.nix {inherit lib;}) findModulesList;
@@ -26,7 +26,7 @@ in rec {
         isNixFile
         (listFilesRecursive (../. + "/hosts/${hostname}"));
 
-      specialArgs = {inherit inputs lib self mkDefaultOizysModule mkOizysModule;};
+      specialArgs = {inherit inputs lib self mkDefaultOizysModule mkOizysModule enabled mkRune;};
     };
 
   oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);

modules/desktop/window-managers/hyprland.nix

@@ -3,9 +3,9 @@
   pkgs,
   config,
   mkOizysModule,
-  lib,
+  enabled,
   ...
-}: 
+}:
 # let
 #   lock = pkgs.writeShellApplication {
 #     name = "lock";
@@ -14,49 +14,49 @@
 #       swaylock -c 1e1e2e
 #     '';
 #   };
-let inherit (lib) enabled; 
-in
-  mkOizysModule config "hyprland" {
-    programs.hyprland = enabled // {
+mkOizysModule config "hyprland" {
+  programs.hyprland =
+    enabled
+    // {
       package = inputs.hyprland.packages.${pkgs.system}.default;
     };
-    security.pam.services.swaylock = {};
-    # Optional, hint electron apps to use wayland:
-    environment.sessionVariables.NIXOS_OZONE_WL = "1";
+  security.pam.services.swaylock = {};
+  # Optional, hint electron apps to use wayland:
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
-    environment.systemPackages = with pkgs; [
-      wlr-randr
-      kanshi
+  environment.systemPackages = with pkgs; [
+    wlr-randr
+    kanshi
 
-      brightnessctl
-      udiskie
-      eww
+    brightnessctl
+    udiskie
+    eww
 
-      # notifications
-      libnotify
-      dunst
+    # notifications
+    libnotify
+    dunst
 
-      # utils
-      grimblast
-      ksnip
-      wl-clipboard
-      rofi-wayland
-      pavucontrol
+    # utils
+    grimblast
+    ksnip
+    wl-clipboard
+    rofi-wayland
+    pavucontrol
 
-      catppuccin-cursors.mochaDark
+    catppuccin-cursors.mochaDark
 
-      #hypr ecosystem
-      hyprlock
-      hypridle
+    #hypr ecosystem
+    hyprlock
+    hypridle
 
-      swww
-    ];
+    swww
+  ];
 
-    nixpkgs.overlays = [
-      inputs.hyprland-contrib.overlays.default
-      inputs.nixpkgs-wayland.overlay
-      # when this was active I was forced to recompile VirtualBox myself, which would just fail to compile...
-      # Must have been one of the other non-hyprland packages modified in the overlay
-      # inputs.hyprland.overlays.default
-    ];
-  }
+  nixpkgs.overlays = [
+    inputs.hyprland-contrib.overlays.default
+    inputs.nixpkgs-wayland.overlay
+    # when this was active I was forced to recompile VirtualBox myself, which would just fail to compile...
+    # Must have been one of the other non-hyprland packages modified in the overlay
+    # inputs.hyprland.overlays.default
+  ];
+}

modules/nix.nix

@@ -22,8 +22,7 @@
   };
 
   environment.systemPackages = with pkgs; [
-    nil
-    alejandra
+    nixd
     nixfmt-rfc-style
 
     self.packages.${pkgs.system}.default

modules/programs/chrome/default.nix

@@ -16,10 +16,18 @@ mkOizysModule config "chrome" {
       "clngdbkpkpeebahjckkjfobafhncgmne" # stylus
       "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
       "ekhagklcjbdpajgpjgmbionohlpdbjgc" # zotero connector
+
+      "bkkmolkhemgaeaeggcmfbghljjjoofoh" # catppuccin-chrome-theme-m
     ];
   };
 
   environment.systemPackages = with pkgs; [
+    (chromium.override {
+      commandLineArgs = [
+        "--force-dark-mode"
+      ];
+    })
+
     (google-chrome.override {
       commandLineArgs = [
         "--force-dark-mode"