Sync dev setup to laptop

11 files changed, 44 insertions, 10 deletions

diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix

index 8329adf..5558a08 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -237,6 +237,16 @@ args@{
     enableGhostscriptFonts = lib.mkForce false;
   };
 
+  services.cockpit = {
+    enable = true;
+    settings = {
+      WebService = {
+        AllowUnencrypted = true;
+      };
+    };
+  };
+
+  nix.settings.auto-optimise-store = lib.mkForce false;
   nixpkgs = {
     config = {
       allowUnfree = true;
@@ -263,7 +273,7 @@ args@{
   # };
 
   monitoring = {
-    monitorAll = true;
+    monitorAll = false;
     localPrometheus = true;
     exposePrometheus = true;
     localGrafana = true;
diff --git a/host/Rory-laptop/configuration.nix b/host/Rory-laptop/configuration.nix

index 320a5d9..ef678f8 100644
--- a/host/Rory-laptop/configuration.nix
+++ b/host/Rory-laptop/configuration.nix
@@ -16,14 +16,11 @@ args@{
     #      ../../modules/environments/home.nix
     ../../modules/environments/nethost-Rory-desktop.nix
     #../../modules/software-templates/profilers.nix
-#    ../../modules/software-templates/dotnet.client.nix
-    #../../modules/software-templates/devenv/dotnet.nix
 
-    #./postgres.nix
-    #./nginx.nix
-
-    #./edu/vmware.nix
-    #./edu/nodejs-dev.nix
+    ../../modules/software-templates/eid-mw.nix
+    ../../modules/software-templates/devenv/dotnet.nix
+    ../../modules/software-templates/devenv/javascript.nix
+    ./services/nix-bincache.nix
 
     # hardware-specific imports
     #./optional/hardware-specific/nvidia.nix
@@ -33,7 +30,11 @@ args@{
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    blacklistedKernelModules = [ "nova" "nova_core" "nouveau" ];
+    blacklistedKernelModules = [
+      "nova"
+      "nova_core"
+      "nouveau"
+    ];
     loader = {
       grub = {
         configurationLimit = 10;
diff --git a/host/Rory-laptop/mariadb.nix b/host/Rory-laptop/services/mariadb.nix

index 758cb3d..758cb3d 100644
--- a/host/Rory-laptop/mariadb.nix
+++ b/host/Rory-laptop/services/mariadb.nix
diff --git a/host/Rory-laptop/nginx.nix b/host/Rory-laptop/services/nginx.nix

index 3a0e622..5735b9d 100644
--- a/host/Rory-laptop/nginx.nix
+++ b/host/Rory-laptop/services/nginx.nix
@@ -31,7 +31,7 @@
       virtualHosts = {
         "discord.localhost" = import ./nginx/discord.localhost.nix { inherit pkgs; };
         "hse.localhost" = import ./nginx/hse.localhost.nix { inherit pkgs; };
-
+        "nix-bincache.rory-desktop.local" = import ./nginx/nix-bincache.nix { inherit config; };
       };
     };
   };
diff --git a/host/Rory-laptop/nginx/discord.localhost.nix b/host/Rory-laptop/services/nginx/discord.localhost.nix

index b40e13c..b40e13c 100644
--- a/host/Rory-laptop/nginx/discord.localhost.nix
+++ b/host/Rory-laptop/services/nginx/discord.localhost.nix
diff --git a/host/Rory-laptop/nginx/hse.localhost.nix b/host/Rory-laptop/services/nginx/hse.localhost.nix

index c3c1731..c3c1731 100755
--- a/host/Rory-laptop/nginx/hse.localhost.nix
+++ b/host/Rory-laptop/services/nginx/hse.localhost.nix
diff --git a/host/Rory-laptop/services/nginx/nix-bincache.nix b/host/Rory-laptop/services/nginx/nix-bincache.nix
new file mode 100644

index 0000000..29ffc4d
--- /dev/null
+++ b/host/Rory-laptop/services/nginx/nix-bincache.nix
@@ -0,0 +1,12 @@
+{ config }:
+{
+  locations."/" = {
+    proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+    extraConfig = ''
+      allow 10.0.0.0/8;
+      allow 192.168.0.0/16;
+      allow 127.0.0.0/8;
+      deny all;
+    '';
+  };
+}
diff --git a/host/Rory-laptop/services/nix-bincache.nix b/host/Rory-laptop/services/nix-bincache.nix
new file mode 100644

index 0000000..811ca63
--- /dev/null
+++ b/host/Rory-laptop/services/nix-bincache.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  services.nix-serve = {
+    enable = true;
+    package = pkgs.nix-serve-ng;
+    port = 3642;
+    bindAddress = "127.0.0.1";
+    secretKeyFile = "/data/secrets/nix-bincache-priv-key.pem";
+  };
+}
diff --git a/host/Rory-laptop/ollama.nix b/host/Rory-laptop/services/ollama.nix

index b1b0a7a..b1b0a7a 100644
--- a/host/Rory-laptop/ollama.nix
+++ b/host/Rory-laptop/services/ollama.nix
diff --git a/host/Rory-laptop/postgres.nix b/host/Rory-laptop/services/postgres.nix

index c201b04..c201b04 100644
--- a/host/Rory-laptop/postgres.nix
+++ b/host/Rory-laptop/services/postgres.nix
diff --git a/host/Rory-laptop/printing.nix b/host/Rory-laptop/services/printing.nix

index 4f86347..4f86347 100644
--- a/host/Rory-laptop/printing.nix
+++ b/host/Rory-laptop/services/printing.nix