not using himalaya

This commit is contained in:
Sridhar Ratnakumar 2022-03-30 14:08:02 -04:00
parent c56141af59
commit 061528bd18
6 changed files with 42 additions and 235 deletions

View file

@ -1,6 +1,5 @@
{ pkgs, ... }: {
imports = [
./protonmail-bridge.nix
./himalaya-workflow.nix
];
}

View file

@ -1,23 +0,0 @@
{ pkgs, lib, system, inputs, ... }:
{
environment.systemPackages =
let
himalaya = import ./himalaya.nix { inherit pkgs system inputs; };
# Helper to read and display the (HTML) email message in Markdown,
# highlighted with pager.
himalayaReadMail =
pkgs.writeScriptBin "h-read" ''
#!${pkgs.stdenv.shell}
${himalaya}/bin/himalaya read $* \
| ${pkgs.pandoc}/bin/pandoc -f html -t markdown_strict \
| ${pkgs.bat}/bin/bat -l md
'';
# TODO more helpers
# - `h move` with fzf-selector for target folder
in
[
himalaya
# Helpers
himalayaReadMail
];
}

View file

@ -1,10 +0,0 @@
{ pkgs, system, inputs, ... }:
let
himalaya = inputs.himalaya.outputs.defaultPackage.${system};
in
# Wrap himalaya to be aware of ProtonMail's bridge cert.
pkgs.writeScriptBin "himalaya" ''
#!${pkgs.stdenv.shell}
export SSL_CERT_FILE=~/.config/protonmail/bridge/cert.pem
exec ${himalaya}/bin/himalaya $*
''

234
flake.lock generated
View file

@ -182,22 +182,6 @@
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1627913399,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1641205782,
@ -250,21 +234,6 @@
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1629481132,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
@ -279,7 +248,7 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_3": {
"locked": {
"lastModified": 1623875721,
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
@ -317,28 +286,6 @@
"type": "github"
}
},
"himalaya": {
"inputs": {
"flake-compat": "flake-compat_2",
"naersk": "naersk",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay",
"utils": "utils"
},
"locked": {
"lastModified": 1646408512,
"narHash": "sha256-Ejaspj0YpkGmfO1omOhx8ZDg77J7NqC32mw5Cd3K1FM=",
"owner": "soywod",
"repo": "himalaya",
"rev": "2d077faa88d6e9fa4f77dbea2030934c40231163",
"type": "github"
},
"original": {
"owner": "soywod",
"repo": "himalaya",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -359,28 +306,10 @@
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1639947939,
"narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
"owner": "nix-community",
"repo": "naersk",
"rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_6"
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"dir": "contrib",
@ -400,9 +329,9 @@
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat_2",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1646641035,
@ -446,9 +375,9 @@
"evil-org-mode": "evil-org-mode",
"evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"nix-straight": "nix-straight",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_5",
"nose": "nose",
"ob-racket": "ob-racket",
"org": "org",
@ -523,7 +452,7 @@
},
"nixos-vscode-server": {
"inputs": {
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1621309617,
@ -554,22 +483,6 @@
"type": "indirect"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1646939531,
"narHash": "sha256-bxOjVqcsccCNm+jSmEh/bm0tqfE3SdjwS+p+FZja3ho=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fcd48a5a0693f016a5c370460d0c2a8243b882dc",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fcd48a5a0693f016a5c370460d0c2a8243b882dc",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1619531122,
@ -586,81 +499,37 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1637453606,
"narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8afc4e543663ca0a6a4f496262cd05233737e732",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1626852498,
"narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
@ -675,7 +544,7 @@
"type": "indirect"
}
},
"nixpkgs_9": {
"nixpkgs_6": {
"locked": {
"lastModified": 1621073999,
"narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=",
@ -691,6 +560,22 @@
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1646939531,
"narHash": "sha256-bxOjVqcsccCNm+jSmEh/bm0tqfE3SdjwS+p+FZja3ho=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fcd48a5a0693f016a5c370460d0c2a8243b882dc",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fcd48a5a0693f016a5c370460d0c2a8243b882dc",
"type": "github"
}
},
"nose": {
"flake": false,
"locked": {
@ -828,13 +713,12 @@
"darwin": "darwin",
"emacs-overlay": "emacs-overlay",
"hercules-ci-agent": "hercules-ci-agent",
"himalaya": "himalaya",
"home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-doom-emacs": "nix-doom-emacs",
"nixos-hardware": "nixos-hardware",
"nixos-vscode-server": "nixos-vscode-server",
"nixpkgs": "nixpkgs_10"
"nixpkgs": "nixpkgs_7"
}
},
"rotate-text": {
@ -852,40 +736,6 @@
"repo": "rotate-text.el",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1642838864,
"narHash": "sha256-pHnhm3HWwtvtOK7NdNHwERih3PgNlacrfeDwachIG8E=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9fb49daf1bbe1d91e6c837706c481f9ebb3d8097",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1623875721,
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

View file

@ -16,7 +16,6 @@
nixos-vscode-server = {
url = "github:iosmanthus/nixos-vscode-server/add-flake";
};
himalaya.url = "github:soywod/himalaya";
emacs-overlay.url = "github:nix-community/emacs-overlay";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
nix-doom-emacs.url = "github:vlaci/nix-doom-emacs";

View file

@ -1,7 +1,5 @@
{ pkgs, inputs, system, ... }:
let
#himalayaSrc = inputs.himalaya;
#himalaya = import ./features/email/himalaya.nix { inherit pkgs inputs system; };
neovim-nightly = inputs.neovim-nightly-overlay.packages.${system}.neovim;
in
rec {
@ -69,17 +67,11 @@ rec {
# withNodeJs = true;
extraPackages = [
# himalaya
];
plugins = with pkgs.vimPlugins; [
vim-airline
papercolor-theme
#(pkgs.vimUtils.buildVimPlugin {
# name = "himalaya";
# src = himalayaSrc + "/vim";
#})
];
extraConfig = ''