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
];
};
vimrcConfig.customRC =
vimrcConfig.customRC =
''if filereadable($HOME . "/.vimrc")
source ~/.vimrc
endif
'';
'';
};
# 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";}));

View file

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

View file

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