fix indentation: spaces, not tabs

This commit is contained in:
Trolli Schmittlauch 2019-01-14 13:24:34 +01:00
parent 733aeb853b
commit 86f8d1ed68
3 changed files with 173 additions and 173 deletions

View file

@ -34,11 +34,11 @@ in
vim-jinja vim-jinja
]; ];
}; };
vimrcConfig.customRC = vimrcConfig.customRC =
''if filereadable($HOME . "/.vimrc") ''if filereadable($HOME . "/.vimrc")
source ~/.vimrc source ~/.vimrc
endif endif
''; '';
}; };
# build with debug symbols and in debug mode (less optimized) # build with debug symbols and in debug mode (less optimized)
opencvDebug = enableDebugging ((opencv3.override {enablePython=true; enableGtk3=true; enableDocs=true; pythonPackages=pkgs.python3Packages; }).overrideAttrs (oldAttrs: rec {cmakeBuildType = "Debug";})); opencvDebug = enableDebugging ((opencv3.override {enablePython=true; enableGtk3=true; enableDocs=true; pythonPackages=pkgs.python3Packages; }).overrideAttrs (oldAttrs: rec {cmakeBuildType = "Debug";}));

View file

@ -8,191 +8,191 @@ let
desktopApps = [ desktopApps = [
mybrowser mybrowser
calibre calibre
dino dino
zotero zotero
keepassxc keepassxc
ding ding
aspell aspell
aspellDicts.de aspellDicts.de
aspellDicts.en aspellDicts.en
# for kate/KDE applications # for kate/KDE applications
hunspellDicts.de-de hunspellDicts.de-de
hunspellDicts.en-us hunspellDicts.en-us
hunspellDicts.en-gb-ise hunspellDicts.en-gb-ise
seafile-client seafile-client
alacritty alacritty
libreoffice-fresh libreoffice-fresh
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
#nheko #nheko
gpx-viewer gpx-viewer
gpxsee gpxsee
(corebird.overrideAttrs (oldAttrs: {src = fetchFromGitHub { (corebird.overrideAttrs (oldAttrs: {src = fetchFromGitHub {
owner = "IBBoard"; owner = "IBBoard";
repo = "corebird"; repo = "corebird";
rev = "bc758889a5ac304101001c36eafdb219a0acfda7"; rev = "bc758889a5ac304101001c36eafdb219a0acfda7";
sha256 = "1yiflxvswrybabqq5cd6x9i740560c23p58gvcn9b6riwhxzrlb9"; sha256 = "1yiflxvswrybabqq5cd6x9i740560c23p58gvcn9b6riwhxzrlb9";
};})) };}))
tootle tootle
subsurface subsurface
# for research project # for research project
twister twister
]; ];
graphicsApps = [ graphicsApps = [
gimp gimp
inkscape inkscape
darktable darktable
hugin hugin
luminanceHDR luminanceHDR
exiftool exiftool
] ]
++ (with gimpPlugins; [ ++ (with gimpPlugins; [
resynthesizer2 resynthesizer2
fourier fourier
lqrPlugin lqrPlugin
]); ]);
multimediaApps = [ multimediaApps = [
mpv mpv
vlc vlc
#amarok-kf5 #amarok-kf5
clementine clementine
youtube-dl youtube-dl
sonic-pi sonic-pi
musescore musescore
audacity audacity
avidemux avidemux
linphone linphone
picard picard
]; ];
cliApps = [ cliApps = [
myVim myVim
htop htop
tmux tmux
httpie httpie
ponysay ponysay
gti gti
tree tree
lsof lsof
mosh mosh
openssh openssh
sshfsFuse sshfsFuse
cryfs cryfs
sshuttle sshuttle
thefuck thefuck
gnupg gnupg
unar unar
pwgen pwgen
pandoc pandoc
agrep agrep
pdfgrep pdfgrep
torsocks torsocks
ncdu ncdu
psmisc # for killall psmisc # for killall
dos2unix dos2unix
reptyr # re-bind running program to other tty reptyr # re-bind running program to other tty
]; ];
nixHelpers = [ nixHelpers = [
nox nox
]; ];
kdeTools = with kdeApplications; [ kdeTools = with kdeApplications; [
okular okular
redshift-plasma-applet redshift-plasma-applet
gwenview gwenview
yakuake yakuake
kmail kmail
kontact kontact
korganizer korganizer
akonadi-mime #for KOrganizer akonadi-mime #for KOrganizer
kaddressbook kaddressbook
kdeconnect kdeconnect
dolphin dolphin
spectacle spectacle
kate kate
kleopatra kleopatra
qdirstat qdirstat
ark ark
kwalletmanager kwalletmanager
#ktouch #ktouch
kcharselect kcharselect
konversation konversation
okteta okteta
ktorrent ktorrent
krdc krdc
skanlite skanlite
akonadiconsole akonadiconsole
plasma-browser-integration plasma-browser-integration
] ]
++ (with kdeFrameworks; [ ++ (with kdeFrameworks; [
networkmanager-qt networkmanager-qt
kcrash kcrash
plasma5.breeze-gtk plasma5.breeze-gtk
libsForQt5.phonon-backend-vlc libsForQt5.phonon-backend-vlc
#(phonon-backend-vlc.override {qtbase=qt5.qtbase; qtx11extras=qt5.qtx11extras;}) #(phonon-backend-vlc.override {qtbase=qt5.qtbase; qtx11extras=qt5.qtx11extras;})
]); ]);
devTools = [ devTools = [
curl curl
httpie httpie
gdb gdb
strace strace
ltrace ltrace
valgrind valgrind
zeal zeal
gcc gcc
kdevelop kdevelop
qtcreator qtcreator
shellcheck shellcheck
mtr mtr
wireshark wireshark
ag ag
]; ];
latexApps = [ latexApps = [
texmaker texmaker
# customize texlive installation # customize texlive installation
(texlive.combine { (texlive.combine {
inherit (texlive) inherit (texlive)
scheme-medium 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
koma-script; koma-script;
}) })
]; ];
pythonApps = with python3Packages; [ pythonApps = with python3Packages; [
notebook notebook
ipython ipython
pip pip
numpy numpy
matplotlib matplotlib
jedi jedi
flake8 flake8
mypy mypy
] ]
@ -201,14 +201,14 @@ let
fonts = [ fonts = [
comic-neue comic-neue
source-sans-pro source-sans-pro
source-serif-pro source-serif-pro
fira-code fira-code
ubuntu_font_family ubuntu_font_family
twemoji-color-font twemoji-color-font
# TODO: vollkorn # TODO: vollkorn
# TODO: humor-sans # TODO: humor-sans
]; ];
computerVisionTooling = [ computerVisionTooling = [
@ -221,14 +221,14 @@ in
++ desktopApps ++ desktopApps
++ latexApps ++ latexApps
++ pythonApps ++ pythonApps
++ graphicsApps ++ graphicsApps
++ cliApps ++ cliApps
++ multimediaApps ++ multimediaApps
++ devTools ++ devTools
++ kdeTools ++ kdeTools
++ fonts ++ fonts
++ nixHelpers ++ nixHelpers
++ computerVisionTooling ++ computerVisionTooling
); );
programs.home-manager.enable = true; programs.home-manager.enable = true;
@ -237,8 +237,8 @@ in
programs.direnv = programs.direnv =
{ enable = true; { enable = true;
enableZshIntegration = true; enableZshIntegration = true;
}; };
# programs.vim = # programs.vim =
# { enable = true; # { enable = true;
@ -246,6 +246,6 @@ in
services.gpg-agent = services.gpg-agent =
{ enable = true; { enable = true;
enableSshSupport = true; enableSshSupport = true;
}; };
} }

View file

@ -37,17 +37,17 @@ in {
services.fstrim.enable = true; services.fstrim.enable = true;
services.btrfs.autoScrub = services.btrfs.autoScrub =
{ enable = true; { enable = true;
fileSystems = [ "/" "/home" ]; fileSystems = [ "/" "/home" ];
}; };
# exfat support # exfat support
#boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; #boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
zramSwap = zramSwap =
{ enable = true; { enable = true;
memoryPercent = 20; memoryPercent = 20;
}; };
boot.kernel.sysctl."vm.swappiness" = 9; boot.kernel.sysctl."vm.swappiness" = 9;
# powermanagement # powermanagement
@ -158,8 +158,8 @@ in {
services.psd = services.psd =
{ enable = true; { enable = true;
users = ["spiollinux"]; users = ["spiollinux"];
}; };
services.smartd = services.smartd =
{ enable = true; { enable = true;