From 62a27d27af9438e1b9da947f0082bbdcf00b90e7 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Thu, 2 Jan 2025 14:26:55 +0100
Subject: [PATCH] cleanup

one of the hydra tryouts was removed, updated zen flake to one that is maintained
---
 .hydra/jobsets.nix                         | 55 ----------------------
 .hydra/spec.json                           | 25 ----------
 flake.lock                                 | 10 ++--
 flake.nix                                  |  2 +-
 systems/x86_64-linux/yggdrasil/default.nix |  1 -
 5 files changed, 6 insertions(+), 87 deletions(-)
 delete mode 100644 .hydra/jobsets.nix
 delete mode 100644 .hydra/spec.json

diff --git a/.hydra/jobsets.nix b/.hydra/jobsets.nix
deleted file mode 100644
index 641b25c..0000000
--- a/.hydra/jobsets.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  nixpkgs,
-  # pulls,
-  ...
-}:
-let
-  pkgs = import nixpkgs { };
-
-  # prs = builtins.fromJSON (builtins.readFile pulls);
-  # prJobsets = pkgs.lib.mapAttrs (num: info: {
-  #   enabled = 1;
-  #   hidden = false;
-  #   description = "PR ${num}: ${info.title}";
-  #   checkinterval = 60;
-  #   schedulingshares = 20;
-  #   enableemail = false;
-  #   emailoverride = "";
-  #   keepnr = 1;
-  #   type = 1;
-  #   flake = "github:shawn8901/nix-configuration/pull/${num}/head";
-  # }) prs;
-  mkFlakeJobset = branch: {
-    description = "Build ${branch}";
-    checkinterval = "3600";
-    enabled = "1";
-    schedulingshares = 100;
-    enableemail = false;
-    emailoverride = "";
-    keepnr = 3;
-    hidden = false;
-    type = 1;
-    flake = "github:shawn8901/nix-configuration/${branch}";
-  };
-
-  desc = {
-    "main" = mkFlakeJobset "main";
-  };
-
-  log = {
-    # pulls = prs;
-    jobsets = desc;
-  };
-in
-{
-  jobsets = pkgs.runCommand "spec-jobsets.json" { } ''
-    cat >$out <<EOF
-    ${builtins.toJSON desc}
-    EOF
-    # This is to get nice .jobsets build logs on Hydra
-    cat >tmp <<EOF
-    ${builtins.toJSON log}
-    EOF
-    ${pkgs.jq}/bin/jq . tmp
-  '';
-}
diff --git a/.hydra/spec.json b/.hydra/spec.json
deleted file mode 100644
index d6d600f..0000000
--- a/.hydra/spec.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "enabled": 1,
-  "hidden": false,
-  "description": "system flake",
-  "nixexprinput": "nixexpr",
-  "nixexprpath": ".hydra/jobsets.nix",
-  "checkinterval": 3600,
-  "schedulingshares": 100,
-  "enableemail": false,
-  "emailoverride": "",
-  "keepnr": 3,
-  "type": 0,
-  "inputs": {
-    "nixexpr": {
-      "value": "https://git.christophhollizeck.dev/Daholli/nixos-config.git main",
-      "type": "git",
-      "emailresponsible": false
-    },
-    "nixpkgs": {
-      "value": "https://github.com/NixOS/nixpkgs unstable",
-      "type": "git",
-      "emailresponsible": false
-    }
-  }
-}
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 1a2afaf..d291a58 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1946,15 +1946,15 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1732835488,
-        "narHash": "sha256-r1nomBVEMO4I0y3pMfqLletQxKak5xfpk9DhlO1AsuI=",
-        "owner": "ch4og",
+        "lastModified": 1735791650,
+        "narHash": "sha256-2t6v5LcNyJOEMshCqEuCq70WPhJLtCoItbk5K8fqf5A=",
+        "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "d8fbf602685f5cf2a6475eaf20595a6dc6628891",
+        "rev": "4cbef43b946c0e620fd283b74d505408a28a00d1",
         "type": "github"
       },
       "original": {
-        "owner": "ch4og",
+        "owner": "0xc000022070",
         "repo": "zen-browser-flake",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 1fc6456..cb84599 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,7 +76,7 @@
     sops-nix.url = "github:Mic92/sops-nix";
 
     ## temporary
-    zen-browser.url = "github:ch4og/zen-browser-flake";
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";
 
     raspberry-pi-nix = {
       url = "github:nix-community/raspberry-pi-nix";
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index 085adde..4896094 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -18,7 +18,6 @@ in
 
     # eve
     # bottles
-
   ];
 
   environment.pathsToLink = [ "/libexec" ];