diff --git a/flake.lock b/flake.lock index 778ccad..7f78079 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs-overlay": { "locked": { - "lastModified": 1641901534, - "narHash": "sha256-Nvm6Zj80fVtzmGsUFYlz9XGFyLnyAe9VoduPmDBu+js=", + "lastModified": 1641149178, + "narHash": "sha256-Mt+oT5YZ6G9zHctDKV5pY+3vIdsMmAg0HMvz6rxsIc0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "57378ea2f62e9f450f420dc9d01cc06e0d3dd15e", + "rev": "f3c435a5e5cfa3ce1b2f50ba37b9cacfec4139d9", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1641915897, - "narHash": "sha256-C5Vw7B8BKA/kr9tWVYjEdD3AjstXFqoxkkzrOwfQZxk=", + "lastModified": 1641121012, + "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=", "owner": "nix-community", "repo": "home-manager", - "rev": "5209ea0d8c77399ec4987590e9738953f15f8d80", + "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1641710811, - "narHash": "sha256-yVJ+CtwWZY8BnkNIJ/ue5a28yrRM6CkDF1LvmGmqqwM=", + "lastModified": 1640959792, + "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ecf7d414811f831060cf55707c374d54fbb1dec", + "rev": "59bfda72480496f32787cec8c557182738b1bd3f", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1641865627, - "narHash": "sha256-B3b7KCThCx5bcDtWCX9ZZIl/EVs/lB8iDdI277/tvNA=", + "lastModified": 1641125298, + "narHash": "sha256-oNIG2UsyMk/osOmnjxHp53d8nJMudpW5a2+dcgsJzmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fe528dec572a26404f130893d2c22a35646247c", + "rev": "c1d8e77ac2ca4248886632c597debea233700b2b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9bc927c..a30b5d8 100644 --- a/flake.nix +++ b/flake.nix @@ -60,8 +60,6 @@ }; }; - overlays = import ./overlays; - nixosConfigurations = let system = "x86_64-linux"; @@ -75,7 +73,7 @@ config.allowUnfree = true; }; }) - ] ++ builtins.attrValues self.overlays; + ]; sharedModules = [ home-manager.nixosModule { nixpkgs.overlays = shared_overlays; } diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index 1f747a6..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - i3status-rust = import ./i3status-rust; -} diff --git a/overlays/i3status-rust/default.nix b/overlays/i3status-rust/default.nix deleted file mode 100644 index 1b78021..0000000 --- a/overlays/i3status-rust/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -final: prev: -{ - # overlay created because nixpkgs's `i3status-rust` depended on `notmuch`, and - # `notmuch`'s tests were briefly broken. the features I'm disabling, I don't - # need anyway: (at the time of writing) - # - # - notmuch - # - maildir - i3status-rust = prev.i3status-rust.overrideAttrs (oldAttrs: { - buildInputs = builtins.attrValues { - inherit (final) - dbus - openssl - pulseaudio - ; - }; - cargoBuildFeatures = [ "pulseaudio" ]; - }); -}