From 23076fa1126e0b68109445f44cf7065d11339806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Tue, 3 Feb 2026 18:29:37 +0100
Subject: [PATCH] refactor: move package definition to nix/package.nix

Keeps flake.nix cleaner by extracting the package definition.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 flake.nix       | 26 +-------------------------
 nix/package.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 nix/package.nix

diff --git a/flake.nix b/flake.nix
index e7ad5e4..fe9e11e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,31 +18,7 @@
           pkgs = pkgsFor system;
         in
         {
-          nixos-options = pkgs.buildGoModule {
-            pname = "nixos-options-mcp";
-            version = "0.1.0";
-            src = ./.;
-
-            vendorHash = "sha256-D0KIxQC9ctIAaHBFTvkhBE06uOZwDUcIw8471Ug2doY=";
-
-            subPackages = [ "cmd/nixos-options" ];
-
-            nativeBuildInputs = [ pkgs.makeWrapper ];
-
-            postInstall = ''
-              wrapProgram $out/bin/nixos-options \
-                --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]}
-            '';
-
-            meta = with pkgs.lib; {
-              description = "MCP server for NixOS options search and query";
-              homepage = "https://git.t-juice.club/torjus/labmcp";
-              license = licenses.mit;
-              maintainers = [ ];
-              mainProgram = "nixos-options";
-            };
-          };
-
+          nixos-options = pkgs.callPackage ./nix/package.nix { src = ./.; };
           default = self.packages.${system}.nixos-options;
         });
 
diff --git a/nix/package.nix b/nix/package.nix
new file mode 100644
index 0000000..aedab46
--- /dev/null
+++ b/nix/package.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, makeWrapper, nix, src }:
+
+buildGoModule {
+  pname = "nixos-options-mcp";
+  version = "0.1.0";
+  inherit src;
+
+  vendorHash = "sha256-D0KIxQC9ctIAaHBFTvkhBE06uOZwDUcIw8471Ug2doY=";
+
+  subPackages = [ "cmd/nixos-options" ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/nixos-options \
+      --prefix PATH : ${lib.makeBinPath [ nix ]}
+  '';
+
+  meta = with lib; {
+    description = "MCP server for NixOS options search and query";
+    homepage = "https://git.t-juice.club/torjus/labmcp";
+    license = licenses.mit;
+    maintainers = [ ];
+    mainProgram = "nixos-options";
+  };
+}