This commit is contained in:
Till 2023-05-16 15:11:21 +02:00
parent 52f9b876b5
commit e40cd3e583
10 changed files with 133 additions and 25 deletions

View file

@ -2,16 +2,69 @@
{
home.packages = with pkgs;
let
let
R-packed = rWrapper.override {
packages = with rPackages; [
packages = with rPackages; let
lectuR = pkgs.rPackages.buildRPackage {
name = "lectuR";
src = builtins.fetchGit {
url = "ssh://git@ktiu.net/home/git/lectuR/";
ref = "main";
rev = "41c477a734c238db53b9ed2fe1e8d28117ffe59e";
};
propagatedBuildInputs = [ purrr magrittr knitr kableExtra tidyr stringr yaml ];
nativeBuildInputs = [ purrr magrittr knitr kableExtra tidyr stringr yaml ];
};
publishR = pkgs.rPackages.buildRPackage {
name = "publishR";
src = builtins.fetchGit {
url = "ssh://git@ktiu.net/home/git/publishR/";
ref = "main";
rev = "49838c6ad30d3970c595dc7759edb414f9f0b540";
};
propagatedBuildInputs = [];
nativeBuildInputs = [];
};
goethR = pkgs.rPackages.buildRPackage {
name = "goethR";
src = builtins.fetchGit {
url = "ssh://git@ktiu.net/home/git/goethR/";
ref = "main";
rev = "f92cd29ec696a79810082cb894de195e4e83023c";
};
propagatedBuildInputs = [];
nativeBuildInputs = [];
};
in [
bookdown
jsonlite
DAAG
extrafont
revealjs
ggplot2
dplyr
rlist
rvest
rmarkdown
knitr
rnaturalearth
rnaturalearthdata
qrcode
mapproj
sf
tidyverse
tmap
languageserver
purrr
magrittr
knitr
kableExtra
tidyr
stringr
yaml
lectuR
publishR
goethR
];
};
in [

View file

@ -12,25 +12,42 @@
};
};
# xsession.pointerCursor = {
# name = "Adwaita";
# package = pkgs.gnome.adwaita-icon-theme;
# size = 32;
# };
programs.home-manager.enable = true;
home.packages = with pkgs; [
# texlive.combined.scheme-medium
exa
firefox
mattermost-desktop
fzf
isync
jq
khal
khard
libsecret
nnn
nodejs
notmuch
pandoc
qutebrowser
rstudio
ruby
silver-searcher
tdesktop
tmux
tree
vdirsyncer
tdesktop
nnn
keepassxc
zathura
zotero
openssl
w3m
msmtp
];
imports = [
@ -38,6 +55,7 @@
./nvim
./fish.nix
./neomutt.nix
./tex.nix
];
home.shellAliases = {
@ -46,6 +64,10 @@
v = "nvim";
};
programs.nix-index = {
enable = true;
enableFishIntegration = true;
};
programs.git = {
enable = true;

View file

@ -29,13 +29,16 @@
};
shellInit = ''
function fish_greeting; end
function startrloft --description 'Starts R with custom environment'
set -lx R_ENVIRON_USER "~/.config/rloft/RLoft_environ"
r -q
R -q
end
function vd --wraps vim --description 'vim with date in filename'
nvim (ymd)_$argv.md
end
function note --description 'Create a new note'
nvim -c "call CreateNote('$argv')"
end

View file

@ -27,6 +27,7 @@
cmp-nvim-lsp
cmp-buffer
cmp-emoji
cmp-path
cmp-cmdline
cmp-nvim-ultisnips

View file

@ -6,7 +6,7 @@ setlocal breakat-=@
set makeprg=Rscript\ -e\ 'publishR::render(\\"%\\")'
" nnoremap <localleader>oh :! xdg-open %:r.html<cr>
nnoremap <localleader>oh :! chromium-browser %:r.html<cr>
nnoremap <localleader>oh :! xdg-open %:r.html<cr>
nnoremap <localleader>op :! xdg-open %:r.pdf<cr>
nnoremap <localleader>ow :! xdg-open %:r.docx<cr>

View file

@ -1,6 +1,5 @@
lua <<EOF
local cmp = require'cmp'
cmp.setup({
snippet = {
expand = function(args)
@ -20,22 +19,21 @@ lua <<EOF
}),
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'ultisnips' }, -- For ultisnips users.
{ name = 'ultisnips' },
{ name = 'emoji' },
}, {
{ name = 'buffer' },
})
})
-- Set configuration for specific filetype.
cmp.setup.filetype('gitcommit', {
sources = cmp.config.sources({
{ name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
{ name = 'cmp_git' },
}, {
{ name = 'buffer' },
})
})
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
cmp.setup.cmdline({ '/', '?' }, {
mapping = cmp.mapping.preset.cmdline(),
sources = {