diff --git a/flake.lock b/flake.lock index 243a7cf..a09d81b 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1731678004, - "narHash": "sha256-FLahADtQLJPYgE1CoU35o1/OXDszh/GPota6uYBvct8=", + "lastModified": 1731863195, + "narHash": "sha256-LoQ/QNb5NUYR7LTtWrtRkJftdX5a4G2128eHF/A3ZaY=", "ref": "refs/heads/main", - "rev": "b28df3152510867af06871fb94a6b0ae3cc7663a", - "revCount": 40, + "rev": "cd57660885bded36f30fa1f86a3e1d4e9cf9db64", + "revCount": 37, "type": "git", "url": "file:vendor/davids-dotfiles-private" }, diff --git a/modules/darwin/default/default.nix b/modules/darwin/default/default.nix index 58340f3..42d684f 100644 --- a/modules/darwin/default/default.nix +++ b/modules/darwin/default/default.nix @@ -1,5 +1,5 @@ { self, davids-dotfiles, ... }: -{ pkgs, system, nixConfig, ... }: { +{ pkgs, system, nixConfig, hostName, ... }: { services.nix-daemon.enable = true; homebrew.enable = true; diff --git a/modules/system/default/default.nix b/modules/system/default/default.nix index 2a2b3c9..070fc7a 100644 --- a/modules/system/default/default.nix +++ b/modules/system/default/default.nix @@ -9,10 +9,7 @@ nix = { settings = nixConfig; - nixPath = if config.nix.channel.enable then - [ "nixpkgs-overlays=${self}/overlays-compat/" ] - else - [ ]; + nixPath = [ "nixpkgs=flake:nixpkgs" ]; }; home-manager = { diff --git a/overlays-compat/default.nix b/overlays-compat/default.nix deleted file mode 100644 index 7ffd0ce..0000000 --- a/overlays-compat/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -final: prev: -with prev.lib; -let overlays = (import { }).config.nixpkgs.overlays; -in foldl' (flip extends) (_: prev) overlays final diff --git a/vendor/davids-dotfiles-private b/vendor/davids-dotfiles-private index b28df31..cd57660 160000 --- a/vendor/davids-dotfiles-private +++ b/vendor/davids-dotfiles-private @@ -1 +1 @@ -Subproject commit b28df3152510867af06871fb94a6b0ae3cc7663a +Subproject commit cd57660885bded36f30fa1f86a3e1d4e9cf9db64