forked from colonelpanic/dotfiles
[NixOS] Updates to haskell compilation
This commit is contained in:
parent
52edf84a62
commit
15b899c605
@ -30,7 +30,7 @@ executable imalison-taffybar
|
|||||||
, hslogger
|
, hslogger
|
||||||
, process
|
, process
|
||||||
, split
|
, split
|
||||||
, taffybar
|
, taffybar>=3.2.0
|
||||||
, transformers
|
, transformers
|
||||||
, xdg-basedir
|
, xdg-basedir
|
||||||
, xmonad-contrib>=0.13
|
, xmonad-contrib>=0.13
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
@define-color active-window-color @white;
|
@define-color active-window-color @white;
|
||||||
@define-color urgent-window-color @taffy-blue;
|
@define-color urgent-window-color @taffy-blue;
|
||||||
@define-color font-color @white;
|
@define-color font-color @black;
|
||||||
@define-color menu-background-color @white;
|
@define-color menu-background-color @white;
|
||||||
@define-color menu-font-color @black;
|
@define-color menu-font-color @black;
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 07656d70f6bf59a4d1355243f595805b9c0a25df
|
Subproject commit 811068a21758ac70f66583e8fc07fa7189c6dc9a
|
@ -93,6 +93,8 @@ enableLogger logger level = do
|
|||||||
saveGlobalLogger $ setLevel level logger
|
saveGlobalLogger $ setLevel level logger
|
||||||
|
|
||||||
logDebug = do
|
logDebug = do
|
||||||
|
global <- getLogger ""
|
||||||
|
saveGlobalLogger $ setLevel DEBUG global
|
||||||
logger3 <- getLogger "System.Taffybar"
|
logger3 <- getLogger "System.Taffybar"
|
||||||
saveGlobalLogger $ setLevel DEBUG logger3
|
saveGlobalLogger $ setLevel DEBUG logger3
|
||||||
logger <- getLogger "System.Taffybar.Widget.Generic.AutoSizeImage"
|
logger <- getLogger "System.Taffybar.Widget.Generic.AutoSizeImage"
|
||||||
@ -140,9 +142,15 @@ main = do
|
|||||||
, labelSetter = workspaceNamesLabelSetter
|
, labelSetter = workspaceNamesLabelSetter
|
||||||
}
|
}
|
||||||
workspaces = workspacesNew myWorkspacesConfig
|
workspaces = workspacesNew myWorkspacesConfig
|
||||||
|
myClock =
|
||||||
|
textClockNewWith
|
||||||
|
defaultClockConfig
|
||||||
|
{ clockUpdateStrategy = RoundedTargetInterval 60 0.0
|
||||||
|
, clockFormatString = "%a %b %_d %I:%M %p"
|
||||||
|
}
|
||||||
fullEndWidgets =
|
fullEndWidgets =
|
||||||
map (>>= buildContentsBox)
|
map (>>= buildContentsBox)
|
||||||
[ textClockNewWith defaultClockConfig
|
[ myClock
|
||||||
, sniTrayNew
|
, sniTrayNew
|
||||||
, cpuGraph
|
, cpuGraph
|
||||||
, memoryGraph
|
, memoryGraph
|
||||||
@ -155,8 +163,9 @@ main = do
|
|||||||
map (>>= buildContentsBox)
|
map (>>= buildContentsBox)
|
||||||
[ batteryIconNew
|
[ batteryIconNew
|
||||||
, textBatteryNew "$percentage$%"
|
, textBatteryNew "$percentage$%"
|
||||||
, textClockNewWith defaultClockConfig
|
, myClock
|
||||||
, sniTrayNew
|
, sniTrayNew
|
||||||
|
, mpris2New
|
||||||
]
|
]
|
||||||
longLaptopEndWidgets =
|
longLaptopEndWidgets =
|
||||||
map (>>= buildContentsBox)
|
map (>>= buildContentsBox)
|
||||||
|
@ -24,12 +24,11 @@ let
|
|||||||
notifications-tray-icon-source = pkgs.fetchFromGitHub {
|
notifications-tray-icon-source = pkgs.fetchFromGitHub {
|
||||||
owner = "IvanMalison";
|
owner = "IvanMalison";
|
||||||
repo = "notifications-tray-icon";
|
repo = "notifications-tray-icon";
|
||||||
rev = "6f3b8da1d32dd655c5e484940cfb9d7e392f3235";
|
rev = "f28288849a39feec8972a4181ce18ccdde6cc483";
|
||||||
sha256 = "0ag4gqiihgyiw3dfinz7a1c1dcnj30bs62f63zyk11fs37ys93rz";
|
sha256 = "11r95m316x93bs1dj0bvas8adpd0xgql2jz8a8dnzv0fv4mw7aj4";
|
||||||
};
|
};
|
||||||
ntiHaskellPackages =
|
ntiOverlay = (import (notifications-tray-icon-source.outPath + "/overlay.nix"));
|
||||||
(import (notifications-tray-icon-source.outPath + "/overlay.nix"))
|
ntiHaskellPackages = (ntiOverlay pkgs pkgs).haskellPackages;
|
||||||
(import /home/imalison/Projects/nixpkgs {});
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
@ -125,9 +124,10 @@ in
|
|||||||
# Desktop
|
# Desktop
|
||||||
(haskellPackages.callCabal2nix "imalison-taffybar" taffySource { })
|
(haskellPackages.callCabal2nix "imalison-taffybar" taffySource { })
|
||||||
(haskellPackages.callCabal2nix "imalison-xmonad" xmonadSource { })
|
(haskellPackages.callCabal2nix "imalison-xmonad" xmonadSource { })
|
||||||
|
(ntiHaskellPackages.callCabal2nix "notifications-tray-icon" notifications-tray-icon-source { })
|
||||||
haskellPackages.status-notifier-item
|
haskellPackages.status-notifier-item
|
||||||
haskellPackages.xmonad
|
haskellPackages.xmonad
|
||||||
(ntiHaskellPackages.callCabal2nix "notifications-tray-icon" notifications-tray-icon-source { })
|
|
||||||
autorandr
|
autorandr
|
||||||
betterlockscreen
|
betterlockscreen
|
||||||
blueman
|
blueman
|
||||||
@ -193,6 +193,7 @@ in
|
|||||||
# Tools
|
# Tools
|
||||||
automake
|
automake
|
||||||
bazaar
|
bazaar
|
||||||
|
bind
|
||||||
binutils
|
binutils
|
||||||
dex
|
dex
|
||||||
direnv
|
direnv
|
||||||
@ -202,8 +203,9 @@ in
|
|||||||
file
|
file
|
||||||
gcc
|
gcc
|
||||||
gdb
|
gdb
|
||||||
gitAndTools.git-sync
|
gitAndTools.git-crypt
|
||||||
gitAndTools.git-fame
|
gitAndTools.git-fame
|
||||||
|
gitAndTools.git-sync
|
||||||
gitAndTools.hub
|
gitAndTools.hub
|
||||||
gitFull
|
gitFull
|
||||||
glxinfo
|
glxinfo
|
||||||
@ -216,6 +218,7 @@ in
|
|||||||
jq
|
jq
|
||||||
mercurial
|
mercurial
|
||||||
networkmanager-openvpn
|
networkmanager-openvpn
|
||||||
|
networkmanager_strongswan
|
||||||
ncdu
|
ncdu
|
||||||
neofetch
|
neofetch
|
||||||
openvpn
|
openvpn
|
||||||
|
Loading…
Reference in New Issue
Block a user