From 725ce0a79072b281045fe8c7c61fa244dd11a79b Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 4 Oct 2019 23:26:28 +0200
Subject: Re-organise development configuration

---
 system/marvin.nix                         |  2 --
 system/modules/development/base.nix       | 28 ----------------------------
 system/modules/development/kubernetes.nix | 21 ---------------------
 system/modules/development/lisp.nix       | 13 -------------
 system/modules/kubernetes.nix             | 21 +++++++++++++++++++++
 system/prefect.nix                        |  2 --
 system/satoshipad.nix                     |  1 -
 system/trillian.nix                       |  1 -
 user/modules/development/base.nix         | 28 ++++++++++++++++++++++++++++
 user/modules/development/lisp.nix         | 13 +++++++++++++
 user/prefect.nix                          |  2 ++
 user/satoshipad.nix                       |  1 +
 user/trillian.nix                         |  1 +
 13 files changed, 66 insertions(+), 68 deletions(-)
 delete mode 100644 system/modules/development/base.nix
 delete mode 100644 system/modules/development/kubernetes.nix
 delete mode 100644 system/modules/development/lisp.nix
 create mode 100644 system/modules/kubernetes.nix
 create mode 100644 user/modules/development/base.nix
 create mode 100644 user/modules/development/lisp.nix

diff --git a/system/marvin.nix b/system/marvin.nix
index 8f070734..e13a7d6a 100644
--- a/system/marvin.nix
+++ b/system/marvin.nix
@@ -8,8 +8,6 @@
     ./modules/configuration/british-english.nix
     ./modules/configuration/nix.nix
     ./modules/configuration/user.nix
-    ./modules/development/base.nix
-    ./modules/development/lisp.nix
     ./modules/hardware/adb.nix
     ./modules/hardware/audio.nix
     ./modules/hardware/qwerty.nix
diff --git a/system/modules/development/base.nix b/system/modules/development/base.nix
deleted file mode 100644
index 63ee5b72..00000000
--- a/system/modules/development/base.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, pkgs, ... }:
-
-{ environment.systemPackages = with pkgs; [
-    checkbashisms
-    editorconfig-core-c
-    go
-
-    wrk
-
-    ag
-    (ripgrep.override { withPCRE2 = true; })
-
-    httpie
-    jq
-
-    discount
-  ] ++ (
-    if !stdenv.isDarwin
-    then [
-      whois
-      ldns
-      httping
-      http-prompt
-      firefox-devedition-bin
-    ] else [
-    ]
-  );
-}
diff --git a/system/modules/development/kubernetes.nix b/system/modules/development/kubernetes.nix
deleted file mode 100644
index 692e46d6..00000000
--- a/system/modules/development/kubernetes.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  networking.bridges = {
-    cbr0.interfaces = [];
-  };
-  networking.interfaces = {
-    cbr0 = {
-      ipv4.addresses = [
-      { address = "10.10.0.1";
-        prefixLength = 24;
-      }
-      ];
-    };
-  };
-  services.kubernetes.roles = ["master" "node"];
-  services.kubernetes.kubelet.extraOpts = "--fail-swap-on=false";
-  virtualisation.docker.extraOptions = ''
-    --iptables=false --ip-masq=false -b cbr0
-  '';
-}
diff --git a/system/modules/development/lisp.nix b/system/modules/development/lisp.nix
deleted file mode 100644
index dc521feb..00000000
--- a/system/modules/development/lisp.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-
-{ environment.systemPackages = with pkgs; [
-    ccl
-    sbcl
-    lispPackages.quicklisp
-    asdf
-    cl-launch
-
-    dust
-    pixie
-  ];
-}
diff --git a/system/modules/kubernetes.nix b/system/modules/kubernetes.nix
new file mode 100644
index 00000000..692e46d6
--- /dev/null
+++ b/system/modules/kubernetes.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+{
+  networking.bridges = {
+    cbr0.interfaces = [];
+  };
+  networking.interfaces = {
+    cbr0 = {
+      ipv4.addresses = [
+      { address = "10.10.0.1";
+        prefixLength = 24;
+      }
+      ];
+    };
+  };
+  services.kubernetes.roles = ["master" "node"];
+  services.kubernetes.kubelet.extraOpts = "--fail-swap-on=false";
+  virtualisation.docker.extraOptions = ''
+    --iptables=false --ip-masq=false -b cbr0
+  '';
+}
diff --git a/system/prefect.nix b/system/prefect.nix
index 78fd68d6..d6d9aed2 100644
--- a/system/prefect.nix
+++ b/system/prefect.nix
@@ -9,8 +9,6 @@
     ./modules/configuration/british-english.nix
     ./modules/configuration/nixos.nix
     ./modules/configuration/user.nix
