Fix flake and update to the nixpkgs 22_05 tag

This commit is contained in:
Jacob Hinkle 2022-10-13 12:21:50 -04:00
parent bc1aa99242
commit bc9084f16f
3 changed files with 16 additions and 15 deletions

20
flake.lock generated
View File

@ -7,7 +7,7 @@
] ]
}, },
"locked": { "locked": {
"narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=", "narHash": "sha256-T4at7d+KsQNWh5rfjvOtQCaIMWjSDlSgQZKvxb+LcEY=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz" "url": "https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz"
}, },
@ -18,11 +18,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1662458987, "lastModified": 1665649208,
"narHash": "sha256-hcDwRlsXZMp2Er3vQk1JEUZWhBPLVC9vTT4xHvhpcE0=", "narHash": "sha256-MDkPVG4W8gigJ8OxWDp9L6aKaEwLRV3As1RvKkMq0rc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "504b32caf83986b7e6b9c79c1c13008f83290f19", "rev": "d92ed98c099ae731664fc526c348d609c4cffe04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -34,11 +34,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1662099760, "lastModified": 1653936696,
"narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", "narHash": "sha256-M6bJShji9AIDZ7Kh7CPwPBPb/T7RiVev2PAcOi4fxDQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "67e45078141102f45eff1589a831aeaa3182b41e", "rev": "ce6aa13369b667ac2542593170993504932eb836",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -66,11 +66,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1662390490, "lastModified": 1665289655,
"narHash": "sha256-HnFHRFu0eoB0tLOZRjLgVfHzK+4bQzAmAmHSzOquuyI=", "narHash": "sha256-j1Q9mNBhbzeJykhObiXwEGres9qvP4vH7gxdJ+ihkLI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "044ccfe24b349859cd9efc943e4465cc993ac84e", "rev": "0ce0449e6404c4ff9d1b7bd657794ae5ca54deb3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -34,13 +34,15 @@
}: let }: let
system = "x86_64-linux"; system = "x86_64-linux";
homeManagerConfFor = config: { ... }: { homeManagerConfFor = config: { ... }: {
#nixpkgs.overlays = [ nur.overlay ];
imports = [ config ]; imports = [ config ];
}; };
jacobHome = homeManagerConfFor ./home/jacob.nix; jacobHome = homeManagerConfFor ./home/jacob.nix;
jacobHomeMod = { jacobHomeMod = {
home-manager.useUserPackages = true; home-manager = {
home-manager.users.jacob = jacobHome; useGlobalPkgs = true;
useUserPackages = true;
users.jacob = jacobHome;
};
}; };
mkNixosSystem = extraModules: nixpkgs.lib.nixosSystem { mkNixosSystem = extraModules: nixpkgs.lib.nixosSystem {
inherit system; inherit system;

View File

@ -2,11 +2,10 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, inputs, sops, ... }:
{ {
config, config,
pkgs, pkgs,
inputs,
sops, sops,
... ...
}: { }: {