From c1fb306ed1c7f709dd4f5e70798ca6838406db77 Mon Sep 17 00:00:00 2001
From: Callum Leslie <git@cleslie.uk>
Date: Sun, 8 Sep 2024 20:55:34 +0100
Subject: [PATCH] move packages to packages folder and abstract out
 tmux-sessionizer

---
 flake.nix                                      | 14 +-------------
 home/c/programs/tmux/default.nix               |  8 +-------
 packages/default.nix                           | 18 ++++++++++++++++++
 packages/tmux-sessionizer/default.nix          |  8 ++++++++
 .../tmux-sessionizer}/tmux-sessionizer.sh      |  2 +-
 5 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 packages/default.nix
 create mode 100644 packages/tmux-sessionizer/default.nix
 rename {home/c/programs/tmux => packages/tmux-sessionizer}/tmux-sessionizer.sh (98%)

diff --git a/flake.nix b/flake.nix
index 77b630e..3f2f16f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -78,19 +78,7 @@
 
         apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs'.nixinate.packages self);
 
-        packages = {
-          om = inputs'.omnix.packages.default;
-          nixvim = inputs'.nixvim.packages.default;
-          agenix = inputs'.agenix.packages.default;
-          vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
-          devour-flake = pkgs.callPackage inputs.devour-flake {};
-          jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override {
-            ffmpeg_6-full = pkgs.ffmpeg_6-full.override {
-              withMfx = false;
-              withVpl = true;
-            };
-          };
-        };
+        packages = import ./packages {inherit pkgs inputs inputs';};
       };
 
       debug = false;
diff --git a/home/c/programs/tmux/default.nix b/home/c/programs/tmux/default.nix
index f39d845..ffabf71 100644
--- a/home/c/programs/tmux/default.nix
+++ b/home/c/programs/tmux/default.nix
@@ -55,12 +55,6 @@
   };
 
   home.packages = [
-    (pkgs.writeShellApplication {
-      name = "tmux-sessionizer";
-      runtimeInputs = [pkgs.tmux pkgs.ghq];
-      text = ''
-        ${builtins.readFile ./tmux-sessionizer.sh}
-      '';
-    })
+    pkgs.tmux-sessionizer-cl
   ];
 }
diff --git a/packages/default.nix b/packages/default.nix
new file mode 100644
index 0000000..028509c
--- /dev/null
+++ b/packages/default.nix
@@ -0,0 +1,18 @@
+{
+  pkgs,
+  inputs,
+  inputs',
+}: {
+  tmux-sessionizer-cl = pkgs.callPackage ./tmux-sessionizer {};
+  om = inputs'.omnix.packages.default;
+  nixvim = inputs'.nixvim.packages.default;
+  agenix = inputs'.agenix.packages.default;
+  vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
+  devour-flake = pkgs.callPackage inputs.devour-flake {};
+  jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override {
+    ffmpeg_6-full = pkgs.ffmpeg_6-full.override {
+      withMfx = false;
+      withVpl = true;
+    };
+  };
+}
diff --git a/packages/tmux-sessionizer/default.nix b/packages/tmux-sessionizer/default.nix
new file mode 100644
index 0000000..5eeba30
--- /dev/null
+++ b/packages/tmux-sessionizer/default.nix
@@ -0,0 +1,8 @@
+{pkgs}: let
+  name = "tmux-sessionizer";
+  runtimeInputs = [pkgs.tmux pkgs.ghq pkgs.fzf];
+  text = builtins.readFile ./tmux-sessionizer.sh;
+in
+  pkgs.writeShellApplication {
+    inherit name runtimeInputs text;
+  }
diff --git a/home/c/programs/tmux/tmux-sessionizer.sh b/packages/tmux-sessionizer/tmux-sessionizer.sh
similarity index 98%
rename from home/c/programs/tmux/tmux-sessionizer.sh
rename to packages/tmux-sessionizer/tmux-sessionizer.sh
index d3571db..3f6799f 100755
--- a/home/c/programs/tmux/tmux-sessionizer.sh
+++ b/packages/tmux-sessionizer/tmux-sessionizer.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 pick_session() {
 	selected=$(ghq list -p | fzf || exit 0)