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

@ -14,10 +14,12 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
{ {
networking.hostName = "nova";
boot.plymouth.enable = true;
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.enable = true;
networking.hostName = "nova"; services.gnome.gnome-browser-connector.enable = true;
} }
./system ./system
./system/hardware-nova.nix ./system/hardware-nova.nix
@ -27,12 +29,19 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
{ {
environment.systemPackages = [ networking.hostName = "romulus";
nixpkgs.wl-clipboard environment.systemPackages = [
]; nixpkgs.wl-clipboard
programs.sway.enable = true; ];
networking.hostName = "romulus"; programs.sway.enable = true;
} security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
}
./system ./system
./system/hardware-romulus.nix ./system/hardware-romulus.nix
]; ];

View file

@ -2,16 +2,69 @@
{ {
home.packages = with pkgs; home.packages = with pkgs;
let let
R-packed = rWrapper.override { 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 jsonlite
DAAG
extrafont
revealjs
ggplot2
dplyr
rlist rlist
rvest rvest
rmarkdown
knitr
rnaturalearth
rnaturalearthdata
qrcode
mapproj
sf sf
tidyverse tidyverse
tmap tmap
languageserver languageserver
purrr
magrittr
knitr
kableExtra
tidyr
stringr
yaml
lectuR
publishR
goethR
]; ];
}; };
in [ in [

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -15,11 +15,9 @@
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
sound.enable = true;
hardware.pulseaudio.enable = true;
users.users.till = { users.users.till = {
isNormalUser = true; isNormalUser = true;
description = "Till";
extraGroups = [ extraGroups = [
"wheel" "wheel"
"networkmanager" "networkmanager"
@ -28,17 +26,20 @@
shell = pkgs.fish; shell = pkgs.fish;
}; };
nixpkgs.config.allowUnfree = true;
nixpkgs.config.joypixels.acceptLicense = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
neovim neovim
wget wget
git git
firefox
foot foot
wofi
pipewire
]; ];
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
jetbrains-mono jetbrains-mono
joypixels
]; ];
services = { services = {
@ -47,6 +48,5 @@
printing.enable = true; printing.enable = true;
}; };
system.stateVersion = "22.11"; system.stateVersion = "22.11";
} }

13
tex.nix Normal file
View file

@ -0,0 +1,13 @@
{ config, pkgs, ... }:
let
tex = (pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-medium
sourcesanspro
});
in
{ # home-manager
home.packages = with pkgs; [
tex
];
}

9
texput.log Normal file
View file

@ -0,0 +1,9 @@
This is TeX, Version 3.141592653 (TeX Live 2021/nixos.org) (preloaded format=tex 1980.1.1) 16 MAY 2023 14:34
**sourcesanspro.sty
! Emergency stop.
<*> sourcesanspro.sty
End of file on the terminal!
No pages of output.