nix bincache

3 files changed, 24 insertions, 3 deletions

diff --git a/flake.nix b/flake.nix

index 3c76ec7..ee90941 100755
--- a/flake.nix
+++ b/flake.nix
@@ -5,10 +5,12 @@
     extra-substituters = [
       "https://attic.computer.surgery/grapevine"
       "https://hyprland.cachix.org"
+      "https://nix-bincache.rory.gay"
     ];
     extra-trusted-public-keys = [
       "grapevine:nYiZ0Qz9nT7Y7kNC/2NdoS3+J9gwTyWxOvlwZnFgceA="
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "nix-bincache.rory.gay:663PIW8xxgIImxLcsokODWI2PHFWXvzJEfjX6TaIjxQ="
     ];
   };
 
@@ -207,7 +209,7 @@
         #  };
         #};
 
-        Rory-desktop = nixpkgs.lib.nixosSystem {
+        Rory-desktop = nixpkgs-master.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             ./host/Rory-desktop/configuration.nix
@@ -220,8 +222,8 @@
               { ... }:
               {
                 nix = {
-                  registry.nixpkgs.flake = nixpkgs;
-                  nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
+                  registry.nixpkgs.flake = nixpkgs-master;
+                  nixPath = [ "nixpkgs=${nixpkgs-master.outPath}" ];
                 };
               }
             )
@@ -231,6 +233,7 @@
                 nixpkgs.overlays = [
                   (final: prev: {
                     jetbrains = self.packages.${pkgs.stdenv.hostPlatform.system}.jetbrains;
+                    v4l2loopback = (pkgs.callPackage "${inputs.nixpkgs-master}/pkgs/os-specific/linux/v4l2loopback/default.nix" { });
             #        jetbrains = (prev.jetbrains // {
             #          plugins = (prev.jetbrains.plugins // {
             #            addPlugins = (pkgs.callPackage "${inputs.nixpkgs-JetbrainsPlugins}/pkgs/applications/editors/jetbrains/plugins/default.nix" { }).addPlugins;
diff --git a/host/Rory-ovh/services/nginx/rory.gay/nix-bincache.nix b/host/Rory-ovh/services/nginx/rory.gay/nix-bincache.nix
new file mode 100755

index 0000000..702f34c
--- /dev/null
+++ b/host/Rory-ovh/services/nginx/rory.gay/nix-bincache.nix
@@ -0,0 +1,8 @@
+{ config }:
+{
+  enableACME = !config.virtualisation.isVmVariant;
+  addSSL = !config.virtualisation.isVmVariant;
+  locations."/" = {
+    proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+  };
+}
diff --git a/host/Rory-ovh/services/nix-bincache.nix b/host/Rory-ovh/services/nix-bincache.nix
new file mode 100644

index 0000000..136cab4
--- /dev/null
+++ b/host/Rory-ovh/services/nix-bincache.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  services.nix-serve = {
+    enable = true;
+    package = pkgs.nix-serve-ng;
+    port = 3642;
+    bindAddress = "127.0.0.1";
+  };
+}