FINALLY FUCKING FIXED COLMENA (partially...)

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

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