diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | modules/devkit.nix | 2 | ||||
| -rw-r--r-- | modules/flakes.nix | 10 | ||||
| -rw-r--r-- | modules/keyd-qol.nix | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/flake.lock b/flake.lock index fbb3a11..c3d48eb 100644 --- a/flake.lock +++ b/flake.lock @@ -288,18 +288,18 @@ "type": "github" } }, - "nixpkgs-2211": { + "nixpkgs-2305": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1699596684, + "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -326,7 +326,7 @@ "home-manager": "home-manager", "impermanence": "impermanence", "neovim-nightly": "neovim-nightly", - "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-2305": "nixpkgs-2305", "rust": "rust", "sops-nix": "sops-nix", "unstable": "unstable", diff --git a/flake.nix b/flake.nix index cedcda4..87efee2 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-2211.url = "github:nixos/nixpkgs/nixos-22.11"; + nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "unstable"; diff --git a/modules/devkit.nix b/modules/devkit.nix index 65d8de0..191b534 100644 --- a/modules/devkit.nix +++ b/modules/devkit.nix @@ -1,4 +1,4 @@ -{ config, pkgs, unstable, unstable-small, nixpkgs-2211, lib, ... }: +{ config, pkgs, unstable, unstable-small, lib, ... }: { options.hardware.devkit.enable = lib.mkEnableOption "udev rules for development boards"; diff --git a/modules/flakes.nix b/modules/flakes.nix index 76f89f3..092d1f4 100644 --- a/modules/flakes.nix +++ b/modules/flakes.nix @@ -1,10 +1,10 @@ -{ config, pkgs, unstable, unstable-small, nixpkgs-2211, lib, ... }: +{ config, pkgs, unstable, unstable-small, nixpkgs-2305, lib, ... }: let base = "/etc/nixpkgs/channels"; nixpkgsPath = "${base}/nixpkgs"; nixpkgsSmallPath = "${base}/nixpkgsSmall"; - nixpkgs2211Path = "${base}/nixpkgs2211"; + nixpkgs2305Path = "${base}/nixpkgs2305"; in { options.nix.flakes.enable = lib.mkEnableOption "nix flakes"; @@ -16,12 +16,12 @@ in registry.nixpkgs.flake = unstable; registry.nixpkgsSmall.flake = unstable-small; - registry.nixpkgs2211.flake = nixpkgs-2211; + registry.nixpkgs2305.flake = nixpkgs-2305; nixPath = [ "nixpkgs=${nixpkgsPath}" "nixpkgsSmall=${nixpkgsSmallPath}" - "nixpkgs2211=${nixpkgs2211Path}" + "nixpkgs2305=${nixpkgs2305Path}" "/nix/var/nix/profiles/per-user/root/channels" ]; }; @@ -29,7 +29,7 @@ in systemd.tmpfiles.rules = [ "L+ ${nixpkgsPath} - - - - ${unstable}" "L+ ${nixpkgsSmallPath} - - - - ${unstable-small}" - "L+ ${nixpkgs2211Path} - - - - ${nixpkgs-2211}" + "L+ ${nixpkgs2305Path} - - - - ${nixpkgs-2305}" ]; }; } diff --git a/modules/keyd-qol.nix b/modules/keyd-qol.nix index e163286..2f720d7 100644 --- a/modules/keyd-qol.nix +++ b/modules/keyd-qol.nix @@ -1,4 +1,4 @@ -{ config, pkgs, unstable, unstable-small, nixpkgs-2211, lib, ... }: +{ config, pkgs, unstable, unstable-small, lib, ... }: { options.services.keyd-qol.enable = lib.mkEnableOption "keyd service for quality-of-life improvements"; |