This commit is contained in:
Till 2023-07-01 10:54:32 +02:00
parent 3c44560b1c
commit a330d605a4
11 changed files with 28 additions and 7 deletions

View file

@ -20,7 +20,7 @@
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@ktiu.net/home/git/publishR/"; url = "ssh://git@ktiu.net/home/git/publishR/";
ref = "main"; ref = "main";
rev = "49838c6ad30d3970c595dc7759edb414f9f0b540"; rev = "77a3f6d45df1b2d1dbcfd2475a2c67d9fb7cc3dd";
}; };
propagatedBuildInputs = []; propagatedBuildInputs = [];
nativeBuildInputs = []; nativeBuildInputs = [];
@ -30,7 +30,7 @@
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@ktiu.net/home/git/goethR/"; url = "ssh://git@ktiu.net/home/git/goethR/";
ref = "main"; ref = "main";
rev = "f92cd29ec696a79810082cb894de195e4e83023c"; rev = "93970916e669e81ffea2ded708d3e95b004f5f5d";
}; };
propagatedBuildInputs = []; propagatedBuildInputs = [];
nativeBuildInputs = []; nativeBuildInputs = [];
@ -48,6 +48,7 @@
in [ in [
bookdown bookdown
catmaply catmaply
clipr
DAAG DAAG
devtools devtools
dplyr dplyr

View file

@ -26,6 +26,10 @@
services.syncthing.enable = true; services.syncthing.enable = true;
home.file.".npmrc".text = ''
prefix = ${config.xdg.dataHome}/npm/packages
'';
home.packages = with pkgs; [ home.packages = with pkgs; [
# commandline # commandline
@ -69,6 +73,10 @@
libreoffice libreoffice
zotero zotero
zathura zathura
hunspell
hyphen
hunspellDicts.de_DE
hunspellDicts.th_TH
# graphics # graphics
inkscape inkscape

View file

@ -3,6 +3,7 @@
{ {
programs.fish = { programs.fish = {
enable = true; enable = true;
interactiveShellInit = "fish_add_path ${config.xdg.dataHome}/npm/packages/bin";
shellAliases = { shellAliases = {
r = "R --no-save --no-restore"; r = "R --no-save --no-restore";
R = "R --no-save --no-restore"; R = "R --no-save --no-restore";
@ -31,6 +32,9 @@
openconnect = "openconnect --config=/home/till/.config/openconnect/config"; openconnect = "openconnect --config=/home/till/.config/openconnect/config";
}; };
shellInit = '' shellInit = ''
set -gx EDITOR "nvim"
set -gx VISUAL "nvim"
function fish_greeting; end function fish_greeting; end
function startrloft --description 'Starts R with custom environment' function startrloft --description 'Starts R with custom environment'

View file

@ -51,11 +51,11 @@ macro index,pager gt "<change-folder>$trash<enter><refresh>" "Go to tr
macro index,pager gj "<change-folder>$my_junk<enter><refresh>" "Go to junk" macro index,pager gj "<change-folder>$my_junk<enter><refresh>" "Go to junk"
# accounts # accounts
macro index,pager gu "<change-folder>~/.local/share/mail/imap/gu/Inbox<enter><refresh>" "Go to GU" macro index,pager gu "<change-folder>~/.local/share/mail/gu/Inbox<enter><refresh>" "Go to GU"
# macro index,pager gp "<change-folder>+systemli/IMAP/Inbox<enter><refresh>" "Go to Systemli" # macro index,pager gp "<change-folder>+systemli/IMAP/Inbox<enter><refresh>" "Go to Systemli"
# macro index,pager gm "<change-folder>+gmail/IMAP/Inbox<enter><refresh>" "Go to Gmail" # macro index,pager gm "<change-folder>+gmail/IMAP/Inbox<enter><refresh>" "Go to Gmail"
# macro index,pager gk "<change-folder>+ks/IMAP/Inbox<enter><refresh>" "Go to KS" # macro index,pager gk "<change-folder>+ks/IMAP/Inbox<enter><refresh>" "Go to KS"
macro index,pager gi "<change-folder>~/.local/share/mail/imap/ktiu/Inbox<enter><refresh>" "Go to ktiu" macro index,pager gi "<change-folder>~/.local/share/mail/ktiu/Inbox<enter><refresh>" "Go to ktiu"
# macro index,pager gf "<change-folder>+dkg/IMAP/Inbox<enter><refresh>" "Go to DKG" # macro index,pager gf "<change-folder>+dkg/IMAP/Inbox<enter><refresh>" "Go to DKG"
macro index,pager L "<limit>all\n" "Show all messages (undo limit)" macro index,pager L "<limit>all\n" "Show all messages (undo limit)"

View file

@ -21,7 +21,7 @@
xdg.configFile."neomutt/smime.neomuttrc".source = ./smime.neomuttrc; xdg.configFile."neomutt/smime.neomuttrc".source = ./smime.neomuttrc;
xdg.configFile."neomutt/mailcap".source = ./neomutt_mailcap; xdg.configFile."neomutt/mailcap".source = ./neomutt_mailcap;
accounts.email = { accounts.email = {
maildirBasePath = "${config.xdg.dataHome}/mail/"; maildirBasePath = "${config.xdg.dataHome}/mail";
accounts = { accounts = {
gu = { gu = {
primary = true; primary = true;

1
home/npm.conf Normal file
View file

@ -0,0 +1 @@
prefix = ${HOME}/.npm-packages

View file

@ -0,0 +1 @@
setlocal shiftwidth=2

View file

@ -35,6 +35,7 @@ nnoremap gF :edit <cfile><return>
nnoremap gx :! xdg-open <cfile><return> nnoremap gx :! xdg-open <cfile><return>
nnoremap <silent> <tab> :bnext<return> nnoremap <silent> <tab> :bnext<return>
nnoremap <silent> <S-tab> :bnext<return>
nnoremap <silent> Q :bdelete<return> nnoremap <silent> Q :bdelete<return>
nnoremap <c-h> <c-w>h nnoremap <c-h> <c-w>h
nnoremap <c-j> <c-w>j nnoremap <c-j> <c-w>j

View file

@ -129,6 +129,7 @@
}; };
xdg.configFile."nvim/autocommmands.vim".source = ./autocommands.vim; xdg.configFile."nvim/autocommmands.vim".source = ./autocommands.vim;
xdg.configFile."nvim/ftplugin/markdown.vim".source = ./ftplugin/markdown.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/r.vim".source = ./ftplugin/r.vim;
xdg.configFile."nvim/ftplugin/rmd.vim".source = ./ftplugin/rmd.vim; xdg.configFile."nvim/ftplugin/rmd.vim".source = ./ftplugin/rmd.vim;
xdg.configFile."nvim/syntax/rmd.vim".source = ./syntax/rmd.vim; xdg.configFile."nvim/syntax/rmd.vim".source = ./syntax/rmd.vim;

View file

@ -1,6 +1,5 @@
setlocal spell setlocal spell
setlocal textwidth=0 setlocal textwidth=0
setlocal shiftwidth=2
setlocal syntax=rmd setlocal syntax=rmd
setlocal breakat-=@ setlocal breakat-=@

View file

@ -3,7 +3,7 @@
let let
tex = (pkgs.texlive.combine { tex = (pkgs.texlive.combine {
inherit (pkgs.texlive) inherit (pkgs.texlive)
scheme-medium adjustbox
arydshln arydshln
bbding bbding
csquotes csquotes
@ -13,14 +13,19 @@ let
framed framed
gensymb gensymb
lastpage lastpage
lipsum
ly1 ly1
makecell makecell
multirow multirow
nowidow
scheme-medium
sourcesanspro sourcesanspro
tabu tabu
tcolorbox tcolorbox
threeparttable threeparttable
threeparttablex threeparttablex
titling
tocloft
translations translations
was was
wrapfig wrapfig