From af03c7c915a8df96947ce23fb0a3680d7aa87937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 3 Jan 2019 00:43:21 +0100 Subject: [PATCH] nvim; add hledger --- configs/editors.nix | 13 +++++++++++-- configs/packages.nix | 2 ++ theme.nix | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/configs/editors.nix b/configs/editors.nix index d9f1970..e7bc1cb 100644 --- a/configs/editors.nix +++ b/configs/editors.nix @@ -94,7 +94,7 @@ let vim_conf = '' autocmd bufnewfile,bufread *.rust :packadd rust-vim deoplete-rust autocmd bufnewfile,bufread *.tex :packadd vimtex | set filetype=tex autocmd bufnewfile,bufread *.ts :packadd vim-typescript - autocmd bufnewfile,bufread *.graphql :packadd vim-graphql + autocmd bufnewfile,bufread *.journal :packadd vim-ledger | set filetype=ledger shiftwidth=4 autocmd bufnewfile,bufread config set filetype=conf autocmd filetype haskell :packadd Hoogle autocmd filetype haskell set formatprg=hindent @@ -138,7 +138,7 @@ let vim_conf = '' "endif ''; in { - environment.variables.EDITOR = pkgs.lib.mkForce "vim"; + environment.variables.EDITOR = pkgs.lib.mkForce "nvim"; environment.shellAliases.vi = "nvim"; environment.shellAliases.view = "nvim -R"; @@ -182,6 +182,15 @@ in { typescript-vim vim-javascript vim-nix + (pkgs.vimUtils.buildVimPluginFrom2Nix { + name = "vim-ledger"; + src = pkgs.fetchFromGitHub { + owner = "ledger"; + repo = "vim-ledger"; + rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d"; + sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01"; + }; + }) (pkgs.vimUtils.buildVimPluginFrom2Nix { name = "vim-fsharp"; src = pkgs.fetchFromGitHub { diff --git a/configs/packages.nix b/configs/packages.nix index 8301d50..f6da82e 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -2,6 +2,7 @@ let scripts = import ../dot/scripts.nix { inherit pkgs lib; }; daybook = pkgs.callPackage ../packages/daybook.nix {}; + unstable = import {}; in with pkgs; { nixpkgs.config.allowUnfree = true; @@ -154,6 +155,7 @@ in with pkgs; maxima ] ++ [ # shell daybook + unstable.hledger jo jq memo diff --git a/theme.nix b/theme.nix index f7c62da..f4b95c1 100644 --- a/theme.nix +++ b/theme.nix @@ -1,5 +1,5 @@ let - flip = scheme: scheme // { + flip = scheme: scheme // rec { background = scheme.foreground; foreground = scheme.background; fadeColor = background;