From 615392d05dd484fd8c0905f019cf1c83866a6c8e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 9 Mar 2023 19:37:59 +0100
Subject: [PATCH] remote-exec nom, fix jornane

---
 .remoteenv                |  3 +++
 flake.nix                 | 11 +++++++++--
 users/jornane/default.nix |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 .remoteenv

diff --git a/.remoteenv b/.remoteenv
new file mode 100644
index 0000000..89b2866
--- /dev/null
+++ b/.remoteenv
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+eval "$(nix print-dev-env .#nomos-rebuild)"
+eval "$(nix print-dev-env .#nomos-rebuild)"
diff --git a/flake.nix b/flake.nix
index 4bc89f0..7558f0e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,8 @@
 {
   description = "pbsds' system/home flake";
 
-  inputs.nixpkgs.url      = "github:NixOS/nixpkgs/nixos-22.11-small";
-  inputs.unstable.url     = "github:NixOS/nixpkgs/nixos-unstable-small";
+  inputs.nixpkgs.url      = "github:NixOS/nixpkgs/nixos-22.11";
+  inputs.unstable.url     = "github:NixOS/nixpkgs/nixos-unstable";
   inputs.nur.url          = "github:nix-community/NUR";
   inputs.home-manager.url = "github:nix-community/home-manager"; #/release-22.11";
   inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs";
@@ -99,6 +99,13 @@
     });
 
     devShells = forAllSystems (system: { # TODO: apply my overlays?
+      nomos-rebuild = nixpkgs.legacyPackages.${system}.mkShell {
+        packages =  with nixpkgs.legacyPackages.${system}; [
+          (writeScriptBin "nixos-rebuild" ''
+            exec ${nixos-rebuild}/bin/nixos-rebuild "$@" |& ${nix-output-monitor}/bin/nom
+          '')
+        ];
+      };
       non-nixos = nixpkgs.legacyPackages.${system}.mkShell {
         packages =  with nixpkgs.legacyPackages.${system}; [
           nix-output-monitor
diff --git a/users/jornane/default.nix b/users/jornane/default.nix
index 239ee2d..5b15cb9 100644
--- a/users/jornane/default.nix
+++ b/users/jornane/default.nix
@@ -5,7 +5,7 @@
     uid = 1002;
     description = "jornane";
     extraGroups = [ "networkmanager" "wheel" ]; # TODO: NAS stuff
-    shell = pkgs.zhs;
+    shell = pkgs.zsh;
 
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhGRFktIRrppVVILraEn5eTrANBIBMcpNT4qvNcd7Ut"