From f3c02513a92af927313bc336f58a868b54abfce3 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 19 Sep 2018 00:13:31 +0200 Subject: [PATCH] Remove unnecessary `dag` variables Also remove a few trailing whitespaces. (cherry picked from commit 701b4130bd38d4ada810994aa089f7e9f23998d2) --- modules/programs/msmtp.nix | 2 -- modules/programs/notmuch.nix | 10 ++++------ modules/services/polybar.nix | 2 -- modules/services/window-managers/i3.nix | 2 -- modules/services/window-managers/xmonad.nix | 2 -- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/modules/programs/msmtp.nix b/modules/programs/msmtp.nix index 4d0099155..7f00bbb0a 100644 --- a/modules/programs/msmtp.nix +++ b/modules/programs/msmtp.nix @@ -6,8 +6,6 @@ let cfg = config.programs.msmtp; - dag = config.lib.dag; - msmtpAccounts = filter (a: a.msmtp.enable) (attrValues config.accounts.email.accounts); diff --git a/modules/programs/notmuch.nix b/modules/programs/notmuch.nix index 939b8ef6d..2d8478f69 100644 --- a/modules/programs/notmuch.nix +++ b/modules/programs/notmuch.nix @@ -4,8 +4,6 @@ with lib; let - dag = config.lib.dag; - cfg = config.programs.notmuch; mkIniKeyValue = key: value: @@ -24,12 +22,12 @@ let database = { path = config.accounts.email.maildirBasePath; }; - + new = { ignore = cfg.new.ignore; tags = cfg.new.tags; }; - + user = let accounts = @@ -42,7 +40,7 @@ let primary_email = catAttrs "address" primary; other_email = catAttrs "address" secondaries; }; - + search = { exclude_tags = [ "deleted" "spam" ]; }; @@ -168,7 +166,7 @@ in export PATH="${pkgs.notmuch}/bin''${PATH:+:}$PATH" export NOTMUCH_CONFIG="${config.xdg.configHome}/notmuch/notmuchrc" export NMBGIT="${config.xdg.dataHome}/notmuch/nmbug" - + ${cmds} ''; executable = true; diff --git a/modules/services/polybar.nix b/modules/services/polybar.nix index a8fe86a70..f75e0890b 100644 --- a/modules/services/polybar.nix +++ b/modules/services/polybar.nix @@ -6,8 +6,6 @@ let cfg = config.services.polybar; - dag = config.lib.dag; - toPolybarIni = generators.toINI { mkKeyValue = key: value: let diff --git a/modules/services/window-managers/i3.nix b/modules/services/window-managers/i3.nix index 2af12e57e..85fde7dd8 100644 --- a/modules/services/window-managers/i3.nix +++ b/modules/services/window-managers/i3.nix @@ -6,8 +6,6 @@ let cfg = config.xsession.windowManager.i3; - dag = config.lib.dag; - commonOptions = { fonts = mkOption { type = types.listOf types.string; diff --git a/modules/services/window-managers/xmonad.nix b/modules/services/window-managers/xmonad.nix index 754e7f1fb..5b64963b6 100644 --- a/modules/services/window-managers/xmonad.nix +++ b/modules/services/window-managers/xmonad.nix @@ -6,8 +6,6 @@ let cfg = config.xsession.windowManager.xmonad; - dag = config.lib.dag; - xmonad = pkgs.xmonad-with-packages.override { ghcWithPackages = cfg.haskellPackages.ghcWithPackages; packages = self: