From 79a41bfc11485d77aa0145e3ed4d6344ae5d6a92 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Thu, 8 Apr 2021 10:36:30 -0400 Subject: [PATCH] Use properly nixified himalaya --- features/email/himalaya-client.nix | 5 +- flake.lock | 141 ++++++++++++++++++++++++++++- flake.nix | 6 ++ 3 files changed, 147 insertions(+), 5 deletions(-) diff --git a/features/email/himalaya-client.nix b/features/email/himalaya-client.nix index 8d026cd..b8529a5 100644 --- a/features/email/himalaya-client.nix +++ b/features/email/himalaya-client.nix @@ -1,14 +1,13 @@ { pkgs, lib, ... }: { environment.systemPackages = let - # FIXME: This leads to forbidden error - # himalaya = toString inputs.himalaya.defaultApp."${system}".program; # Wrap himalaya to be aware of ProtonMail's bridge cert. himalayaWithSslEnv = pkgs.writeScriptBin "h" '' #!${pkgs.stdenv.shell} export SSL_CERT_FILE=~/.config/protonmail/bridge/cert.pem - exec nix run github:srid/himalaya/nixify $* + # HACK: See note in flake.nix + exec himalaya $* ''; in [ diff --git a/flake.lock b/flake.lock index e6938cc..81cf054 100644 --- a/flake.lock +++ b/flake.lock @@ -1,8 +1,79 @@ { "nodes": { + "crate2nix": { + "flake": false, + "locked": { + "lastModified": 1608814925, + "narHash": "sha256-GdFBG2LmpbY4C1OJBFfWLMKXzGyFq4mJBK+SVMNNE+8=", + "owner": "balsoft", + "repo": "crate2nix", + "rev": "68be3d90f31bf0bfd525da77e0ae6e89f48abd24", + "type": "github" + }, + "original": { + "owner": "balsoft", + "ref": "tools-nix-version-comparison", + "repo": "crate2nix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1606424373, + "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1614513358, + "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5466c5bbece17adaab2d82fae80b46e807611bf3", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "himalaya": { + "inputs": { + "crate2nix": "crate2nix", + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay", + "utils": "utils" + }, + "locked": { + "lastModified": 1617890990, + "narHash": "sha256-J0cr9CYiIQBrQob/C3GBlUJyVT4rphqNTqzxK23N1ak=", + "owner": "srid", + "repo": "himalaya", + "rev": "259975d5c1fef8754bba6e2dd1a82020415a5ff4", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "nixify-crate2nix", + "repo": "himalaya", + "type": "github" + } + }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1617625716, @@ -19,6 +90,37 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1617636226, + "narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1617325113, + "narHash": "sha256-GksR0nvGxfZ79T91UUtWjjccxazv6Yh/MvEJ82v1Xmw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "54c1e44240d8a527a8f4892608c4bce5440c3ecb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1617636226, "narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=", @@ -32,7 +134,7 @@ "type": "indirect" } }, - "nixpkgs_2": { + "nixpkgs_4": { "locked": { "lastModified": 1617636226, "narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=", @@ -50,8 +152,43 @@ }, "root": { "inputs": { + "himalaya": "himalaya", "home-manager": "home-manager", + "nixpkgs": "nixpkgs_4" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1617848844, + "narHash": "sha256-nhPuATSHRrzfZNjtl8zmMhZklYFCHiQd7+uf+jQbd+o=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "70330a767d25daa6063e89e38d68b94b2d971831", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "utils": { + "locked": { + "lastModified": 1617631617, + "narHash": "sha256-PARRCz55qN3gy07VJZIlFeOX420d0nGF0RzGI/9hVlw=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b2c27d1a81b0dc266270fa8aeecebbd1807fc610", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index e6c214b..51b9d70 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager"; + himalaya.url = "github:srid/himalaya/nixify-crate2nix"; }; outputs = inputs@{ self, home-manager, nixpkgs, ... }: @@ -20,6 +21,11 @@ ./features/email ./features/monitor-brightness.nix + # HACK: This should really go under ./features/email + ({ + environment.systemPackages = [ inputs.himalaya.outputs.defaultPackage.${system} ]; + }) + # home-manager configuration home-manager.nixosModules.home-manager {