From 819ac7d913a5453939cb3b649e879346899bdfe4 Mon Sep 17 00:00:00 2001
From: Haak Saxberg <haak.erling@gmail.com>
Date: Tue, 9 Aug 2022 20:30:53 -0700
Subject: [PATCH] ensure all networked machines have tmux and ripgrep

---
 nix/deployments/nixops.nix                    | 32 +++++++++++--------
 nix/system/svalbard/configuration.nix         |  4 ---
 .../svalbard/hardware-configuration.nix       |  6 ++++
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/nix/deployments/nixops.nix b/nix/deployments/nixops.nix
index b2b2369..9202969 100644
--- a/nix/deployments/nixops.nix
+++ b/nix/deployments/nixops.nix
@@ -7,21 +7,27 @@
     storage.legacy = { };
   };
 
-  defaults = {
-    imports = [
-      # make sure you have properly added the home-manager channel!
-      <home-manager/nixos>
-    ];
+  defaults = { pkgs, ... }:
+    {
+      imports = [
+        # make sure you have properly added the home-manager channel!
+        <home-manager/nixos>
+      ];
 
-    documentation.enable = false;
+      documentation.enable = false;
 
-    # for nixops to log in and perform operations as haak (instead of root)
-    security.sudo.wheelNeedsPassword = false;
-    users.users.root.openssh.authorizedKeys.keys = [
-      (import ../system/framework/keys.nix).ssh.public
-    ];
-    home-manager.users.haak = (import ../home/commandline.nix);
-  };
+      # for nixops to log in and perform operations as haak (instead of root)
+      security.sudo.wheelNeedsPassword = false;
+      users.users.root.openssh.authorizedKeys.keys = [
+        (import ../system/framework/keys.nix).ssh.public
+      ];
+      home-manager.users.haak = (import ../home/commandline.nix);
+
+      environment.systemPackages = with pkgs; [
+        tmux
+        ripgrep
+      ];
+    };
 
   server = {
     deployment.targetHost = "192.168.1.65";
diff --git a/nix/system/svalbard/configuration.nix b/nix/system/svalbard/configuration.nix
index 6204c6b..28208cd 100644
--- a/nix/system/svalbard/configuration.nix
+++ b/nix/system/svalbard/configuration.nix
@@ -52,9 +52,6 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     git
-    mullvad-vpn
-    rtorrent
-    tmux
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
   ];
 
@@ -76,7 +73,6 @@
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
-  services.mullvad-vpn.enable = true;
   networking.wireguard.enable = true;
   networking.firewall.checkReversePath = "loose";
 
diff --git a/nix/system/svalbard/hardware-configuration.nix b/nix/system/svalbard/hardware-configuration.nix
index 1875308..c2a23f6 100644
--- a/nix/system/svalbard/hardware-configuration.nix
+++ b/nix/system/svalbard/hardware-configuration.nix
@@ -26,6 +26,12 @@
       fsType = "zfs";
     };
 
+  fileSystems."/export" =
+    {
+      device = "/storage";
+      options = [ "bind" ];
+    };
+
   fileSystems."/boot/efi" =
     {
       device = "/dev/disk/by-uuid/5099-A753";