bump nixpkgs again and fix other flake refs

7 files changed, 44 insertions, 15 deletions

diff --git a/flake.lock b/flake.lock
index 615c445..62d1fb2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1790822859,
-        "narHash": "sha256-VBA0QerzzmL+4wxgtwiCdiLwLpJg2/9xOxhgO3BRJQA=",
-        "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
+        "lastModified": 1791048980,
+        "narHash": "sha256-u3KCLxsnf1622GdFccg8hmkEIutOZ1h4pvia5ERjIuI=",
+        "rev": "a7868a727837f3c09cee2ce0ca671c76b1589fed",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1083223.c59305bab206/nixexprs.tar.zst"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1084968.a7868a727837/nixexprs.tar.zst"
       },
       "original": {
         "type": "tarball",
diff --git a/machines/feneri.nix b/machines/feneri.nix
index e75738b..605159e 100644
--- a/machines/feneri.nix
+++ b/machines/feneri.nix
@@ -1,9 +1,7 @@
-{ flake, modulesPath, ... }:
+{ config, modulesPath, ... }:
 
 {
   imports = [
-    # flake.outputs.nixosModules.disk
-    # flake.outputs.nixosModules.network
     (modulesPath + "/profiles/qemu-guest.nix")
     (modulesPath + "/virtualisation/qemu-guest-agent.nix")
   ];
@@ -44,5 +42,32 @@
     };
   };
 
-  networking.hostName = "feneri";
+  services.hydra = {
+    enable = true;
+    hydraURL = "https://hydra.web.4kb.net";
+    notificationSender = "hydra@localhost";
+    buildMachinesFiles = [];
+    useSubstitutes = true;
+  };
+
+  services.nginx.virtualHosts."hydra.web.4kb.net" = {
+    useACMEHost = "4kb.net";
+    forceSSL = true;
+
+    locations."/".proxyPass = "http://localhost:${toString config.services.hydra.port}";
+  };
+
+  nix.settings.allowed-uris = [
+    "git+https://github.com/NixOS/nixpkgs/"
+    "https://channels.nixos.org/"
+    "https://releases.nixos.org/nixos/"
+  ];
+
+  systemd.services.hydra-notify.enable = false;
+
+  networking = {
+    hostName = "feneri";
+    domain = "4kb.net";
+    useDHCP = false;
+  };
 }
diff --git a/machines/t1.nix b/machines/t1.nix
index d8d749b..3a46494 100644
--- a/machines/t1.nix
+++ b/machines/t1.nix
@@ -19,6 +19,7 @@
     desktop.enable = true;
     users.kle.enable = true;
     net = {
+      enable = true;
       v6Token = "::beef";
       sshd.enable = true;
       sshd.publish = true;
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 747c302..b098020 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -38,8 +38,6 @@ in
       # Spell checking
       aspell
       aspellDicts.en
-      aspellDicts.en-science
-      aspellDicts.en-computers
 
       hunspell
       hunspellDicts.en-us
diff --git a/modules/disk.nix b/modules/disk.nix
index bf4a9a8..a8f7fbf 100644
--- a/modules/disk.nix
+++ b/modules/disk.nix
@@ -61,7 +61,6 @@ in
       kernelParams = [
         "nohibernate"
         "elevator=none"
-        "rd.systemd.unit=rescue.target"
       ];
       supportedFilesystems = [
         "vfat"
@@ -145,7 +144,6 @@ in
       '';
     };
 
-    boot.initrd.systemd.emergencyAccess = true;
     boot.initrd.systemd.initrdBin = [
       pkgs.cloud-utils
       pkgs.util-linux
diff --git a/modules/network.nix b/modules/network.nix
index 8264102..e9383c2 100644
--- a/modules/network.nix
+++ b/modules/network.nix
@@ -3,6 +3,8 @@ let
   cfg = config.depot.net;
   inherit (lib)
     mkOption
+    mkEnableOption
+    mkIf
     types
     ;
 
@@ -27,6 +29,7 @@ in
   ];
 
   options.depot.net = {
+    enable = mkEnableOption "depot networking";
     v6Token = mkOption {
       type = types.str;
       default = "eui64";
@@ -34,7 +37,7 @@ in
     };
   };
 
-  config = {
+  config = mkIf cfg.enable {
     # networkd handles this
     networking.useDHCP = false;
 
diff --git a/modules/xnet/default.nix b/modules/xnet/default.nix
index 67bbbe5..415fc0b 100644
--- a/modules/xnet/default.nix
+++ b/modules/xnet/default.nix
@@ -45,14 +45,15 @@ in
     time.timeZone = mkDefault "US/Pacific";
 
     nix = {
-      nixPath = mkForce [ "nixpkgs=${pkgs.path}" ];
       settings = {
         auto-optimise-store = true;
+        nix-path = mkForce [ "nixpkgs=${pkgs.path}" ];
         experimental-features = [
           "nix-command"
           "flakes"
           "pipe-operators"
         ];
+
         warn-dirty = false;
 
         # timeout fast from binary cache
@@ -62,7 +63,7 @@ in
         automatic = true;
         options = mkDefault "--delete-older-than 30d";
       };
-      # registry.nixpkgs.flake = pkgs.path;
+      registry.nixpkgs.flake.outPath = "path:${pkgs.path}";
     };
 
     documentation = {
@@ -99,6 +100,9 @@ in
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFmWInQNT6EoU1NtUYzTs5jtpfbO/m6yvCckOiEGjvDc";
       };
       extraConfig = ''
+        Host *
+          SetEnv TERM=xterm-256color
+
         Host github
           HostName github.com
           User git