wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

[NixOS] Updates to haskell compilation

Browse Source
This commit is contained in:
Ivan Malison 2019-06-05 00:35:47 -07:00
parent 52edf84a62
commit 15b899c605
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/config/taffybar/imalison-taffybar.cabal
View File

@ -30,7 +30,7 @@ executable imalison-taffybar
, hslogger
, process
, split
, taffybar
, taffybar>=3.2.0
, transformers
, xdg-basedir
, xmonad-contrib>=0.13

2
dotfiles/config/taffybar/ivanm-dfinity-razer.css
View File

@ -5,7 +5,7 @@
@define-color active-window-color @white;
@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-font-color @black;

2
dotfiles/config/taffybar/taffybar

@ -1 +1 @@
Subproject commit 07656d70f6bf59a4d1355243f595805b9c0a25df
Subproject commit 811068a21758ac70f66583e8fc07fa7189c6dc9a

15
dotfiles/config/taffybar/taffybar.hs
View File

@ -93,6 +93,8 @@ enableLogger logger level = do
saveGlobalLogger $ setLevel level logger
logDebug = do
global <- getLogger ""
saveGlobalLogger $ setLevel DEBUG global
logger3 <- getLogger "System.Taffybar"
saveGlobalLogger $ setLevel DEBUG logger3
logger <- getLogger "System.Taffybar.Widget.Generic.AutoSizeImage"
@ -140,9 +142,15 @@ main = do
, labelSetter = workspaceNamesLabelSetter
}
workspaces = workspacesNew myWorkspacesConfig
myClock =
textClockNewWith
defaultClockConfig
{ clockUpdateStrategy = RoundedTargetInterval 60 0.0
, clockFormatString = "%a %b %_d %I:%M %p"
}
fullEndWidgets =
map (>>= buildContentsBox)
[ textClockNewWith defaultClockConfig
[ myClock
, sniTrayNew
, cpuGraph
, memoryGraph
@ -155,8 +163,9 @@ main = do
map (>>= buildContentsBox)
[ batteryIconNew
, textBatteryNew "$percentage$%"
, textClockNewWith defaultClockConfig
, myClock
, sniTrayNew
, mpris2New
]
longLaptopEndWidgets =
map (>>= buildContentsBox)
@ -172,7 +181,7 @@ main = do
baseConfig =
defaultSimpleTaffyConfig
{ startWidgets =
workspaces : map (>>= buildContentsBox) [layout, windows]
workspaces : map (>>= buildContentsBox) [layout, windows]
, endWidgets = fullEndWidgets
, barPosition = Top
, barPadding = 0

17
nixos/configuration.nix
View File

@ -24,12 +24,11 @@ let
notifications-tray-icon-source = pkgs.fetchFromGitHub {
owner = "IvanMalison";
repo = "notifications-tray-icon";
rev = "6f3b8da1d32dd655c5e484940cfb9d7e392f3235";
sha256 = "0ag4gqiihgyiw3dfinz7a1c1dcnj30bs62f63zyk11fs37ys93rz";
rev = "f28288849a39feec8972a4181ce18ccdde6cc483";
sha256 = "11r95m316x93bs1dj0bvas8adpd0xgql2jz8a8dnzv0fv4mw7aj4";
};
ntiHaskellPackages =
(import (notifications-tray-icon-source.outPath + "/overlay.nix"))
(import /home/imalison/Projects/nixpkgs {});
ntiOverlay = (import (notifications-tray-icon-source.outPath + "/overlay.nix"));
ntiHaskellPackages = (ntiOverlay pkgs pkgs).haskellPackages;
in
{
nixpkgs.overlays = [
@ -125,9 +124,10 @@ in
# Desktop
(haskellPackages.callCabal2nix "imalison-taffybar" taffySource { })
(haskellPackages.callCabal2nix "imalison-xmonad" xmonadSource { })
(ntiHaskellPackages.callCabal2nix "notifications-tray-icon" notifications-tray-icon-source { })
haskellPackages.status-notifier-item
haskellPackages.xmonad
(ntiHaskellPackages.callCabal2nix "notifications-tray-icon" notifications-tray-icon-source { })
autorandr
betterlockscreen
blueman
@ -193,6 +193,7 @@ in
# Tools
automake
bazaar
bind
binutils
dex
direnv
@ -202,8 +203,9 @@ in
file
gcc
gdb
gitAndTools.git-sync
gitAndTools.git-crypt
gitAndTools.git-fame
gitAndTools.git-sync
gitAndTools.hub
gitFull
glxinfo
@ -216,6 +218,7 @@ in
jq
mercurial
networkmanager-openvpn
networkmanager_strongswan
ncdu
neofetch
openvpn