diff --git a/configs/home-manager/common.nix b/configs/home-manager/common.nix index fffea0a..f64a748 100644 --- a/configs/home-manager/common.nix +++ b/configs/home-manager/common.nix @@ -1,4 +1,5 @@ { + inputs, config, pkgs, lib, @@ -9,11 +10,17 @@ # Let Home Manager install and manage itself on non-nixos systems. programs.home-manager.enable = config.targets.genericLinux.enable; - services.home-manager.autoExpire = { + nixpkgs.overlays = lib.mkIf (config.targets.genericLinux.enable && (inputs ? nixpkgs-fork)) [ + (final: prev: { + fork = inputs.nixpkgs-fork.legacyPackages.${prev.system}; + }) + ]; + + services.home-manager.autoExpire = lib.mkIf config.targets.genericLinux.enable { enable = true; store = { cleanup = true; - options = "--delete-older-than 30d"; + options = "--delete-older-than 7d"; }; }; diff --git a/configs/nixos/common.nix b/configs/nixos/common.nix index f198f93..14bc1db 100644 --- a/configs/nixos/common.nix +++ b/configs/nixos/common.nix @@ -25,6 +25,12 @@ in { }; }; + nixpkgs.overlays = lib.mkIf (inputs ? nixpkgs-fork) [ + (final: prev: { + fork = inputs.nixpkgs-fork.legacyPackages.${prev.system}; + }) + ]; + # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/flake.nix b/flake.nix index 62cb334..6d2e309 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,8 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # nixpkgs-fork.url="github:gabevenberg/nixpkgs/nixos-unstable"; + nixos-wsl = { url = "github:nix-community/NixOS-WSL/main"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/harmatan/default.nix b/hosts/harmatan/default.nix index e43f25d..46a7a31 100644 --- a/hosts/harmatan/default.nix +++ b/hosts/harmatan/default.nix @@ -47,15 +47,15 @@ inputs.nixpkgs.lib.nixosSystem { nixpkgs.overlays = let args = "--force-device-scale-factor=2"; - desktopItemModifier = e: rec { - desktopItem = e.desktopItem.override (d: { - exec = "${d.exec} ${args}"; + desktopItemModifier = prevAttrs: { + desktopItem = prevAttrs.desktopItem.override (prev: { + exec = "${prev.exec} ${args}"; }); }; - desktopItemsModifier = e: rec { + desktopItemsModifier = previousAttrs: { desktopItems = [ - ((builtins.head e.desktopItems).override (d: { - exec = "${d.exec} ${args}"; + ((builtins.head previousAttrs.desktopItems).override (prev: { + exec = "${prev.exec} ${args}"; })) ]; }; diff --git a/roles/home-manager/eda.nix b/roles/home-manager/eda.nix index 05db557..8d6e106 100644 --- a/roles/home-manager/eda.nix +++ b/roles/home-manager/eda.nix @@ -1,4 +1,5 @@ { + inputs, config, pkgs, lib, @@ -6,5 +7,6 @@ }: { home.packages = with pkgs; [ kicad + interactive-html-bom ]; }