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

[NixOS] Fix taffybar overlay

Browse Source
This commit is contained in:
Ivan Malison 2021-07-24 18:16:19 -06:00
parent 3bbf98fdbd
commit 613a8a9ab8
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dotfiles/config/taffybar/flake.nix
View File

@ -2,26 +2,10 @@
inputs = {
taffybar.url = path:./taffybar;
flake-utils.url = github:numtide/flake-utils;
git-ignore-nix.url = github:IvanMalison/gitignore.nix/master;
};
outputs = { self, flake-utils, taffybar, git-ignore-nix, nixpkgs }:
outputs = { self, flake-utils, taffybar, nixpkgs }:
let
overlay = final: prev: {
haskellPackages = prev.haskellPackages.override (old: {
overrides = prev.lib.composeExtensions (old.overrides or (_: _: {}))
(hself: hsuper: {
imalison-taffybar = hself.callCabal2nix "imalison-taffybar"
(git-ignore-nix.gitIgnoreSource ./.)
{ };
coinbase-pro = hself.callCabal2nix "coinbase-pro" (final.fetchFromGitHub {
owner = "IvanMalison";
repo = "coinbase-pro";
rev = "8ac93b7905150c8cbd6957102a730ecceb8b4dba";
sha256 = "0v0xw593xczvvalh24bz37v2zbfz92dhz71f04m08abgphqmjvxq";
}) { };
});
});
};
overlay = import ./overlay.nix;
overlays = taffybar.overlays ++ [ overlay ];
in flake-utils.lib.eachDefaultSystem (system:
let pkgs = import nixpkgs { inherit system overlays; config.allowBroken = true; };

19
dotfiles/config/taffybar/overlay.nix Normal file
View File

@ -0,0 +1,19 @@
final: prev: {
haskellPackages = prev.haskellPackages.override (old: {
overrides = prev.lib.composeExtensions (old.overrides or (_: _: {}))
(hself: hsuper: {
imalison-taffybar = hself.callCabal2nix "imalison-taffybar"
(
final.lib.sourceByRegex ./.
["taffybar.hs" "imalison-taffybar.cabal"]
)
{ };
coinbase-pro = hself.callCabal2nix "coinbase-pro" (final.fetchFromGitHub {
owner = "IvanMalison";
repo = "coinbase-pro";
rev = "8ac93b7905150c8cbd6957102a730ecceb8b4dba";
sha256 = "0v0xw593xczvvalh24bz37v2zbfz92dhz71f04m08abgphqmjvxq";
}) { };
});
});
}

4
nixos/flake.nix
View File

@ -21,7 +21,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
taffybar = {
url = path:../dotfiles/config/taffybar;
url = path:../dotfiles/config/taffybar/taffybar;
inputs.nixpkgs.follows = "nixpkgs";
};
notifications-tray-icon = {
@ -41,7 +41,7 @@
};
nixpkgs.overlays = [
nix.overlay xmonad.overlay xmonad-contrib.overlay
notifications-tray-icon.overlay
notifications-tray-icon.overlay (import ../dotfiles/config/taffybar/overlay.nix)
] ++ taffybar.overlays;
imports = [
home-manager.nixosModule