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