diff --git a/flake.lock b/flake.lock index 1fead41..29aabff 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "futils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1620759905, + "narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1625016439, - "narHash": "sha256-zHf7iCU9nYd6/7xwYx5gwDzXdXcJ9RUagdy0IgX39sQ=", + "lastModified": 1622145920, + "narHash": "sha256-/tt6IApLuVcGP5auy4zjLzfm5+MBHYLS3Nauvv2U2EQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "9ad0024d4d292c628d4c9a50c2347f23418d7000", + "rev": "0e6c61a44092e98ba1d75b41f4f947843dc7814d", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1624922035, - "narHash": "sha256-OiIxJQuMRkICxaUwY3xMBbrPPu20de/n7tVYnWzLvS4=", + "lastModified": 1622194753, + "narHash": "sha256-76qtvFp/vFEz46lz5iZMJ0mnsWQYmuGYlb0fHgKqqMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a8d7958a610cd3fec3a6f424480f91a1b259185", + "rev": "540dccb2aeaffa9dc69bfdc41c55abd7ccc6baa3", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nur": { "locked": { - "lastModified": 1625064961, - "narHash": "sha256-ErII8vNW+04+eIGtViN8sSZs573I8PQiw6TWd1E0zoo=", + "lastModified": 1622221304, + "narHash": "sha256-aU/BdVGUverHNY9BOmDaAo21G8k9ndhzzjX1RSY1im0=", "owner": "nix-community", "repo": "NUR", - "rev": "5f0603506c26d7c97c91e8c6ae27e07f3ab2f0e8", + "rev": "8d8c59d767d854a1bc6fd08952529e10438eaa8d", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1624971177, - "narHash": "sha256-Amf/nBj1E77RmbSSmV+hg6YOpR+rddCbbVgo5C7BS0I=", + "lastModified": 1621411868, + "narHash": "sha256-R+7OQ2JYFCb3E7Jl7LhRifzMVCR6Gl8R98zYsNhZtJ8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "397f0713d007250a2c7a745e555fa16c5dc8cadb", + "rev": "2e7fac06108b4fc81f5ff9ed9a02bc4f6ede7001", "type": "github" }, "original": { diff --git a/home/direnv.nix b/home/direnv.nix index cf32628..d81cf46 100644 --- a/home/direnv.nix +++ b/home/direnv.nix @@ -9,11 +9,7 @@ in config.programs.direnv = lib.mkIf cfg.enable { enable = true; - nix-direnv = { - # A better `use_nix` - enable = true; - # And `use_flake` - enableFlakes = true; - }; + # A better `use_nix` + enableNixDirenvIntegration = true; }; } diff --git a/home/mail/accounts.nix b/home/mail/accounts.nix index 2eecb6d..7f1ad02 100644 --- a/home/mail/accounts.nix +++ b/home/mail/accounts.nix @@ -15,10 +15,6 @@ let inherit primary; - himalaya = { - enable = cfg.himalaya.enable; - }; - msmtp = { enable = cfg.msmtp.enable; }; diff --git a/home/mail/default.nix b/home/mail/default.nix index 3ec0c9a..cc81d0c 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -7,17 +7,12 @@ in { imports = [ ./accounts.nix - ./himalaya.nix ./msmtp.nix ]; options.my.home.mail = with lib; { enable = my.mkDisableOption "email configuration"; - himalaya = { - enable = mkRelatedOption "himalaya configuration"; - }; - msmtp = { enable = mkRelatedOption "msmtp configuration"; }; diff --git a/home/mail/himalaya.nix b/home/mail/himalaya.nix deleted file mode 100644 index c2d3b05..0000000 --- a/home/mail/himalaya.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.my.home.mail.himalaya; -in -{ - config.programs.himalaya = lib.mkIf cfg.enable { - enable = true; - - settings = { - notify-cmd = - let - notify-send = "${pkgs.libnotify}/bin/notify-send"; - in - pkgs.writeScript "mail-notifier" '' - SENDER="$1" - SUBJECT="$2" - ${notify-send} \ - -c himalaya \ - -- "$(printf 'Received email from %s\n\n%s' "$SENDER" "$SUBJECT")" - ''; - }; - }; -}