colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NixOS] Move lorri to an overlay

Browse Source
This commit is contained in:
Ivan Malison 2019-12-09 16:15:01 -08:00
parent 8df2c44cd1
commit da8bff5308
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/configuration.nix
View File

@ -22,28 +22,12 @@ let
rev = "e2a412922438e46f0a67bf2c09f66b5285c51a68";
sha256 = "07401ic45b7a343146avy4466mbqqx1f86bad8d9dy2qmi8hlhx4";
};
ntiOverlay = (import (notifications-tray-icon-source.outPath + "/overlay.nix"));
ntiHaskellPackages = (ntiOverlay pkgs pkgs).haskellPackages;
# XXX: Can't use pkgs here because it would cause infinite recursion
lorriSource = (import <nixpkgs> {}).fetchurl {
url = "https://raw.githubusercontent.com/target/lorri/master/direnv/nixos.nix";
sha256 = "057kqbivf4xbhakz1j1b19sxd5c6p6rqhg6pwnq2zfvvmp8nmylm";
};
lorriBinSource = pkgs.fetchFromGitHub {
owner = "IvanMalison";
repo = "lorri";
rev = "d3e452ebc2b24ab86aec18af44c8217b2e469b2a";
sha256 = "07yf3gl9sixh7acxayq4q8h7z4q8a66412z0r49sr69yxb7b4q89";
};
lorri = (import (lorriBinSource.outPath + "/default.nix")) { inherit pkgs; };
notifications-tray-icon = (import (notifications-tray-icon-source.outPath + "/default.nix"));
in
{
imports = [ lorriSource.outPath ];
nixpkgs.overlays = [
(import ./overlays.nix)
(import ../dotfiles/config/xmonad/overlay.nix)
(import ../dotfiles/config/taffybar/taffybar/environment.nix)
];
# Allow all the things
@ -318,6 +302,8 @@ in
services.locate.enable = true;
services.lorri.enable = true;
services.xserver = {
exportConfiguration = true;
enable = true;

9
nixos/overlays.nix
View File

@ -51,4 +51,13 @@ self: super:
strongswanNM = super.strongswanNM.overrideAttrs (oldAttrs: rec {
patches = oldAttrs.patches ++ [ ./patch-strongswan.patch ];
});
lorri = super.lorri.overrideAttrs (_: {
src = super.fetchFromGitHub {
owner = "target";
repo = "lorri";
rev = "3e57656a536aada13eb7b33c07e0d637772d095d";
sha256 = "1q9ddbndnda1njp8nwqklbckqxpsv2g7936b566imipmmfdb67y0";
};
});
}