diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/flake.nix | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/flake.lock b/flake.lock index a9e8f0d..4b5bcc4 100644 --- a/flake.lock +++ b/flake.lock @@ -146,18 +146,18 @@ "type": "github" } }, - "nixpkgs-2111": { + "nixpkgs-2211": { "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "lastModified": 1676375384, + "narHash": "sha256-6HI3jZiuJX+KLz05cocYy2mBAWlISEKHU84ftYfxHZ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "rev": "c43f676c938662072772339be6269226c77b51b8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-21.11", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -186,7 +186,7 @@ "home-manager": "home-manager", "impermanence": "impermanence", "neovim": "neovim", - "nixpkgs-2111": "nixpkgs-2111", + "nixpkgs-2211": "nixpkgs-2211", "rust": "rust", "sops-nix": "sops-nix", "unstable": "unstable", diff --git a/flake.nix b/flake.nix index 33c0d05..3d5c638 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; - nixpkgs-2111.url = "github:nixos/nixpkgs/nixos-21.11"; + nixpkgs-2211.url = "github:nixos/nixpkgs/nixos-22.11"; darwin.url = "github:LnL7/nix-darwin"; darwin.inputs.nixpkgs.follows = "unstable"; diff --git a/nixos/modules/flake.nix b/nixos/modules/flake.nix index 15a4254..76f89f3 100644 --- a/nixos/modules/flake.nix +++ b/nixos/modules/flake.nix @@ -1,10 +1,10 @@ -{ config, pkgs, unstable, unstable-small, nixpkgs-2111, lib, ... }: +{ config, pkgs, unstable, unstable-small, nixpkgs-2211, lib, ... }: let base = "/etc/nixpkgs/channels"; nixpkgsPath = "${base}/nixpkgs"; nixpkgsSmallPath = "${base}/nixpkgsSmall"; - nixpkgs2111Path = "${base}/nixpkgs2111"; + nixpkgs2211Path = "${base}/nixpkgs2211"; in { options.nix.flakes.enable = lib.mkEnableOption "nix flakes"; @@ -16,12 +16,12 @@ in registry.nixpkgs.flake = unstable; registry.nixpkgsSmall.flake = unstable-small; - registry.nixpkgs2111.flake = nixpkgs-2111; + registry.nixpkgs2211.flake = nixpkgs-2211; nixPath = [ "nixpkgs=${nixpkgsPath}" "nixpkgsSmall=${nixpkgsSmallPath}" - "nixpkgs2111=${nixpkgs2111Path}" + "nixpkgs2211=${nixpkgs2211Path}" "/nix/var/nix/profiles/per-user/root/channels" ]; }; @@ -29,7 +29,7 @@ in systemd.tmpfiles.rules = [ "L+ ${nixpkgsPath} - - - - ${unstable}" "L+ ${nixpkgsSmallPath} - - - - ${unstable-small}" - "L+ ${nixpkgs2111Path} - - - - ${nixpkgs-2111}" + "L+ ${nixpkgs2211Path} - - - - ${nixpkgs-2211}" ]; }; } |