diff options
| -rw-r--r-- | flake.lock | 29 | ||||
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | modules/flakes.nix | 13 |
3 files changed, 33 insertions, 12 deletions
diff --git a/flake.lock b/flake.lock index 148a90d..8a42279 100644 --- a/flake.lock +++ b/flake.lock @@ -302,18 +302,18 @@ "type": "github" } }, - "nixpkgs-2305": { + "nixpkgs-2311": { "locked": { - "lastModified": 1703351344, - "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", + "lastModified": 1703900474, + "narHash": "sha256-Zu+chYVYG2cQ4FCbhyo6rc5Lu0ktZCjRbSPE0fDgukI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", + "rev": "9dd7699928e26c3c00d5d46811f1358524081062", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -336,6 +336,22 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1704085463, + "narHash": "sha256-eV3rVz5NCTLasojGb9aqs1BlDastaEk97h84AFNO25E=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dc594fa5f64231c49f04550383f4d03402d89a97", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1703351344, @@ -374,7 +390,8 @@ "impermanence": "impermanence", "neovim-nightly": "neovim-nightly", "nix-gaming": "nix-gaming", - "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2311": "nixpkgs-2311", + "nixpkgs-master": "nixpkgs-master", "nur": "nur", "rust": "rust", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index 891263d..48147e6 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,8 @@ inputs = { unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; - nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs-master.url = "github:nixos/nixpkgs/master"; + nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "unstable"; diff --git a/modules/flakes.nix b/modules/flakes.nix index 092d1f4..ff85ab5 100644 --- a/modules/flakes.nix +++ b/modules/flakes.nix @@ -1,10 +1,11 @@ -{ config, pkgs, unstable, unstable-small, nixpkgs-2305, lib, ... }: +{ config, pkgs, unstable, unstable-small, nixpkgs-master, nixpkgs-2311, lib, ... }: let base = "/etc/nixpkgs/channels"; nixpkgsPath = "${base}/nixpkgs"; nixpkgsSmallPath = "${base}/nixpkgsSmall"; - nixpkgs2305Path = "${base}/nixpkgs2305"; + nixpkgsMasterPath = "${base}/nixpkgsMaster"; + nixpkgs2311Path = "${base}/nixpkgs2311"; in { options.nix.flakes.enable = lib.mkEnableOption "nix flakes"; @@ -16,12 +17,13 @@ in registry.nixpkgs.flake = unstable; registry.nixpkgsSmall.flake = unstable-small; - registry.nixpkgs2305.flake = nixpkgs-2305; + registry.nixpkgsMaster.flake = nixpkgs-master; + registry.nixpkgs2311.flake = nixpkgs-2311; nixPath = [ "nixpkgs=${nixpkgsPath}" "nixpkgsSmall=${nixpkgsSmallPath}" - "nixpkgs2305=${nixpkgs2305Path}" + "nixpkgs2311=${nixpkgs2311Path}" "/nix/var/nix/profiles/per-user/root/channels" ]; }; @@ -29,7 +31,8 @@ in systemd.tmpfiles.rules = [ "L+ ${nixpkgsPath} - - - - ${unstable}" "L+ ${nixpkgsSmallPath} - - - - ${unstable-small}" - "L+ ${nixpkgs2305Path} - - - - ${nixpkgs-2305}" + "L+ ${nixpkgsMasterPath} - - - - ${nixpkgs-master}" + "L+ ${nixpkgs2311Path} - - - - ${nixpkgs-2311}" ]; }; } |