auto-format home.nix with nixpkgs-fmt

This commit is contained in:
Trolli Schmittlauch 2019-11-12 17:59:59 +01:00
parent f1f208ce59
commit a0b6d40323

View file

@ -5,12 +5,14 @@ with pkgs;
let let
unstable = import <nixos-unstable> {}; unstable = import <nixos-unstable> {};
mybrowser = firefox; mybrowser = firefox;
lorri = import (fetchTarball { url = "https://github.com/target/lorri/archive/rolling-release.tar.gz"; }) { }; lorri = import (fetchTarball { url = "https://github.com/target/lorri/archive/rolling-release.tar.gz"; }) {};
pypi2nix = import (pkgs.fetchgit { pypi2nix = import (
url = "https://github.com/nix-community/pypi2nix"; pkgs.fetchgit {
rev = "v2.0.0"; url = "https://github.com/nix-community/pypi2nix";
sha256 = "sha256:1mrvbm78jnk7m44gvpa7l2iwrjiv9584f14vlcw9p334zxknpsfr"; rev = "v2.0.0";
}) {}; sha256 = "sha256:1mrvbm78jnk7m44gvpa7l2iwrjiv9584f14vlcw9p334zxknpsfr";
}
) {};
desktopApps = [ desktopApps = [
mybrowser mybrowser
@ -34,7 +36,7 @@ let
backintime-common backintime-common
anki anki
signal-desktop signal-desktop
(tor-browser-bundle-bin.override {mediaSupport=true;pulseaudioSupport=true;}) (tor-browser-bundle-bin.override { mediaSupport = true; pulseaudioSupport = true; })
virtualbox virtualbox
pdfpc pdfpc
quaternion quaternion
@ -45,15 +47,18 @@ let
cawbird cawbird
tootle tootle
subsurface subsurface
(pkgs.pidgin-with-plugins.override { (
plugins = [ pkgs.pidginotr ];}) pkgs.pidgin-with-plugins.override {
plugins = [ pkgs.pidginotr ];
}
)
# for Hibiscus banking software # for Hibiscus banking software
jameica jameica
#ToDo: which of these drivers is actually used? #ToDo: which of these drivers is actually used?
geckodriver geckodriver
chromedriver chromedriver
]; ];
graphicsApps = [ graphicsApps = [
inkscape inkscape
@ -62,12 +67,14 @@ let
luminanceHDR luminanceHDR
exiftool exiftool
gimp gimp
]
++ (
with gimpPlugins; [
resynthesizer2
fourier
lqrPlugin
] ]
++ (with gimpPlugins; [ );
resynthesizer2
fourier
lqrPlugin
]);
multimediaApps = [ multimediaApps = [
mpv mpv
@ -82,8 +89,8 @@ let
linphone linphone
picard picard
soundkonverter soundkonverter
]; ];
cliApps = [ cliApps = [
myVim myVim
htop htop
@ -97,7 +104,7 @@ let
openssh openssh
sshfsFuse sshfsFuse
cryfs cryfs
smbnetfs # for FUSE smb mounting smbnetfs # for FUSE smb mounting
sshuttle sshuttle
thefuck thefuck
gnupg gnupg
@ -113,14 +120,14 @@ let
reptyr # re-bind running program to other tty reptyr # re-bind running program to other tty
xclip xclip
unzip unzip
]; ];
nixHelpers = [ nixHelpers = [
lorri lorri
nix-review nix-review
nixpkgs-fmt nixpkgs-fmt
pypi2nix pypi2nix
]; ];
kdeTools = with kdeApplications; [ kdeTools = with kdeApplications; [
okular okular
@ -149,14 +156,16 @@ let
skanlite skanlite
akonadiconsole akonadiconsole
plasma-browser-integration plasma-browser-integration
]
++ (
with kdeFrameworks; [
networkmanager-qt
kcrash
plasma5.breeze-gtk
libsForQt5.phonon-backend-vlc
#(phonon-backend-vlc.override {qtbase=qt5.qtbase; qtx11extras=qt5.qtx11extras;})
] ]
++ (with kdeFrameworks; [ );
networkmanager-qt
kcrash
plasma5.breeze-gtk
libsForQt5.phonon-backend-vlc
#(phonon-backend-vlc.override {qtbase=qt5.qtbase; qtx11extras=qt5.qtx11extras;})
]);
devTools = [ devTools = [
curl curl
@ -174,7 +183,7 @@ let
wireshark wireshark
ripgrep ripgrep
ghc ghc
]; ];
latexApps = [ latexApps = [
@ -182,29 +191,32 @@ let
kile kile
biber biber
# customize texlive installation # customize texlive installation
(texlive.combine { (
inherit (texlive) texlive.combine {
scheme-medium inherit (texlive)
scheme-medium
xetex xetex
luatex luatex
unicode-math unicode-math
fontspec fontspec
collection-binextra collection-binextra
collection-fontsrecommended collection-fontsrecommended
collection-latex collection-latex
collection-latexextra collection-latexextra
collection-latexrecommended collection-latexrecommended
collection-langgerman collection-langgerman
IEEEtran IEEEtran
moderncv moderncv
acronym acronym
ccicons ccicons
fontawesome fontawesome
biblatex biblatex
logreq logreq
koma-script; koma-script
}) ;
}
)
]; ];
pythonApps = with python3Packages; [ pythonApps = with python3Packages; [
@ -217,8 +229,9 @@ let
flake8 flake8
mypy mypy
] ]
++ (with python2Packages; [ ++ (
]); with python2Packages; []
);
fonts = [ fonts = [
@ -229,7 +242,7 @@ let
ubuntu_font_family ubuntu_font_family
twemoji-color-font twemoji-color-font
opensans-ttf opensans-ttf
(iosevka.override {design = [ "slab" "term" ]; set = "serif";}) (iosevka.override { design = [ "slab" "term" ]; set = "serif"; })
# TODO: vollkorn # TODO: vollkorn
# TODO: humor-sans # TODO: humor-sans
]; ];
@ -243,7 +256,8 @@ let
in in
{ {
home.packages = ([] home.packages = (
[]
++ desktopApps ++ desktopApps
++ latexApps ++ latexApps
++ pythonApps ++ pythonApps
@ -262,27 +276,29 @@ in
home.stateVersion = "18.09"; home.stateVersion = "18.09";
programs.direnv = programs.direnv =
{ enable = true; {
enable = true;
enableZshIntegration = true; enableZshIntegration = true;
}; };
# programs.vim = # programs.vim =
# { enable = true; # { enable = true;
# }; # };
programs.bat.enable = true; programs.bat.enable = true;
services.gpg-agent = services.gpg-agent =
{ enable = true; {
enable = true;
enableSshSupport = true; enableSshSupport = true;
}; };
programs.tmux = { programs.tmux = {
enable = true; enable = true;
keyMode = "vi"; keyMode = "vi";
extraConfig = extraConfig =
# for direnv not messing up the environment # for direnv not messing up the environment
''set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES" ''set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES"
set-environment -gu DIRENV_DIFF set-environment -gu DIRENV_DIFF
set-environment -gu DIRENV_DIR set-environment -gu DIRENV_DIR
set-environment -gu DIRENV_WATCHES set-environment -gu DIRENV_WATCHES
@ -290,51 +306,51 @@ in
bind-key -T copy-mode-vi 'v' send -X begin-selection bind-key -T copy-mode-vi 'v' send -X begin-selection
bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel''; bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel'';
terminal = "screen-256color"; terminal = "screen-256color";
}; };
# lorri daemon service # lorri daemon service
systemd.user = with lib; { systemd.user = with lib; {
services.lorri = { services.lorri = {
Unit = { Unit = {
Description = "Lorri build daemon"; Description = "Lorri build daemon";
Documentation = "https://github.com/target/lorri"; Documentation = "https://github.com/target/lorri";
ConditionUser = "!@system"; ConditionUser = "!@system";
Requires = "lorri.socket"; Requires = "lorri.socket";
After = "lorri.socket"; After = "lorri.socket";
RefuseManualStart = true; RefuseManualStart = true;
};
Service = {
ExecStart = "${lorri}/bin/lorri daemon";
PrivateTmp = true;
ProtectSystem = "strict";
WorkingDirectory = "%h";
Restart = "on-failure";
Environment =
let
path = with pkgs; makeSearchPath "bin" [ nix gnutar git mercurial ];
in
concatStringsSep " " [
"PATH=${path}"
"RUST_BACKTRACE=1"
];
};
}; };
sockets.lorri = { Service = {
Unit = { ExecStart = "${lorri}/bin/lorri daemon";
Description = "Socket for lorri build daemon"; PrivateTmp = true;
}; ProtectSystem = "strict";
WorkingDirectory = "%h";
Socket = { Restart = "on-failure";
ListenStream = "%t/lorri/daemon.socket"; Environment =
}; let
path = with pkgs; makeSearchPath "bin" [ nix gnutar git mercurial ];
Install = { in
WantedBy = [ "sockets.target" ]; concatStringsSep " " [
}; "PATH=${path}"
"RUST_BACKTRACE=1"
];
}; };
}; };
sockets.lorri = {
Unit = {
Description = "Socket for lorri build daemon";
};
Socket = {
ListenStream = "%t/lorri/daemon.socket";
};
Install = {
WantedBy = [ "sockets.target" ];
};
};
};
} }