diff options
author | Griffin Smith <grfn@gws.fyi> | 2020-08-28T14·25-0400 |
---|---|---|
committer | glittershark <grfn@gws.fyi> | 2020-08-28T21·24+0000 |
commit | a7cd92770d3d2f35ae04713fb5e245536a1a95e9 (patch) | |
tree | 757fea8bcf73331454db57bdf609f96f8ceb849b /users/glittershark/system/home | |
parent | fb0528c5dada2d3af6152b37a46e505e6bb2ac94 (diff) |
revert(glittershark): "Temporarily skip grfn's subtree" r/1728
This reverts commit 475d41f698415919093ca98f676ffcda218093ac. I'd like my derivations back, please. Changes necessary to get this working: - Don't depend on `nixpkgs` being in the NIX_PATH for my website - it's not necessary anyway since emacs 27 is mainline now - .skip-subtrees on things that shouldn't be evaluated anyway - Get rid of system/pkgs, and move the one thing in there that *wasn't* already in third_party (alsi) to third_party - Drop notifymuch for now - it's not working, and I'll probably get it landed in nixpkgs before I manage to get it working - Add __readTree = true to my systems so they get built. - explicitly disable ci for xanthous, which is failing to build and had been omitted previously Change-Id: I20f5e81d6eb7ffe040091a08d75d0cb15304f707 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1864 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'users/glittershark/system/home')
-rw-r--r-- | users/glittershark/system/home/.skip-subtree | 0 | ||||
-rw-r--r-- | users/glittershark/system/home/default.nix | 4 | ||||
-rw-r--r-- | users/glittershark/system/home/modules/alsi.nix | 4 | ||||
-rw-r--r-- | users/glittershark/system/home/modules/email.nix | 24 |
4 files changed, 15 insertions, 17 deletions
diff --git a/users/glittershark/system/home/.skip-subtree b/users/glittershark/system/home/.skip-subtree new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/users/glittershark/system/home/.skip-subtree diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix index 949def154207..d896ba340d59 100644 --- a/users/glittershark/system/home/default.nix +++ b/users/glittershark/system/home/default.nix @@ -10,7 +10,7 @@ rec { sha256 = "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc"; }); - home = confPath: import "${home-manager}/modules" { + home = confPath: (import "${home-manager}/modules" { pkgs = nixpkgs; configuration = { config, lib, ... }: { imports = [confPath]; @@ -20,7 +20,7 @@ rec { lib.depot = depot; }; - }; + }) // { __readTree = true; }; chupacabra = home ./machines/chupacabra.nix; } diff --git a/users/glittershark/system/home/modules/alsi.nix b/users/glittershark/system/home/modules/alsi.nix index 19ec68efd289..cf8b0bebe743 100644 --- a/users/glittershark/system/home/modules/alsi.nix +++ b/users/glittershark/system/home/modules/alsi.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, ... }: -let alsi = pkgs.callPackage ../../pkgs/alsi {}; -in { - home.packages = [ alsi ]; + home.packages = [ config.lib.depot.third_party.alsi ]; xdg.configFile."alsi/alsi.logo" = { source = ./nixos-logo.txt; diff --git a/users/glittershark/system/home/modules/email.nix b/users/glittershark/system/home/modules/email.nix index 62c8be19a24e..48d6b5f3cc04 100644 --- a/users/glittershark/system/home/modules/email.nix +++ b/users/glittershark/system/home/modules/email.nix @@ -36,26 +36,26 @@ in { msmtp ]; - nixpkgs.overlays = [(self: super: { - notifymuch = self.python3Packages.callPackage ../../pkgs/notifymuch.nix {}; - })]; + # nixpkgs.overlays = [(self: super: { + # notifymuch = self.python3Packages.callPackage ../../pkgs/notifymuch.nix {}; + # })]; systemd.user.services = mapAttrs' (name: account: { name = escapeUnitName "lieer-${name}"; value.Service.ExecStart = mkForce "${pkgs.writeShellScript "sync-${name}" '' ${pkgs.gmailieer}/bin/gmi sync - ${pkgs.notifymuch}/bin/notifymuch ''}"; + # ${pkgs.notifymuch}/bin/notifymuch }) accounts; - xdg.configFile."notifymuch/notifymuch.cfg".text = generators.toINI {} { - notifymuch = { - query = "is:unread and is:important"; - mail_client = ""; - recency_interval_hours = "48"; - hidden_tags = "inbox unread attachment replied sent encrypted signed"; - }; - }; + # xdg.configFile."notifymuch/notifymuch.cfg".text = generators.toINI {} { + # notifymuch = { + # query = "is:unread and is:important"; + # mail_client = ""; + # recency_interval_hours = "48"; + # hidden_tags = "inbox unread attachment replied sent encrypted signed"; + # }; + # }; accounts.email.maildirBasePath = "mail"; accounts.email.accounts = mapAttrs (_: params@{ passEntry, ... }: { |