-    ./modules/development/base.nix
-    ./modules/development/lisp.nix
     ./modules/hardware/audio.nix
     ./modules/hardware/bare-metal.nix
     ./modules/hardware/mouse.nix
diff --git a/system/satoshipad.nix b/system/satoshipad.nix
index 183393fc..98849c35 100644
--- a/system/satoshipad.nix
+++ b/system/satoshipad.nix
@@ -10,7 +10,6 @@
     ./modules/configuration/british-english.nix
     ./modules/configuration/nix.nix
     ./modules/configuration/user.nix
-    ./modules/development/base.nix
     ./modules/hardware/audio.nix
     ./modules/hardware/systemd-boot.nix
     ./modules/hardware/keyboardio-model01.nix
diff --git a/system/trillian.nix b/system/trillian.nix
index 93ad41e1..e7fbb7f9 100644
--- a/system/trillian.nix
+++ b/system/trillian.nix
@@ -4,7 +4,6 @@
   imports = [
     ./private/default.nix
 
-    ./modules/development/base.nix
     ./modules/programs/accounting.nix
     ./modules/programs/shell.nix
   ];
diff --git a/user/modules/development/base.nix b/user/modules/development/base.nix
new file mode 100644
index 00000000..3d908729
--- /dev/null
+++ b/user/modules/development/base.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, ... }:
+
+{ home.packages = with pkgs; [
+    checkbashisms
+    editorconfig-core-c
+    go
+
+    wrk
+
+    ag
+    (ripgrep.override { withPCRE2 = true; })
+
+    httpie
+    jq
+
+    discount
+  ] ++ (
+    if !stdenv.isDarwin
+    then [
+      whois
+      ldns
+      httping
+      http-prompt
+      firefox-devedition-bin
+    ] else [
+    ]
+  );
+}
diff --git a/user/modules/development/lisp.nix b/user/modules/development/lisp.nix
new file mode 100644
index 00000000..b8d465ee
--- /dev/null
+++ b/user/modules/development/lisp.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{ home.packages = with pkgs; [
+    ccl
+    sbcl
+    lispPackages.quicklisp
+    asdf
+    cl-launch
+
+    dust
+    pixie
+  ];
+}
diff --git a/user/prefect.nix b/user/prefect.nix
index 307ce89b..8a21b04a 100644
--- a/user/prefect.nix
+++ b/user/prefect.nix
@@ -5,6 +5,8 @@
     ./modules/base.nix
     ./modules/dunst.nix
     ./modules/emacs.nix
+    ./modules/development/base.nix
+    ./modules/development/lisp.nix
     ./modules/git.nix
     ./modules/gnupg.nix
     ./modules/i3.nix
diff --git a/user/satoshipad.nix b/user/satoshipad.nix
index e08dbab8..e76693d2 100644
--- a/user/satoshipad.nix
+++ b/user/satoshipad.nix
@@ -4,6 +4,7 @@
   imports = [
     ./modules/autorandr.nix
     ./modules/base.nix
+    ./modules/development/base.nix
     ./modules/dunst.nix
     ./modules/emacs.nix
     ./modules/git.nix
diff --git a/user/trillian.nix b/user/trillian.nix
index 6c2e468c..6df22f67 100644
--- a/user/trillian.nix
+++ b/user/trillian.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./modules/base.nix
+    ./modules/development/base.nix
     ./modules/emacs.nix
     ./modules/git.nix
     ./modules/gnupg.nix
-- 
cgit 1.4.1