many changes I don't remember...

flake.nix

@@ -2,13 +2,14 @@
   description = "Emile's Nix Dotfiles";
 
   inputs = {
-    #nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    # nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    #nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    #home-manager = {
+    #  url = "github:nix-community/home-manager";
+    #  inputs.nixpkgs.follows = "nixpkgs";
+    #};
 
     spicetify-nix = {
       url = "github:Gerg-L/spicetify-nix";
@@ -31,17 +32,23 @@
 
     hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
 
-    colmena.url = "github:zhaofengli/colmena";
+    # colmena.url = "github:zhaofengli/colmena";
+    colmena.url = "github:zhaofengli/colmena/?rev=47b6414d800c8471e98ca072bc0835345741a56a";
+    # alternative to colmena (currently in testing)
+    #deploy-rs.url = "github:serokell/deploy-rs";
+
+    #wishlist.url = "path:/home/me/nixdots/flakes/wishlist";
   };
 
   outputs = {
     self,
     nixpkgs,
-    home-manager,
+    #home-manager,
     hyprland,
     grub2-themes,
     nixcord,
     colmena,
+    #deploy-rs,
     ...
   } @ inputs: let
     system = "x86_64-linux";
@@ -51,61 +58,9 @@
 
       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-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;};
-
     # TODO: come back to this its really cool
     # this is just something I'm experimenting with
     PROJECT_ROOT = builtins.toString ./.;
@@ -140,26 +95,49 @@
       };
 
       # meine vps
-      #imbored = nixpkgs.lib.nixosSystem {
-      #  specialargs = {inherit inputs pkgs;};
+      # hyrule = nixpkgs.lib.nixosSystem {
+      #   # manually set system architecture since
+      #   # this is for a remote deployment
+      #   system = "x86_64-linux";
+      #   specialargs = {inherit inputs pkgs;};
       #
-      #  modules = [
-      #    ./hosts/imbored
-      #  ];
-      #};
+      #   modules = [
+      #     ./hosts/hyrule
+      #   ];
+      # };
     };
 
+    # remote deployment with deploy-rs
+    # deploy.nodes.hyrule = {
+    #   hostname = "imbored.dev";
+    #   # create a primary profile called "system"
+    #   profiles.system = {
+    #     user = "root"; # user to deploy to
+    #     path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.hyrule;
+    #
+    #     # ssh configuration for reaching the server
+    #     sshUser = "ae";
+    #     #interactiveSudo = true; # TODO: use this and revoke passwordless sudo for ae
+    #     sshOpts = ["-i" "/home/me/.ssh/id_hyrule"];
+    #     remoteBuild = false; # build locally then deploy to remote host
+    #   };
+    # };
+
     # remote deployment to my servers!!
-    #colmenaHive = colmena.lib.makeHive self.outputs.colmena;
-    #colmena = {
     colmenaHive = colmena.lib.makeHive {
       meta = {
         # set nixpkgs global
         nixpkgs = pkgs;
         # set nixpkgs per server
-        # nodeNixpkgs = {
-        #   hyrule = pkgs;
-        # };
+        nodeNixpkgs = {
+          hyrule = import nixpkgs {
+            system = "x86_64-linux";
+            config.allowUnfree = false;
+          };
+        };
+
+        # we can use `specialArgs.inputs` to inject wishlist into hyrule's module
+        #specialArgs.inputs = with inputs; {inherit wishlist;};
       };
 
       # meine vps