Merge ymir:.nixpkgs/utils

4 files changed, 43 insertions, 3 deletions

diff --git a/nix/cliparg.nix b/nix/cliparg.nix
index fcb2066..8aa9a71 100644
--- a/nix/cliparg.nix
+++ b/nix/cliparg.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchgit
-,       makeWrapper
-,       xclip
+, makeWrapper
+, xclip
 }:
 
 stdenv.mkDerivation rec {
diff --git a/nix/default.nix b/nix/default.nix
index 9aadc46..36aaa22 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -3,5 +3,6 @@
 let
   pkgs = import <nixpkgs> {};
 in rec {
-  cliparg = pkgs.callPackage (import ./cliparg.nix) {};
+  cliparg = pkgs.callPackage ./cliparg.nix {};
+  rebuild-system = pkgs.callPackage ./rebuild-system.nix {};
 }
diff --git a/nix/rebuild-system.nix b/nix/rebuild-system.nix
new file mode 100644
index 0000000..311f331
--- /dev/null
+++ b/nix/rebuild-system.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, fetchgit
+, makeWrapper
+, sudo
+, git
+}:
+
+stdenv.mkDerivation rec {
+  inherit sudo git;
+  name = "rebuild-system-${version}";
+  version = "0.1";
+  src = fetchgit {
+    inherit name;
+    url = git://git.yggdrasil.li/utils;
+    rev = "885af08edef3eede81101d4303e3a025dc078449";
+    sha256 = "e4a1e4c6661a5c8f071b22251fda15bac86051d19d6c5ce60fbcd87dad8386e4";
+  };
+  buildInputs = [ makeWrapper ];
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src/rebuild-system $out/bin/
+    chmod +x $out/bin/rebuild-system
+    wrapProgram $out/bin/rebuild-system \
+      --prefix PATH : /var/setuid-wrappers \
+      --prefix PATH : ${git}/bin
+  '';
+}
diff --git a/rebuild-system b/rebuild-system
new file mode 100644
index 0000000..8f116e3
--- /dev/null
+++ b/rebuild-system
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+if [[ "$USER" != "root" ]]; then
+    exec sudo -- $0 $@
+fi
+
+path=/etc/nixos
+
+git -C $path pull && \
+    git -C $path submodule update && \
+    nixos-rebuild $@