Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary dag variables

Browse source 
Also remove a few trailing whitespaces.
This commit is contained in:
Robert Helgesson 2018-09-19 00:13:31 +02:00
parent d27bccdff1
commit 701b4130bd
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
5 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/programs/msmtp.nix
View file

@ -6,8 +6,6 @@ let
cfg = config.programs.msmtp; cfg = config.programs.msmtp;
dag = config.lib.dag;
msmtpAccounts = filter (a: a.msmtp.enable) msmtpAccounts = filter (a: a.msmtp.enable)
(attrValues config.accounts.email.accounts); (attrValues config.accounts.email.accounts);

10
modules/programs/notmuch.nix
View file

@ -4,8 +4,6 @@ with lib;
let let
dag = config.lib.dag;
cfg = config.programs.notmuch; cfg = config.programs.notmuch;
mkIniKeyValue = key: value: mkIniKeyValue = key: value:
@ -24,12 +22,12 @@ let
database = { database = {
path = config.accounts.email.maildirBasePath; path = config.accounts.email.maildirBasePath;
}; };
new = { new = {
ignore = cfg.new.ignore; ignore = cfg.new.ignore;
tags = cfg.new.tags; tags = cfg.new.tags;
}; };
user = user =
let let
accounts = accounts =
@ -42,7 +40,7 @@ let
primary_email = catAttrs "address" primary; primary_email = catAttrs "address" primary;
other_email = catAttrs "address" secondaries; other_email = catAttrs "address" secondaries;
}; };
search = { search = {
exclude_tags = [ "deleted" "spam" ]; exclude_tags = [ "deleted" "spam" ];
}; };
@ -168,7 +166,7 @@ in
export PATH="${pkgs.notmuch}/bin''${PATH:+:}$PATH" export PATH="${pkgs.notmuch}/bin''${PATH:+:}$PATH"
export NOTMUCH_CONFIG="${config.xdg.configHome}/notmuch/notmuchrc" export NOTMUCH_CONFIG="${config.xdg.configHome}/notmuch/notmuchrc"
export NMBGIT="${config.xdg.dataHome}/notmuch/nmbug" export NMBGIT="${config.xdg.dataHome}/notmuch/nmbug"
${cmds} ${cmds}
''; '';
executable = true; executable = true;

2
modules/services/polybar.nix
View file

@ -6,8 +6,6 @@ let
cfg = config.services.polybar; cfg = config.services.polybar;
dag = config.lib.dag;
toPolybarIni = generators.toINI { toPolybarIni = generators.toINI {
mkKeyValue = key: value: mkKeyValue = key: value:
let let

2
modules/services/window-managers/i3.nix
View file

@ -6,8 +6,6 @@ let
cfg = config.xsession.windowManager.i3; cfg = config.xsession.windowManager.i3;
dag = config.lib.dag;
commonOptions = { commonOptions = {
fonts = mkOption { fonts = mkOption {
type = types.listOf types.string; type = types.listOf types.string;

2
modules/services/window-managers/xmonad.nix
View file

@ -6,8 +6,6 @@ let
cfg = config.xsession.windowManager.xmonad; cfg = config.xsession.windowManager.xmonad;
dag = config.lib.dag;
xmonad = pkgs.xmonad-with-packages.override { xmonad = pkgs.xmonad-with-packages.override {
ghcWithPackages = cfg.haskellPackages.ghcWithPackages; ghcWithPackages = cfg.haskellPackages.ghcWithPackages;
packages = self: packages = self: