From 40f300f95a4bcd4cfd12bc6070c2c09163e9be35 Mon Sep 17 00:00:00 2001
From: Philipp Hochkamp <git@phochkamp.de>
Date: Sat, 5 Mar 2022 12:34:52 +0100
Subject: [PATCH] feat: packages

---
 flake.nix                   | 10 +++++++++-
 hm-imports/cli.nix          |  1 +
 packages/.gitkeep           |  0
 packages/scripts.nix        |  9 +++++++++
 packages/scripts/nosrebuild |  8 ++++++++
 packages/scripts/nr         |  3 +++
 packages/scripts/ns         |  3 +++
 7 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 packages/.gitkeep
 create mode 100644 packages/scripts.nix
 create mode 100755 packages/scripts/nosrebuild
 create mode 100755 packages/scripts/nr
 create mode 100755 packages/scripts/ns

diff --git a/flake.nix b/flake.nix
index 0922d57b..43e5078c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,9 @@
       overlays = [
         self.overlay
         neovim-nightly-overlay.overlay
+        (final: prev: {
+          my = self.packages.${prev.system};
+        })
       ];
     };
 
@@ -130,5 +133,10 @@
       daedalus = darwinSystem "aarch64-darwin" [ ./hosts/daedalus/default.nix ]; # TODO 
     };
 
-  };
+  } // utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in {
+    devShell = pkgs.mkShell {
+      buildInputs = with pkgs; [lefthook nixpkgs-fmt];
+    };
+    packages = lib.my.mapModules ./packages (p: pkgs.callPackage p { inputs = inputs;});
+  });
 }
diff --git a/hm-imports/cli.nix b/hm-imports/cli.nix
index 3751b875..b42b7513 100644
--- a/hm-imports/cli.nix
+++ b/hm-imports/cli.nix
@@ -2,6 +2,7 @@
 {
   home.packages = with pkgs; [
 
+      my.scripts
       nnn
       bat
       htop
diff --git a/packages/.gitkeep b/packages/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/scripts.nix b/packages/scripts.nix
new file mode 100644
index 00000000..dd84d830
--- /dev/null
+++ b/packages/scripts.nix
@@ -0,0 +1,9 @@
+{ stdenv, ...}:
+stdenv.mkDerivation {
+  name = "scripts";
+  src = ./scripts;
+  installPhase = ''
+    mkdir -p $out/bin
+    cp * $out/bin
+  '';
+}
diff --git a/packages/scripts/nosrebuild b/packages/scripts/nosrebuild
new file mode 100755
index 00000000..e84cc175
--- /dev/null
+++ b/packages/scripts/nosrebuild
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+REV=$(curl https://api.github.com/repos/ragon000/nixos-config/branches/main | jq -r .commit.sha)
+if [[ $(uname) == "Linux" ]]; then
+  sudo nixos-rebuild switch --flake "github:ragon000/nixos-config?rev=$REV"
+else # Darwin
+  /nix/var/nix/profiles/system/sw/bin/darwin-rebuild switch  --flake "github:ragon000/nixos-config?rev=$REV"
+fi
diff --git a/packages/scripts/nr b/packages/scripts/nr
new file mode 100755
index 00000000..09009a42
--- /dev/null
+++ b/packages/scripts/nr
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+nix run nixpkgs#$1
diff --git a/packages/scripts/ns b/packages/scripts/ns
new file mode 100755
index 00000000..03d835c2
--- /dev/null
+++ b/packages/scripts/ns
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+nix shell nixpkgs#$1