diff --git a/channels.nix b/channels.nix index 6b887952..a0b1b1a7 100644 --- a/channels.nix +++ b/channels.nix @@ -1,16 +1,12 @@ let - nixos-21-11 = { - nixpkgs-channel = "nixos-21.11"; - home-manager-channel = "home-manager-21.11"; - }; - nixos-22-05 = { - nixpkgs-channel = "nixos-22.05"; - home-manager-channel = "home-manager-22.05"; + nixos-stable = { + nixpkgs-channel = "nixos-stable"; + home-manager-channel = "home-manager-stable"; }; in rec { - hera = nixos-21-11; - apollo = nixos-22-05; - zeus = nixos-22-05; - fluffy = nixos-21-11; + hera = nixos-stable; + apollo = nixos-stable; + zeus = nixos-stable; + fluffy = nixos-stable; chor-cloud = hera; } diff --git a/nix/sources.json b/nix/sources.json index e388839c..53b2e837 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -24,15 +24,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "home-manager-21.11": { - "branch": "release-21.11", + "branch": "release-22.05", "description": "Manage a user environment using Nix", "homepage": "", "owner": "nix-community", "repo": "home-manager", - "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", - "sha256": "1fi27zabvqlyc2ggg7wr01j813gs46rswg1i897h9hqkbgqsjkny", + "rev": "bda2c80b4c1a8d85c84c343a25ac7303fbc7999d", + "sha256": "1jhly1xkmclwdnhn59v9kjizn1b68aay2fanqbacsf0ayryz09hz", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/d93d56ab8c1c6aa575854a79b9d2f69d491db7d0.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/bda2c80b4c1a8d85c84c343a25ac7303fbc7999d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager-22.05": { @@ -47,6 +47,18 @@ "url": "https://github.com/nix-community/home-manager/archive/bda2c80b4c1a8d85c84c343a25ac7303fbc7999d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "home-manager-stable": { + "branch": "release-22.05", + "description": "Manage a user environment using Nix", + "homepage": "", + "owner": "nix-community", + "repo": "home-manager", + "rev": "bda2c80b4c1a8d85c84c343a25ac7303fbc7999d", + "sha256": "1jhly1xkmclwdnhn59v9kjizn1b68aay2fanqbacsf0ayryz09hz", + "type": "tarball", + "url": "https://github.com/nix-community/home-manager/archive/bda2c80b4c1a8d85c84c343a25ac7303fbc7999d.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "kassandra": { "branch": "main", "ref": "main", @@ -80,15 +92,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixos-21.11": { - "branch": "nixos-21.11", + "branch": "nixos-22.05", "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3", - "sha256": "018658ypakpg9yxbyzd06vaxzs5956lr30jkfvw0fzn33pp01xdg", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "sha256": "1d40v43x972li5fg7jadxkj341li41mf2cl6vv7xi6j80rkq45q4", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/ec6eaba9dfcfdd11547d75a193e91e26701bf7e3.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/a634c8f6c1fbf9b9730e01764999666f3436f10a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixos-22.05": { @@ -122,6 +134,18 @@ "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303", "type": "git" }, + "nixos-stable": { + "branch": "nixos-22.05", + "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels", + "homepage": null, + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "sha256": "1d40v43x972li5fg7jadxkj341li41mf2cl6vv7xi6j80rkq45q4", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a634c8f6c1fbf9b9730e01764999666f3436f10a.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "nixos-unstable": { "branch": "nixos-unstable", "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",