Revert failed experiment

2 files changed, 21 insertions, 36 deletions

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

index 09b87d7..c58e57c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -218,11 +218,11 @@
     "draupnirSrc": {
       "flake": false,
       "locked": {
-        "lastModified": 1776700244,
-        "narHash": "sha256-o9INGoK7PjMl4zMzQbfQENpszTaUTjwpsES/1HCR3ew=",
+        "lastModified": 1777288766,
+        "narHash": "sha256-10Pj8DOiJfC/khoNiXQuMA6jZwRJP3RJq2ztnMt0PEM=",
         "owner": "the-draupnir-project",
         "repo": "Draupnir",
-        "rev": "a4c41584436c9c4cdbff3eff2f36fcd19a7fa3c5",
+        "rev": "56c904880fabbc77131f1e8e18823b9880d86a98",
         "type": "github"
       },
       "original": {
@@ -673,11 +673,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1777151655,
-        "narHash": "sha256-Th3a5OZyEy4kCoyLfefnt+2dwRIrFQqYgMsayF9qzFw=",
+        "lastModified": 1777295000,
+        "narHash": "sha256-xzWerLYQG2W+VGJfaZ+8/Puswbok1o8Tix6/6hIW1rY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6f59831b23d03bbf4fbd13ad167ae25da294cc14",
+        "rev": "b408d49b845167add697937761a89c41c996ac7a",
         "type": "github"
       },
       "original": {
@@ -1165,11 +1165,11 @@
         "systems": "systems_7"
       },
       "locked": {
-        "lastModified": 1776531667,
-        "narHash": "sha256-AFiJUWK8RDeL4c3s0XW3oSTkBqxxsQqUXrwHoJZfIm8=",
+        "lastModified": 1777198208,
+        "narHash": "sha256-kHXlw0OUr5DSSxKCgjmLurCF4GljP0hd5V4PP3gp4WE=",
         "owner": "nix-community",
         "repo": "nix-jetbrains-plugins",
-        "rev": "96ef56d2c967771d7f1f5436ac11e8cca5014d95",
+        "rev": "2888e8504022bac1e4d5d6b14c6c5d542147ad6c",
         "type": "github"
       },
       "original": {
@@ -1196,11 +1196,11 @@
     },
     "nixpkgs-RoryNix": {
       "locked": {
-        "lastModified": 1777162924,
-        "narHash": "sha256-JxPbz8vMa6NuVVeFGwbR5dAHlFFpLqHzjVJVlcq/NIc=",
+        "lastModified": 1777294193,
+        "narHash": "sha256-9UacjMqp/xX3hnNipbm8IesQ5rMuhZG2Olw93stZi0c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0aacb00bef0c05fc311581b2e0a22f8ee58a7bef",
+        "rev": "e584fa67e19c45dbf01a8544ac25981e17b73403",
         "type": "github"
       },
       "original": {
@@ -1212,11 +1212,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1777162924,
-        "narHash": "sha256-JxPbz8vMa6NuVVeFGwbR5dAHlFFpLqHzjVJVlcq/NIc=",
+        "lastModified": 1777294193,
+        "narHash": "sha256-9UacjMqp/xX3hnNipbm8IesQ5rMuhZG2Olw93stZi0c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0aacb00bef0c05fc311581b2e0a22f8ee58a7bef",
+        "rev": "e584fa67e19c45dbf01a8544ac25981e17b73403",
         "type": "github"
       },
       "original": {
@@ -1388,11 +1388,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1775710090,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
+        "lastModified": 1776548001,
+        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
+        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix

index ffaee55..3f7d013 100755
--- a/flake.nix
+++ b/flake.nix
@@ -67,17 +67,6 @@
       inputs.lix.follows = "lix";
     };
 
-    # parallel eval testing
-    detsys-nix = {
-      url = "github:DeterminateSystems/nix-src";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        # clean up some junk
-        nixpkgs-regression.follows = "";
-        nixpkgs-23-11.follows = "";
-      };
-    };
-
     nom = {
       url = "github:maralorn/nix-output-monitor";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -165,7 +154,7 @@
             ./host/Rory-nginx/services/matrix/synapse/workers/module.nix
 
             home-manager.nixosModules.home-manager
-            #lix-module.nixosModules.default
+            lix-module.nixosModules.default
             grapevine.nixosModules.default
             #drasl.nixosModules.drasl
             ooye.modules.default
@@ -188,8 +177,6 @@
                     });
                   })
                 ];
-
-                nix.package = inputs.detsys-nix.packages.${pkgs.system}.default;
               }
             )
           ];
@@ -256,7 +243,7 @@
             ./hardware-configuration.nix
             # ./packages/overlays/jetbrains-plugins.nix
             home-manager.nixosModules.home-manager
-            #lix-module.nixosModules.default
+            lix-module.nixosModules.default
             sops-nix.nixosModules.sops
             (
               { ... }:
@@ -282,7 +269,6 @@
 #                    rabbitmq-server = (pkgs.callPackage "${inputs.nixpkgs-stable}/pkgs/by-name/ra/rabbitmq-server/package.nix" { });
                   })
                 ];
-                nix.package = inputs.detsys-nix.packages.${pkgs.system}.default;
               }
             )
           ];
@@ -303,7 +289,7 @@
             ./hardware-configuration.nix
             ./packages/overlays/jetbrains-plugins.nix
             home-manager.nixosModules.home-manager
-            #lix-module.nixosModules.default
+            lix-module.nixosModules.default
             sops-nix.nixosModules.sops
 
             #temporary:
@@ -313,7 +299,6 @@
               { pkgs, ... }:
               {
                 nix = {
-                  package = inputs.detsys-nix.packages.${pkgs.system}.default;
                   registry.nixpkgs.flake = nixpkgs;
                   nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
                 };