From cd96a27ec3a02c3c7a65d5bdf4f6930174436d25 Mon Sep 17 00:00:00 2001
From: John Locke <john@freelock.com>
Date: Sun, 17 Mar 2024 10:35:06 -0700
Subject: [PATCH] Move cli tools to ops and add nixos-generate

---
 desktop/dev.nix                          |  3 ---
 flake.nix                                |  5 +++--
 hosts/desktop/valhalla/configuration.nix |  1 +
 ops/default.nix                          | 10 ++++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 ops/default.nix

diff --git a/desktop/dev.nix b/desktop/dev.nix
index 3145b3e..d6d0553 100644
--- a/desktop/dev.nix
+++ b/desktop/dev.nix
@@ -1,14 +1,11 @@
 {pkgs, ...}: {
 
   environment.systemPackages = with pkgs; [
-    awscli2
-    bitwarden-cli
     ddev
     jetbrains.phpstorm
     mkcert
     php81
     polypane
-    vault
     vscode
   ];
 
diff --git a/flake.nix b/flake.nix
index 97528f0..0c9ce41 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,14 +5,15 @@
     # configuration.nix. You can also use latter versions if you wish to
     # upgrade.
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixos-needsreboot.url = "https://flakehub.com/f/thefossguy/nixos-needsreboot/*.tar.gz";
+    # nixos-needsreboot.url = "https://flakehub.com/f/thefossguy/nixos-needsreboot/*.tar.gz";
   };
-  outputs = inputs@{ self, nixpkgs, nixos-needsreboot, ... }: {
+  outputs = inputs@{ self, nixpkgs, ... }: {
     # NOTE: 'nixos' is the default hostname set by the installer
     nixosConfigurations.valhalla = nixpkgs.lib.nixosSystem {
       # NOTE: Change this to aarch64-linux if you are on ARM
       system = "x86_64-linux";
       modules = [ ./hosts/desktop/valhalla/configuration.nix ];
     };
+    # environment.systemPackages = [nixos-needsreboot.packages.${nixpkgs.system}.default];
   };
 }
diff --git a/hosts/desktop/valhalla/configuration.nix b/hosts/desktop/valhalla/configuration.nix
index a205bcf..bbec559 100644
--- a/hosts/desktop/valhalla/configuration.nix
+++ b/hosts/desktop/valhalla/configuration.nix
@@ -11,6 +11,7 @@
       ../../../desktop
       ../../../desktop/dev.nix
       ../../../desktop/office.nix
+      ../../../ops
       ../../../users/owners.nix
     ];
 
diff --git a/ops/default.nix b/ops/default.nix
new file mode 100644
index 0000000..30b681e
--- /dev/null
+++ b/ops/default.nix
@@ -0,0 +1,10 @@
+{pkgs, ...}: {
+
+  environment.systemPackages = with pkgs; [
+    awscli2
+    bitwarden-cli
+    mkcert
+    vault
+    nixos-generate
+  ];
+}