[NixOS] Build taffybar and xmonad with nix instead of stack

This commit is contained in:
Ivan Malison 2019-06-02 22:24:19 -07:00
parent d8009b4866
commit c4bc73e45b
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
3 changed files with 25 additions and 5 deletions

@ -1 +1 @@
Subproject commit eb9f7b9f43898201237000b921d1224c47d7dac7
Subproject commit 07656d70f6bf59a4d1355243f595805b9c0a25df

View File

@ -0,0 +1,12 @@
_: pkgs: rec {
haskellPackages = pkgs.haskellPackages.override (old: {
overrides = pkgs.lib.composeExtensions (old.overrides or (_: _: {})) (self: super: rec {
xmonad = super.xmonad.overrideAttrs (_: {
src = fetchGit ./xmonad;
});
xmonad-contrib = super.xmonad-contrib.overrideAttrs (_: {
src = fetchGit ./xmonad-contrib;
});
});
});
}

View File

@ -1,7 +1,6 @@
{ config, pkgs, options, ... }:
let
all-hies = import (fetchTarball "https://github.com/infinisil/all-hies/tarball/master") {};
my-overlays = import ./overlays.nix;
my-python-packages = python-packages: with python-packages; [
appdirs
ipdb
@ -17,10 +16,17 @@ let
virtualenvwrapper
];
python-with-my-packages = pkgs.python3.withPackages my-python-packages;
taffySource = pkgs.lib.sourceByRegex ../dotfiles/config/taffybar [
"taffybar.hs" "imalison-taffybar.cabal"
];
xmonadSource = ../dotfiles/config/xmonad;
in
{
nixpkgs.overlays = [ my-overlays ];
# XXX: This ensures that all nix tools pick up the overlays that are set here
nixpkgs.overlays = [
(import ./overlays.nix)
(import ../dotfiles/config/taffybar/taffybar/overlay.nix)
(import ../dotfiles/config/xmonad/overlay.nix)
];
# Allow all the things
nixpkgs.config.allowUnfree = true;
@ -106,7 +112,9 @@ in
gnome-breeze
# Desktop
# haskellPackages.status-notifier-item
(haskellPackages.callCabal2nix "imalison-taffybar" taffySource { })
(haskellPackages.callCabal2nix "imalison-xmonad" xmonadSource { })
haskellPackages.status-notifier-item
autorandr
betterlockscreen
blueman