dotfiles/nixos-config
1
0
Fork 0
mirror of https://github.com/srid/nixos-config.git synced 2026-05-11 17:36:07 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use himalaya direct; flake has issues

Browse source
This commit is contained in:
Sridhar Ratnakumar 2021-04-07 19:59:20 -04:00
parent 17a243554e
commit 3e47c41cdd
2 changed files with 68 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

91
flake.lock generated
View file

@ -17,21 +17,6 @@
}
},
"flake-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"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1614513358,
"narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
@ -65,17 +50,18 @@
"himalaya": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
"naersk": "naersk",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay",
"utils": "utils"
},
"locked": {
"lastModified": 1617828522,
"narHash": "sha256-8P2fHNoslQgC5NJFgoEAFj9sgud8okbzFkqOD0yBdTs=",
"lastModified": 1617838005,
"narHash": "sha256-i1xwhsAYSJA2/fx5xmX+GXKUJJo3Hqc8jUukj+4wyIc=",
"owner": "srid",
"repo": "himalaya",
"rev": "d706dd333397c672331f9077e07df09f5b924ba9",
"rev": "d84a315274d3b426a24be4266eb696b6524276d7",
"type": "github"
},
"original": {
@ -87,7 +73,7 @@
},
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1617625716,
@ -103,7 +89,39 @@
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1614785451,
"narHash": "sha256-TPw8kQvr2UNCuvndtY+EjyXp6Q5GEW2l9UafXXh1XmI=",
"owner": "nmattia",
"repo": "naersk",
"rev": "e0fe990b478a66178a58c69cf53daec0478ca6f9",
"type": "github"
},
"original": {
"owner": "nmattia",
"repo": "naersk",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1617833390,
"narHash": "sha256-puAjU8RcmfqrPYnOuDvESPgA+QtaszUKJZ7jrjnk7iU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "87df3e15f029f44a3dca474907a3c02bcbe03414",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1617636226,
"narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=",
@ -113,13 +131,13 @@
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs_3": {
"locked": {
"lastModified": 1617325113,
"narHash": "sha256-GksR0nvGxfZ79T91UUtWjjccxazv6Yh/MvEJ82v1Xmw=",
@ -134,7 +152,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1617636226,
"narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=",
@ -148,7 +166,7 @@
"type": "indirect"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1617636226,
"narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=",
@ -168,13 +186,13 @@
"inputs": {
"himalaya": "himalaya",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_5"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1617762447,
@ -189,6 +207,21 @@
"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"
}
}
},
"root": "root",

10
flake.nix
View file

@ -4,7 +4,9 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager";
himalaya.url = "github:srid/himalaya/nixify";
himalaya = {
url = "github:srid/himalaya/nixify";
};
};
outputs = inputs@{ self, home-manager, nixpkgs, ... }:
@ -23,16 +25,16 @@
# Packages from flake inputs
({ 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.
himalaya = lib.getAttrFromPath [ system ] inputs.himalaya.defaultPackage;
himalayaWithSslEnv =
pkgs.writeScriptBin "h" ''
#!${pkgs.stdenv.shell}
export SSL_CERT_FILE=~/.config/protonmail/bridge/cert.pem
exec ${himalaya}/bin/himalaya
exec nix run github:srid/himalaya/nixify $*
'';
in
[