Compare commits

..

No commits in common. "c74103f1055d62dc46d0e473922bc0c74f449284" and "912073bee6040306f21f7618422e4a9504934524" have entirely different histories.

4 changed files with 13 additions and 37 deletions

View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1641901534, "lastModified": 1641149178,
"narHash": "sha256-Nvm6Zj80fVtzmGsUFYlz9XGFyLnyAe9VoduPmDBu+js=", "narHash": "sha256-Mt+oT5YZ6G9zHctDKV5pY+3vIdsMmAg0HMvz6rxsIc0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "57378ea2f62e9f450f420dc9d01cc06e0d3dd15e", "rev": "f3c435a5e5cfa3ce1b2f50ba37b9cacfec4139d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1641915897, "lastModified": 1641121012,
"narHash": "sha256-C5Vw7B8BKA/kr9tWVYjEdD3AjstXFqoxkkzrOwfQZxk=", "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5209ea0d8c77399ec4987590e9738953f15f8d80", "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1641710811, "lastModified": 1640959792,
"narHash": "sha256-yVJ+CtwWZY8BnkNIJ/ue5a28yrRM6CkDF1LvmGmqqwM=", "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0ecf7d414811f831060cf55707c374d54fbb1dec", "rev": "59bfda72480496f32787cec8c557182738b1bd3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1641865627, "lastModified": 1641125298,
"narHash": "sha256-B3b7KCThCx5bcDtWCX9ZZIl/EVs/lB8iDdI277/tvNA=", "narHash": "sha256-oNIG2UsyMk/osOmnjxHp53d8nJMudpW5a2+dcgsJzmE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3fe528dec572a26404f130893d2c22a35646247c", "rev": "c1d8e77ac2ca4248886632c597debea233700b2b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -60,8 +60,6 @@
}; };
}; };
overlays = import ./overlays;
nixosConfigurations = nixosConfigurations =
let let
system = "x86_64-linux"; system = "x86_64-linux";
@ -75,7 +73,7 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
}) })
] ++ builtins.attrValues self.overlays; ];
sharedModules = [ sharedModules = [
home-manager.nixosModule home-manager.nixosModule
{ nixpkgs.overlays = shared_overlays; } { nixpkgs.overlays = shared_overlays; }

View file

@ -1,3 +0,0 @@
{
i3status-rust = import ./i3status-rust;
}

View file

@ -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" ];
});
}