about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--flake.nix1
-rw-r--r--hosts/mba/default.nix4
-rw-r--r--nix/flake/hosts.nix4
-rw-r--r--nix/flake/packages.nix16
-rw-r--r--nix/profiles/home-manager/personal.nix3
-rw-r--r--tools/default.nix10
6 files changed, 28 insertions, 10 deletions
diff --git a/flake.nix b/flake.nix
index 3a42cd9..d7f5c46 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,7 @@
 
       imports = [
         ./nix/flake/devshell.nix
+        ./nix/flake/packages.nix
         ./nix/flake/hosts.nix
       ];
     };
diff --git a/hosts/mba/default.nix b/hosts/mba/default.nix
index 081e22a..7d20580 100644
--- a/hosts/mba/default.nix
+++ b/hosts/mba/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, self, ... }:
 {
   services.nix-daemon.enable = true;
 
@@ -21,5 +21,5 @@
 
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
-  home-manager.users.fcuny = import ../../nix/profiles/home-manager/personal.nix;
+  home-manager.users.fcuny = import ../../nix/profiles/home-manager/personal.nix { inherit pkgs self; };
 }
diff --git a/nix/flake/hosts.nix b/nix/flake/hosts.nix
index 7348672..8e9316a 100644
--- a/nix/flake/hosts.nix
+++ b/nix/flake/hosts.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 let
   inherit (inputs) nixpkgs darwin home-manager firefox-darwin nur;
   inherit (nixpkgs.lib) mkMerge;
@@ -18,7 +18,7 @@ let
           ];
         }
       ];
-      specialArgs = { inherit inputs; };
+      specialArgs = { inherit inputs self; };
     };
 in
 {
diff --git a/nix/flake/packages.nix b/nix/flake/packages.nix
new file mode 100644
index 0000000..38e243f
--- /dev/null
+++ b/nix/flake/packages.nix
@@ -0,0 +1,16 @@
+{ inputs, ... }: {
+  imports = [
+    inputs.flake-parts.flakeModules.easyOverlay
+  ];
+
+  perSystem = { config, pkgs, ... }: {
+    overlayAttrs = {
+      inherit (config.packages)
+        seqstat;
+    };
+
+    packages = {
+      seqstat = pkgs.callPackage ../../tools/seqstat { };
+    };
+  };
+}
diff --git a/nix/profiles/home-manager/personal.nix b/nix/profiles/home-manager/personal.nix
index 5beb11e..0d8b5a5 100644
--- a/nix/profiles/home-manager/personal.nix
+++ b/nix/profiles/home-manager/personal.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ pkgs, self, ... }: {
 
   home.stateVersion = "23.05";
 
@@ -21,6 +21,7 @@
     ripgrep
     rnix-lsp
     tree
+    self.packages.${pkgs.system}.seqstat
   ];
 
   home.sessionVariables = {
diff --git a/tools/default.nix b/tools/default.nix
index cc20040..8e537c9 100644
--- a/tools/default.nix
+++ b/tools/default.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }:
 
 pkgs.lib.makeScope pkgs.newScope (pkgs: {
-  dnsmasq-to-html = pkgs.callPackage ./dnsmasq-leases-html { };
-  git-blame-stats = pkgs.callPackage ./git-blame-stats { };
-  git-broom = pkgs.callPackage ./git-broom { };
-  ipconverter = pkgs.callPackage ./ipconverter { };
-  perf-flamegraph-pid = pkgs.callPackage ./perf-flamegraph-pid { };
+  # dnsmasq-to-html = pkgs.callPackage ./dnsmasq-leases-html { };
+  # git-blame-stats = pkgs.callPackage ./git-blame-stats { };
+  # git-broom = pkgs.callPackage ./git-broom { };
+  # ipconverter = pkgs.callPackage ./ipconverter { };
+  # perf-flamegraph-pid = pkgs.callPackage ./perf-flamegraph-pid { };
   seqstat = pkgs.callPackage ./seqstat { };
 })