schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

formatting with nixpkgs-fmt

Browse source
This commit is contained in:
Trolli Schmittlauch 2020-02-16 21:58:51 +01:00
parent aac13c2919
commit 6f0a899f7e
2 changed files with 83 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
home/overlays.nix
View file

@ -1,46 +1,48 @@
let
unstable = (import <nixos-unstable> {overlays = [ seaf-overlay ]; }).pkgs;
unstable = (import <nixos-unstable> { overlays = [ seaf-overlay ]; }).pkgs;
seaf-overlay = (import ./ov/seafile-overlay);
in
[(self: super:
rec {
seafile-server = unstable.seafile-server;
amarok = super.libsForQt5.callPackage ./ov/amarok.nix {};
#stapler = super.python2.callPackage ./ov/stapler.nix {};
myVim = with super; (vim_configurable.override {python = python3;}).customize {
# executable/ package name
name = "vim";
vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
# loaded on start
start = [
ale
LanguageClient-neovim
ctrlp
#deoplete-jedi
direnv-vim
fugitive
jedi-vim
nerdtree
nerdtree-git-plugin
supertab
vim-pandoc
vim-pandoc-syntax
vim-nix
vim-jinja
];
};
vimrcConfig.customRC =
''if filereadable($HOME . "/.vimrc")
[
(
self: super:
rec {
seafile-server = unstable.seafile-server;
amarok = super.libsForQt5.callPackage ./ov/amarok.nix {};
#stapler = super.python2.callPackage ./ov/stapler.nix {};
myVim = with super; (vim_configurable.override { python = python3; }).customize {
# executable/ package name
name = "vim";
vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
# loaded on start
start = [
ale
LanguageClient-neovim
ctrlp
#deoplete-jedi
direnv-vim
fugitive
jedi-vim
nerdtree
nerdtree-git-plugin
supertab
vim-pandoc
vim-pandoc-syntax
vim-nix
vim-jinja
];
};
vimrcConfig.customRC =
''if filereadable($HOME . "/.vimrc")
source ~/.vimrc
endif
'';
};
# build with debug symbols and in debug mode (less optimized)
opencvDebug = with super; enableDebugging ((opencv3.override {enablePython=true; enableGtk3=true; enableDocs=true; pythonPackages=pkgs.python3Packages; }).overrideAttrs (oldAttrs: rec {cmakeBuildType = "Debug";}));
#gnutls = super.callPackage ./ov/gnutls {inherit (super.darwin.apple_sdk.frameworks) Security;};
}
)
};
# build with debug symbols and in debug mode (less optimized)
opencvDebug = with super; enableDebugging ((opencv3.override { enablePython = true; enableGtk3 = true; enableDocs = true; pythonPackages = pkgs.python3Packages; }).overrideAttrs (oldAttrs: rec { cmakeBuildType = "Debug"; }));
#gnutls = super.callPackage ./ov/gnutls {inherit (super.darwin.apple_sdk.frameworks) Security;};
}
)
]

70
nixos/configuration.nix
View file

@ -8,25 +8,31 @@ let
fsOptions = [ "noatime" "ssd" "space_cache" "compress=zstd" ];
unstable = import <nixos-unstable> {};
in {
in
{
imports =
[ # Include the results of the hardware scan.
[
# Include the results of the hardware scan.
./hardware-configuration.nix
./packages.nix
(builtins.fetchGit {
url = "https://github.com/NixOS/nixos-hardware";
rev = "c0182a06982f82a47356c91d78d80d2af29bd7f1";
} + "/lenovo/thinkpad/t440s")
(
builtins.fetchGit {
url = "https://github.com/NixOS/nixos-hardware";
rev = "c0182a06982f82a47356c91d78d80d2af29bd7f1";
} + "/lenovo/thinkpad/t440s"
)
# home manager integration
<home-manager/nixos>
];
# encrypted partitions
boot.initrd.luks =
{ devices =
{ "system".device = "/dev/disk/by-uuid/85154131-b2a8-4ef5-9d74-47429cb267ef";
"cryptswap".device = "/dev/disk/by-uuid/ac586df6-6332-4809-beb1-f51906a2adaa";
};
{
devices =
{
"system".device = "/dev/disk/by-uuid/85154131-b2a8-4ef5-9d74-47429cb267ef";
"cryptswap".device = "/dev/disk/by-uuid/ac586df6-6332-4809-beb1-f51906a2adaa";
};
reusePassphrases = true;
};
@ -38,11 +44,12 @@ in {
services.davfs2.enable = true;
# try newer kernels
#boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelPackages = pkgs.linuxPackages_latest;
services.fstrim.enable = true;
services.btrfs.autoScrub =
{ enable = true;
{
enable = true;
fileSystems = [ "/" "/home" ];
};
@ -50,17 +57,19 @@ in {
#boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
zramSwap =
{ enable = true;
{
enable = true;
memoryPercent = 20;
};
boot.kernel.sysctl."vm.swappiness" = 9;
# powermanagement
services.tlp =
{ enable = true;
{
enable = true;
extraConfig = ''
SATA_LINKPWR_ON_BAT=medium_power
SATA_LINKPWR_ON_AC=max_performance
SATA_LINKPWR_ON_BAT=medium_power
SATA_LINKPWR_ON_AC=max_performance
'';
};
@ -110,7 +119,8 @@ in {
# Enable CUPS to print documents.
services.printing =
{ enable = true;
{
enable = true;
drivers = [ pkgs.hplip ];
};
# scanners
@ -128,7 +138,7 @@ in {
sound.enable = true;
hardware.pulseaudio.enable = true;
# decouple pulseaudio application and sink volumes
hardware.pulseaudio.daemon.config = {flat-volumes = "no";};
hardware.pulseaudio.daemon.config = { flat-volumes = "no"; };
# Bluetooth
hardware.bluetooth = {
@ -154,12 +164,6 @@ in {
# Flatpak support
services.flatpak.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
# nixpkgs.config.packageOverrides = pkgs:
# {
# flatpak = unstable.flatpak;
# flatpak-builder = unstable.flatpak-builder;
# ostree = unstable.ostree;
# };
# Define a user account. Don't forget to set a password with ‘passwd’.
users.extraUsers.spiollinux = {
@ -181,25 +185,27 @@ in {
permissions = "u+xs,g+x";
owner = "root";
group = "wireshark";
};
};
programs.zsh =
{ enable = true;
{
enable = true;
autosuggestions.enable = true;
};
services.psd.enable = true;
services.smartd =
{ enable = true;
devices = [ { device = "/dev/sda"; } { device = "/dev/sdb"; } ];
{
enable = true;
devices = [ { device = "/dev/sda"; } { device = "/dev/sdb"; } ];
};
fonts = {
enableFontDir = true;
fontconfig.enable = true;
};
fonts = {
enableFontDir = true;
fontconfig.enable = true;
};
# fix nix-env memory issues
boot.kernel.sysctl."vm.overcommit_memory" = "1";