From a15204bf405454717cd07ad0487872182fb30cfc Mon Sep 17 00:00:00 2001 From: kat witch Date: Sun, 14 Mar 2021 02:56:41 +0000 Subject: [PATCH] Vim, XDG, notmuch changes. --- config/profiles/gui/home/email.nix | 37 +++++++++---------- config/profiles/kat/home/vim/default.nix | 6 ++-- config/profiles/kat/home/vim/vimrc.nix | 6 +--- config/profiles/kat/home/xdg.nix | 5 +++ modules/home/default.nix | 4 +-- pkgs/notmuch/default.nix | 45 +++++++++++------------- 6 files changed, 51 insertions(+), 52 deletions(-) create mode 100644 config/profiles/kat/home/xdg.nix diff --git a/config/profiles/gui/home/email.nix b/config/profiles/gui/home/email.nix index e70547f9..83dcd4c8 100644 --- a/config/profiles/gui/home/email.nix +++ b/config/profiles/gui/home/email.nix @@ -3,31 +3,32 @@ { programs.notmuch = { enable = true; - hooks = { - preNew = "mbsync --all"; - }; + hooks = { preNew = "mbsync --all"; }; }; programs.mbsync.enable = true; programs.msmtp.enable = true; accounts.email = { maildirBasePath = "${config.home.homeDirectory}/mail"; accounts.kat = { - address = "kat@kittywit.ch"; - primary = true; - realName = "kat witch"; - userName = "kat@kittywit.ch"; - passwordCommand = ''bitw -p gpg://${../../../private/files/master.gpg} get "kittywitch email"''; - msmtp.enable = true; - mbsync.enable = true; - mbsync.create = "maildir"; - notmuch.enable = true; - imap.host = "kittywit.ch"; - smtp.host = "kittywit.ch"; - gpg = { - signByDefault = true; - key = "01F50A29D4AA91175A11BDB17248991EFA8EFBEE"; + address = "kat@kittywit.ch"; + primary = true; + realName = "kat witch"; + userName = "kat@kittywit.ch"; + passwordCommand = '' + bitw -p gpg://${ + ../../../private/files/bitw/master.gpg + } get "kittywitch email"''; + msmtp.enable = true; + mbsync.enable = true; + mbsync.create = "maildir"; + notmuch.enable = true; + imap.host = "kittywit.ch"; + smtp.host = "kittywit.ch"; + gpg = { + signByDefault = true; + key = "01F50A29D4AA91175A11BDB17248991EFA8EFBEE"; + }; }; }; -}; programs.vim.plugins = [ pkgs.arc.pkgs.vimPlugins.notmuch-vim ]; } diff --git a/config/profiles/kat/home/vim/default.nix b/config/profiles/kat/home/vim/default.nix index c50ddf6f..05db64fa 100644 --- a/config/profiles/kat/home/vim/default.nix +++ b/config/profiles/kat/home/vim/default.nix @@ -24,11 +24,13 @@ #extraPython3Packages = (ps: with ps; [ jedi pylint ]); extraConfig = import ./vimrc.nix { inherit pkgs config; }; }; - xdg.configFile = { + xdg.dataFile = { "vim/undo/.keep".text = ""; "vim/swap/.keep".text = ""; "vim/backup/.keep".text = ""; - "nvim/coc-settings.json".text = builtins.readFile ./coc-settings.json; + }; + xdg.configFile = { + "vim/coc-settings.json".text = builtins.readFile ./coc-settings.json; }; }; } diff --git a/config/profiles/kat/home/vim/vimrc.nix b/config/profiles/kat/home/vim/vimrc.nix index b93a6264..385ec2af 100644 --- a/config/profiles/kat/home/vim/vimrc.nix +++ b/config/profiles/kat/home/vim/vimrc.nix @@ -1,15 +1,11 @@ { config, pkgs }: '' - " Set internal encoding of vim, not needed on neovim, since coc.nvim using some - " unicode characters in the file autoload/float.vim - set encoding=utf-8 - " Enable mouse set mouse=a " notmuch! - let g:notmuch_config_file='${config.xdg.configHome}/notmuch/notmuchrc' + let g:notmuch_config_file='$XDG_CONFIG_HOME/notmuch/notmuchrc' let g:notmuch_folders_count_threads=0 let g:notmuch_date_format='%y-%m-%d %H:%M' let g:notmuch_datetime_format='%y-%m-%d %H:%M' diff --git a/config/profiles/kat/home/xdg.nix b/config/profiles/kat/home/xdg.nix new file mode 100644 index 00000000..645df724 --- /dev/null +++ b/config/profiles/kat/home/xdg.nix @@ -0,0 +1,5 @@ +{ config, lib, ... }: + +{ + xdg.enable = true; +} diff --git a/modules/home/default.nix b/modules/home/default.nix index cc3d5700..d0ac49d4 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,9 +1,7 @@ { sources, ... }: { - disabledModules = [ - "programs/vim.nix" - ]; + disabledModules = [ "programs/vim.nix" ]; imports = [ ./vim.nix (sources.tf-nix + "/modules/home/secrets.nix") diff --git a/pkgs/notmuch/default.nix b/pkgs/notmuch/default.nix index f4d51f96..931a7b64 100644 --- a/pkgs/notmuch/default.nix +++ b/pkgs/notmuch/default.nix @@ -1,26 +1,23 @@ -{ lib, notmuch, coreutils }@args: let - notmuch = args.notmuch.super or args.notmuch; - drv = notmuch.override { - withEmacs = false; - }; - in drv.overrideAttrs (old: { - doCheck = false; +{ lib, notmuch, coreutils }@args: +let + notmuch = args.notmuch.super or args.notmuch; + drv = notmuch.override { withEmacs = false; }; +in drv.overrideAttrs (old: { + doCheck = false; - postInstall = '' - ${old.postInstall or ""} - make -C bindings/ruby exec_prefix=$out \ - SHELL=$SHELL \ - $makeFlags ''${makeFlagsArray+"''${makeFlagsArray[@]}"} \ - $installFlags ''${installFlagsArray+"''${installFlagsArray[@]}"} \ - install - mv $out/lib/ruby/vendor_ruby/* $out/lib/ruby/ - rmdir $out/lib/ruby/vendor_ruby - ''; + postInstall = '' + ${old.postInstall or ""} + make -C bindings/ruby exec_prefix=$out \ + SHELL=$SHELL \ + $makeFlags ''${makeFlagsArray+"''${makeFlagsArray[@]}"} \ + $installFlags ''${installFlagsArray+"''${installFlagsArray[@]}"} \ + install + mv $out/lib/ruby/vendor_ruby/* $out/lib/ruby/ + rmdir $out/lib/ruby/vendor_ruby + ''; - meta = old.meta or {} // { - broken = old.meta.broken or false || notmuch.stdenv.isDarwin; - }; - passthru = old.passthru or {} // { - super = notmuch; - }; - }) + meta = old.meta or { } // { + broken = old.meta.broken or false || notmuch.stdenv.isDarwin; + }; + passthru = old.passthru or { } // { super = notmuch; }; +})