From d39ba5da80cccb329b1a62bde4313b54d2e8005a Mon Sep 17 00:00:00 2001
From: Emile Clark-Boman <eclarkboman@gmail.com>
Date: Wed, 12 Feb 2025 23:39:02 +1000
Subject: [PATCH] FINALLY FUCKING FIXED COLMENA (partially...)

---
 DEV_ENV                   |  3 ++
 flake.nix                 | 60 +++++++++++++++++++++++++++++++++------
 hosts/hyrule/default.nix  |  2 +-
 hosts/myputer/default.nix | 27 ++++++++++++------
 modules/colmena.nix       | 20 +++++++++++++
 5 files changed, 94 insertions(+), 18 deletions(-)
 create mode 100644 DEV_ENV
 create mode 100644 modules/colmena.nix

diff --git a/DEV_ENV b/DEV_ENV
new file mode 100644
index 0000000..bf545ce
--- /dev/null
+++ b/DEV_ENV
@@ -0,0 +1,3 @@
+- [ ] Stop colmena adding inputs for unmanaged nodes
+- [ ] Use latest commit for colmena
+- [ ] Program colmena to have an option that adds `--no-check-sigs` to `nix copy`
diff --git a/flake.nix b/flake.nix
index fa20c71..2d2dc36 100755
--- a/flake.nix
+++ b/flake.nix
@@ -45,30 +45,72 @@
 
     pkgs = import nixpkgs {
       inherit system;
-      config.allowUnfree = true;
+
+      config = {
+        allowUnfree = true;
+        # Colmena's latest stable version is
+        # unusable so get latest unstable version.
+        #packageOverrides = pkgsBuild: let
+        #  src = pkgsBuild.fetchFromGitHub {
+        #    owner = "zhaofengli";
+        #    repo = "colmena";
+        #    rev = "47b6414d800c8471e98ca072bc0835345741a56a";
+        #    sha256 = "rINodqeUuezuCWOnpJgrH7u9vJ86fYT+Dj8Mu8T/IBc=";
+        #  };:cl
+        #  #flake = import (src + "/flake.nix");
+        #in {
+        #  colmena = let
+        #    flake = pkgsBuild.callPackage "${src}/flake.nix" {};
+        #    #flake = import "${src}/package.nix";
+        #    #flake = import "${src}/flake.nix";
+        #    #flake-outputs = flake.outputs {
+        #    #  inherit self;
+        #    #  inherit nixpkgs;
+        #    #  inherit stable;
+        #    #  inherit flake-utils;
+        #    #
+        #    #};
+        #  in
+        #    flake;
+        #  #flake.outputs.packages."${system}".colmena {};
+        #
+        #  #pkgsBuild.callPackage flake.packages.${system}.colmena {};
+        #  #colmena = flake.packages."${system}".colmena;
+        #};
+      };
     };
 
-    # Colmena's latest stable version is
-    # unusable so get latest unstable version.
+    # colmena-new = pkgs.colmena.overrideAttrs (old: {
+    #   src = pkgs.fetchFromGitHub {
+    #     owner = "zhaofengli";
+    #     repo = "colmena";
+    #     rev = "47b6414d800c8471e98ca072bc0835345741a56a";
+    #     sha256 = "rINodqeUuezuCWOnpJgrH7u9vJ86fYT+Dj8Mu8T/IBc=";
+    #   };
+    #   cargoHash = pkgs.lib.fakeHash;
+    #   cargoSha256 = pkgs.lib.fakeSha256;
+    # });
+
     #pkgsColmena = import (builtins.fetchGit {
     #  name = "nixpkgs-unstable-colmena";
     #  url = "https://github.com/NixOS/nixpkgs/";
     #  ref = "refs/heads/nixpkgs-unstable";
     #  rev = "21808d22b1cda1898b71cf1a1beb524a97add2c4";
     #}) {};
-    pkgsColmena = import (builtins.fetchTarball {
-      url = "https://github.com/NixOS/nixpkgs/archive/21808d22b1cda1898b71cf1a1beb524a97add2c4.tar.gz";
-      sha256 = "0v2z6jphhbk1ik7fqhlfnihcyff5np9wb3pv19j9qb9mpildx0cg";
-    }) {inherit system;};
+
+    #pkgsColmena = import (builtins.fetchTarball {
+    #  url = "https://github.com/NixOS/nixpkgs/archive/21808d22b1cda1898b71cf1a1beb524a97add2c4.tar.gz";
+    #  sha256 = "0v2z6jphhbk1ik7fqhlfnihcyff5np9wb3pv19j9qb9mpildx0cg";
+    #}) {inherit system;};
 
     # TODO: come back to this its really cool
     # this is just something I'm experimenting with
     PROJECT_ROOT = builtins.toString ./.;
   in {
     # `nix develop` shell
-    devShells."x86_64-linux".default = pkgsColmena.mkShell {
+    devShells."x86_64-linux".default = pkgs.mkShell {
       buildInputs = [
-        pkgsColmena.colmena
+        #colmena-new
       ];
     };
 
diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix
index 04cc150..ca78ca7 100755
--- a/hosts/hyrule/default.nix
+++ b/hosts/hyrule/default.nix
@@ -38,7 +38,7 @@ in {
     targetHost = "imbored.dev";
     targetUser = "ae";
     targetPort = 22;
-    sshOptions = "-i ~/.ssh/id_hyrule";
+    sshOptions = ["-i ~/.ssh/id_hyrule"];
     #keys = {
     #  "imbored.dev" = {
     #    # text, keyCommand, or keyFile must be set
diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix
index 3759e9e..f5a3046 100755
--- a/hosts/myputer/default.nix
+++ b/hosts/myputer/default.nix
@@ -111,15 +111,26 @@ in {
         isNormalUser = true;
         extraGroups = ["wheel"];
         shell = pkgs.bash; #pkgs.fish
-        packages = with pkgs; [
-          firefox
-          nitch
-          starfetch
+        packages = let
+          colmena-src = pkgs.fetchFromGitHub {
+            owner = "zhaofengli";
+            repo = "colmena";
+            rev = "47b6414d800c8471e98ca072bc0835345741a56a";
+            sha256 = "rINodqeUuezuCWOnpJgrH7u9vJ86fYT+Dj8Mu8T/IBc=";
+          };
+          colmena-new = pkgs.callPackage "${colmena-src}/package.nix" {};
+        in
+          with pkgs; [
+            firefox
+            nitch
+            starfetch
 
-          # flatpak requires gnome-software
-          flatpak
-          gnome-software
-        ];
+            # flatpak requires gnome-software
+            flatpak
+            gnome-software
+
+            colmena-new
+          ];
       };
 
       # user for my professional jobs and stuff
diff --git a/modules/colmena.nix b/modules/colmena.nix
new file mode 100644
index 0000000..5756901
--- /dev/null
+++ b/modules/colmena.nix
@@ -0,0 +1,20 @@
+{}: {
+  # Colmena's latest stable version is
+  # unusable so get latest unstable version.
+  colmena = let
+    src = pkgsBuild.fetchFromGitHub {
+      owner = "zhaofengli";
+      repo = "colmena";
+      rev = "47b6414d800c8471e98ca072bc0835345741a56a";
+      sha256 = "rINodqeUuezuCWOnpJgrH7u9vJ86fYT+Dj8Mu8T/IBc=";
+    };
+    flake =
+      pkgsBuild.callPackage "${src}/flake.nix" {
+      };
+  in
+    flake.packages."${system}".colmena;
+
+  nixpkgs.config.packageOverrides = pkgs: {
+    colmena = pkgs.callPackage
+  };
+}