diff --git a/flake.lock b/flake.lock index 4bfb60f..3ddb260 100644 --- a/flake.lock +++ b/flake.lock @@ -7,7 +7,7 @@ ] }, "locked": { - "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=", + "narHash": "sha256-T4at7d+KsQNWh5rfjvOtQCaIMWjSDlSgQZKvxb+LcEY=", "type": "tarball", "url": "https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz" }, @@ -18,11 +18,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1662458987, - "narHash": "sha256-hcDwRlsXZMp2Er3vQk1JEUZWhBPLVC9vTT4xHvhpcE0=", + "lastModified": 1665649208, + "narHash": "sha256-MDkPVG4W8gigJ8OxWDp9L6aKaEwLRV3As1RvKkMq0rc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "504b32caf83986b7e6b9c79c1c13008f83290f19", + "rev": "d92ed98c099ae731664fc526c348d609c4cffe04", "type": "github" }, "original": { @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1662099760, - "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", + "lastModified": 1653936696, + "narHash": "sha256-M6bJShji9AIDZ7Kh7CPwPBPb/T7RiVev2PAcOi4fxDQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "67e45078141102f45eff1589a831aeaa3182b41e", + "rev": "ce6aa13369b667ac2542593170993504932eb836", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1662390490, - "narHash": "sha256-HnFHRFu0eoB0tLOZRjLgVfHzK+4bQzAmAmHSzOquuyI=", + "lastModified": 1665289655, + "narHash": "sha256-j1Q9mNBhbzeJykhObiXwEGres9qvP4vH7gxdJ+ihkLI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "044ccfe24b349859cd9efc943e4465cc993ac84e", + "rev": "0ce0449e6404c4ff9d1b7bd657794ae5ca54deb3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9362c14..c5bd9a4 100644 --- a/flake.nix +++ b/flake.nix @@ -34,13 +34,15 @@ }: let system = "x86_64-linux"; homeManagerConfFor = config: { ... }: { - #nixpkgs.overlays = [ nur.overlay ]; imports = [ config ]; }; jacobHome = homeManagerConfFor ./home/jacob.nix; jacobHomeMod = { - home-manager.useUserPackages = true; - home-manager.users.jacob = jacobHome; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.jacob = jacobHome; + }; }; mkNixosSystem = extraModules: nixpkgs.lib.nixosSystem { inherit system; diff --git a/machines/buck/configuration.nix b/machines/buck/configuration.nix index 9b568c9..462f2ad 100644 --- a/machines/buck/configuration.nix +++ b/machines/buck/configuration.nix @@ -2,11 +2,10 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, inputs, sops, ... }: - { config, pkgs, + inputs, sops, ... }: {