From 23190f0777165b4f5ba43bb41e5d306ccf3e62d8 Mon Sep 17 00:00:00 2001 From: clerie Date: Sat, 28 Jun 2025 15:14:36 +0200 Subject: [PATCH] pkgs/overlay.nix: Get rid of pkgs/pkgs.nix and move overrides to separate overlay --- flake.nix | 7 ++++++- flake/nixpkgs.nix | 1 + pkgs/overlay.nix | 30 +++++++++++++++++++++++++++++- pkgs/overrides/overlay.nix | 4 ++++ pkgs/pkgs.nix | 32 -------------------------------- 5 files changed, 40 insertions(+), 34 deletions(-) create mode 100644 pkgs/overrides/overlay.nix delete mode 100644 pkgs/pkgs.nix diff --git a/flake.nix b/flake.nix index 42908e6..2a4126c 100644 --- a/flake.nix +++ b/flake.nix @@ -138,13 +138,18 @@ nixfilesInputs = import ./flake/inputs-overlay.nix inputs; clerie = import ./pkgs/overlay.nix; clerie-build-support = import ./pkgs/build-support/overlay.nix; + clerie-overrides = import ./pkgs/overrides/overlay.nix; default = self.overlays.clerie; }; packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: let pkgs = localNixpkgs.${system}; - in builtins.mapAttrs (name: value: pkgs."${name}") (self.overlays.clerie null null) + in + nixpkgs.lib.genAttrs ( + (builtins.attrNames (self.overlays.clerie null null)) + ++ (builtins.attrNames (self.overlays.clerie-overrides null null)) + ) (name: pkgs."${name}") ); inherit lib self; diff --git a/flake/nixpkgs.nix b/flake/nixpkgs.nix index 1293e3a..b9bf32e 100644 --- a/flake/nixpkgs.nix +++ b/flake/nixpkgs.nix @@ -13,6 +13,7 @@ let (final: prev: { clerie-build-support = self.overlays.clerie-build-support final prev; }) + self.overlays.clerie-overrides ]; }; diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index f2ab5dc..a72887a 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -1 +1,29 @@ -final: prev: builtins.mapAttrs (name: value: value final prev) (import ./pkgs.nix) +final: prev: { + clerie-backup = final.callPackage ./clerie-backup {}; + clerie-cleanup-branches = final.callPackage ./clerie-update-nixfiles/clerie-cleanup-branches.nix {}; + clerie-keys = final.callPackage ./clerie-keys {}; + clerie-system-remote-install = final.callPackage ./clerie-system-remote-install {}; + clerie-system-upgrade = final.callPackage ./clerie-system-upgrade/clerie-system-upgrade.nix {}; + clerie-merge-nixfiles-update = final.callPackage ./clerie-update-nixfiles/clerie-merge-nixfiles-update.nix {}; + clerie-sops = final.callPackage ./clerie-sops/clerie-sops.nix {}; + clerie-sops-config = final.callPackage ./clerie-sops/clerie-sops-config.nix {}; + clerie-sops-edit = final.callPackage ./clerie-sops/clerie-sops-edit.nix {}; + clerie-update-nixfiles = final.callPackage ./clerie-update-nixfiles/clerie-update-nixfiles.nix {}; + chromium-incognito = final.callPackage ./chromium-incognito {}; + factorio-launcher = final.callPackage ./factorio-launcher {}; + feeds-dir = final.callPackage ./feeds-dir {}; + git-checkout-github-pr = final.callPackage ./git-checkout-github-pr {}; + git-diff-word = final.callPackage ./git-diff-word {}; + git-pp = final.callPackage ./git-pp {}; + git-show-link = final.callPackage ./git-show-link {}; + nix-remove-result-links = final.callPackage ./nix-remove-result-links {}; + nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {}; + nixfiles-generate-config = final.callPackage ./nixfiles/nixfiles-generate-config.nix {}; + nixfiles-generate-backup-secrets = final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {}; + nixfiles-update-ssh-host-keys = final.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {}; + print-afra = final.callPackage ./print-afra {}; + run-with-docker-group = final.callPackage ./run-with-docker-group {}; + ssh-gpg = final.callPackage ./ssh-gpg {}; + update-from-hydra = final.callPackage ./update-from-hydra {}; + uptimestatus = final.python3.pkgs.callPackage ./uptimestatus {}; +} diff --git a/pkgs/overrides/overlay.nix b/pkgs/overrides/overlay.nix new file mode 100644 index 0000000..914a9e3 --- /dev/null +++ b/pkgs/overrides/overlay.nix @@ -0,0 +1,4 @@ +final: prev: { + dino = import ./dino.nix final prev; + xmppc = import ./xmppc.nix final prev; +} diff --git a/pkgs/pkgs.nix b/pkgs/pkgs.nix deleted file mode 100644 index 8e2c444..0000000 --- a/pkgs/pkgs.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - clerie-backup = final: prev: final.callPackage ./clerie-backup {}; - clerie-cleanup-branches = final: prev: final.callPackage ./clerie-update-nixfiles/clerie-cleanup-branches.nix {}; - clerie-keys = final: prev: final.callPackage ./clerie-keys {}; - clerie-system-remote-install = final: prev: final.callPackage ./clerie-system-remote-install {}; - clerie-system-upgrade = final: prev: final.callPackage ./clerie-system-upgrade/clerie-system-upgrade.nix {}; - clerie-merge-nixfiles-update = final: prev: final.callPackage ./clerie-update-nixfiles/clerie-merge-nixfiles-update.nix {}; - clerie-sops = final: prev: final.callPackage ./clerie-sops/clerie-sops.nix {}; - clerie-sops-config = final: prev: final.callPackage ./clerie-sops/clerie-sops-config.nix {}; - clerie-sops-edit = final: prev: final.callPackage ./clerie-sops/clerie-sops-edit.nix {}; - clerie-update-nixfiles = final: prev: final.callPackage ./clerie-update-nixfiles/clerie-update-nixfiles.nix {}; - chromium-incognito = final: prev: final.callPackage ./chromium-incognito {}; - factorio-launcher = final: prev: final.callPackage ./factorio-launcher {}; - feeds-dir = final: prev: final.callPackage ./feeds-dir {}; - git-checkout-github-pr = final: prev: final.callPackage ./git-checkout-github-pr {}; - git-diff-word = final: prev: final.callPackage ./git-diff-word {}; - git-pp = final: prev: final.callPackage ./git-pp {}; - git-show-link = final: prev: final.callPackage ./git-show-link {}; - nix-remove-result-links = final: prev: final.callPackage ./nix-remove-result-links {}; - nixfiles-auto-install = final: prev: final.callPackage ./nixfiles/nixfiles-auto-install.nix {}; - nixfiles-generate-config = final: prev: final.callPackage ./nixfiles/nixfiles-generate-config.nix {}; - nixfiles-generate-backup-secrets = final: prev: final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {}; - nixfiles-update-ssh-host-keys = final: prev: final.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {}; - print-afra = final: prev: final.callPackage ./print-afra {}; - run-with-docker-group = final: prev: final.callPackage ./run-with-docker-group {}; - ssh-gpg = final: prev: final.callPackage ./ssh-gpg {}; - update-from-hydra = final: prev: final.callPackage ./update-from-hydra {}; - uptimestatus = final: prev: final.python3.pkgs.callPackage ./uptimestatus {}; - - dino = final: prev: import ./overrides/dino.nix final prev; - xmppc = final: prev: import ./overrides/xmppc.nix final prev; -}