diff --git a/home/modules/wayland/eww/default.nix b/home/modules/wayland/eww/default.nix index 317d0f0..388be3b 100644 --- a/home/modules/wayland/eww/default.nix +++ b/home/modules/wayland/eww/default.nix @@ -1,18 +1,22 @@ -{self, ...}: { - inputs, +{ + self, + eww, + ... +}: { pkgs, config, lib, ... }: { - config = lib.mkIf config.programs.eww.enable { - home.packages = with pkgs; [ - (inputs.eww.packages.${pkgs.system}.eww-wayland.overrideAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs ++ [pkgs.wrapGAppsHook]; - buildInputs = old.buildInputs ++ (with pkgs; [glib librsvg libdbusmenu-gtk3]); - })) - ]; + config = lib.mkIf config.bw.eww.enable { + # home.packages = with pkgs; [ + # (eww.packages.${pkgs.system}.eww-wayland.overrideAttrs (old: { + # nativeBuildInputs = old.nativeBuildInputs ++ [pkgs.wrapGAppsHook]; + # buildInputs = old.buildInputs ++ (with pkgs; [glib librsvg libdbusmenu-gtk3]); + # })) + # ]; + home.packages = [eww.packages.${pkgs.system}.eww]; xdg.configFile = let colorScheme = config.colors.colorScheme.colors; files = builtins.readDir ./config; diff --git a/home/modules/wayland/hyprland/default.nix b/home/modules/wayland/hyprland/default.nix index 1ecb0c8..6c883dd 100644 --- a/home/modules/wayland/hyprland/default.nix +++ b/home/modules/wayland/hyprland/default.nix @@ -10,17 +10,28 @@ ... }: let hypr-config = import ./config.nix { - eww = eww; - anyrun = anyrun; - lib = lib; - config = config; - pkgs = pkgs; + inherit + eww + anyrun + lib + config + pkgs + ; }; rules = import ./rules.nix; in { + options.bw.eww = { + enable = lib.mkOption { + default = false; + type = lib.types.bool; + description = "Enable eww"; + }; + }; + imports = [rules]; config = { + bw.eww.enable = true; home = { packages = with pkgs; [ seatd diff --git a/nixos/modules/cachix/caches/anyrun.nix b/nixos/modules/cachix/caches/anyrun.nix index 48aa54c..db42b7a 100644 --- a/nixos/modules/cachix/caches/anyrun.nix +++ b/nixos/modules/cachix/caches/anyrun.nix @@ -7,10 +7,10 @@ builders-use-substitutes = true; # extra substituters to add extra-substituters = [ - "https://anyrun.cachix.org" + "https://anyrun.cachix.org" ]; extra-trusted-public-keys = [ - "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" + "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" ]; }; } diff --git a/parts/system_configs.nix b/parts/system_configs.nix index bb08165..7882b71 100644 --- a/parts/system_configs.nix +++ b/parts/system_configs.nix @@ -12,7 +12,7 @@ packages = builtins.attrValues (builtins.mapAttrs (_: config: config.packageModule) cfg); vars = { - stateVersion = "24.05"; + stateVersion = "24.11"; }; specialArgs = {