From a330d605a4076c37495327cf7ff5e327c1a0a076 Mon Sep 17 00:00:00 2001 From: Till Date: Sat, 1 Jul 2023 10:54:32 +0200 Subject: [PATCH] diesdas --- home/R.nix | 5 +++-- home/default.nix | 8 ++++++++ home/fish.nix | 4 ++++ home/mail/bindings.neomuttrc | 4 ++-- home/mail/default.nix | 2 +- home/npm.conf | 1 + home/nvim/after/ftplugin/markdown.vim | 1 + home/nvim/config.vim | 1 + home/nvim/default.nix | 1 + home/nvim/ftplugin/markdown.vim | 1 - home/tex.nix | 7 ++++++- 11 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 home/npm.conf create mode 100644 home/nvim/after/ftplugin/markdown.vim diff --git a/home/R.nix b/home/R.nix index 1708111..daa5188 100644 --- a/home/R.nix +++ b/home/R.nix @@ -20,7 +20,7 @@ src = builtins.fetchGit { url = "ssh://git@ktiu.net/home/git/publishR/"; ref = "main"; - rev = "49838c6ad30d3970c595dc7759edb414f9f0b540"; + rev = "77a3f6d45df1b2d1dbcfd2475a2c67d9fb7cc3dd"; }; propagatedBuildInputs = []; nativeBuildInputs = []; @@ -30,7 +30,7 @@ src = builtins.fetchGit { url = "ssh://git@ktiu.net/home/git/goethR/"; ref = "main"; - rev = "f92cd29ec696a79810082cb894de195e4e83023c"; + rev = "93970916e669e81ffea2ded708d3e95b004f5f5d"; }; propagatedBuildInputs = []; nativeBuildInputs = []; @@ -48,6 +48,7 @@ in [ bookdown catmaply + clipr DAAG devtools dplyr diff --git a/home/default.nix b/home/default.nix index a9fcdd9..d3922a6 100644 --- a/home/default.nix +++ b/home/default.nix @@ -26,6 +26,10 @@ services.syncthing.enable = true; + home.file.".npmrc".text = '' + prefix = ${config.xdg.dataHome}/npm/packages + ''; + home.packages = with pkgs; [ # commandline @@ -69,6 +73,10 @@ libreoffice zotero zathura + hunspell + hyphen + hunspellDicts.de_DE + hunspellDicts.th_TH # graphics inkscape diff --git a/home/fish.nix b/home/fish.nix index ae2b800..a1b5ce9 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -3,6 +3,7 @@ { programs.fish = { enable = true; + interactiveShellInit = "fish_add_path ${config.xdg.dataHome}/npm/packages/bin"; shellAliases = { r = "R --no-save --no-restore"; R = "R --no-save --no-restore"; @@ -31,6 +32,9 @@ openconnect = "openconnect --config=/home/till/.config/openconnect/config"; }; shellInit = '' + set -gx EDITOR "nvim" + set -gx VISUAL "nvim" + function fish_greeting; end function startrloft --description 'Starts R with custom environment' diff --git a/home/mail/bindings.neomuttrc b/home/mail/bindings.neomuttrc index a35ff00..fbec604 100644 --- a/home/mail/bindings.neomuttrc +++ b/home/mail/bindings.neomuttrc @@ -51,11 +51,11 @@ macro index,pager gt "$trash" "Go to tr macro index,pager gj "$my_junk" "Go to junk" # accounts -macro index,pager gu "~/.local/share/mail/imap/gu/Inbox" "Go to GU" +macro index,pager gu "~/.local/share/mail/gu/Inbox" "Go to GU" # macro index,pager gp "+systemli/IMAP/Inbox" "Go to Systemli" # macro index,pager gm "+gmail/IMAP/Inbox" "Go to Gmail" # macro index,pager gk "+ks/IMAP/Inbox" "Go to KS" -macro index,pager gi "~/.local/share/mail/imap/ktiu/Inbox" "Go to ktiu" +macro index,pager gi "~/.local/share/mail/ktiu/Inbox" "Go to ktiu" # macro index,pager gf "+dkg/IMAP/Inbox" "Go to DKG" macro index,pager L "all\n" "Show all messages (undo limit)" diff --git a/home/mail/default.nix b/home/mail/default.nix index c1cd6ff..df78813 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -21,7 +21,7 @@ xdg.configFile."neomutt/smime.neomuttrc".source = ./smime.neomuttrc; xdg.configFile."neomutt/mailcap".source = ./neomutt_mailcap; accounts.email = { - maildirBasePath = "${config.xdg.dataHome}/mail/"; + maildirBasePath = "${config.xdg.dataHome}/mail"; accounts = { gu = { primary = true; diff --git a/home/npm.conf b/home/npm.conf new file mode 100644 index 0000000..dc3f6fb --- /dev/null +++ b/home/npm.conf @@ -0,0 +1 @@ +prefix = ${HOME}/.npm-packages diff --git a/home/nvim/after/ftplugin/markdown.vim b/home/nvim/after/ftplugin/markdown.vim new file mode 100644 index 0000000..6f78fab --- /dev/null +++ b/home/nvim/after/ftplugin/markdown.vim @@ -0,0 +1 @@ +setlocal shiftwidth=2 diff --git a/home/nvim/config.vim b/home/nvim/config.vim index 7d3dac7..cb8b49f 100644 --- a/home/nvim/config.vim +++ b/home/nvim/config.vim @@ -35,6 +35,7 @@ nnoremap gF :edit nnoremap gx :! xdg-open nnoremap :bnext +nnoremap :bnext nnoremap Q :bdelete nnoremap h nnoremap j diff --git a/home/nvim/default.nix b/home/nvim/default.nix index ddc25f0..57778a9 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -129,6 +129,7 @@ }; xdg.configFile."nvim/autocommmands.vim".source = ./autocommands.vim; xdg.configFile."nvim/ftplugin/markdown.vim".source = ./ftplugin/markdown.vim; + xdg.configFile."nvim/after/ftplugin/markdown.vim".source = ./after/ftplugin/markdown.vim; xdg.configFile."nvim/ftplugin/r.vim".source = ./ftplugin/r.vim; xdg.configFile."nvim/ftplugin/rmd.vim".source = ./ftplugin/rmd.vim; xdg.configFile."nvim/syntax/rmd.vim".source = ./syntax/rmd.vim; diff --git a/home/nvim/ftplugin/markdown.vim b/home/nvim/ftplugin/markdown.vim index 15f0a58..b33dbd1 100644 --- a/home/nvim/ftplugin/markdown.vim +++ b/home/nvim/ftplugin/markdown.vim @@ -1,6 +1,5 @@ setlocal spell setlocal textwidth=0 -setlocal shiftwidth=2 setlocal syntax=rmd setlocal breakat-=@ diff --git a/home/tex.nix b/home/tex.nix index d55566b..09dedf0 100644 --- a/home/tex.nix +++ b/home/tex.nix @@ -3,7 +3,7 @@ let tex = (pkgs.texlive.combine { inherit (pkgs.texlive) - scheme-medium + adjustbox arydshln bbding csquotes @@ -13,14 +13,19 @@ let framed gensymb lastpage + lipsum ly1 makecell multirow + nowidow + scheme-medium sourcesanspro tabu tcolorbox threeparttable threeparttablex + titling + tocloft translations was wrapfig