Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2017-01-16 16:31:07 +01:00
commit c4bd028470
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/default.nix
View File

@ -201,7 +201,7 @@ let
}) })
// //
# GitHub's IPv4 address range is 192.30.252.0/22 # GitHub's IPv4 address range is 192.30.252.0/22
# Refs https://help.github.com/articles/what-ip-addresses-does-github-use-that-i-should-whitelist/ # Refs https://help.github.com/articles/github-s-ip-addresses/
# 192.30.252.0/22 = 192.30.252.0-192.30.255.255 (1024 addresses) # 192.30.252.0/22 = 192.30.252.0-192.30.255.255 (1024 addresses)
# Because line length is limited by OPENSSH_LINE_MAX (= 8192), # Because line length is limited by OPENSSH_LINE_MAX (= 8192),
# we split each /24 into its own entry. # we split each /24 into its own entry.

15
tv/1systems/wu.nix
View File

@ -23,7 +23,6 @@ with import <stockholm/lib>;
# stockholm # stockholm
gnumake gnumake
hashPassword hashPassword
haskellPackages.lentil
parallel parallel
# root # root
@ -47,7 +46,6 @@ with import <stockholm/lib>;
p7zip p7zip
push push
qrencode qrencode
texLive
tmux tmux
#ack #ack
@ -116,18 +114,23 @@ with import <stockholm/lib>;
boot.initrd.luks = { boot.initrd.luks = {
cryptoModules = [ "aes" "sha512" "xts" ]; cryptoModules = [ "aes" "sha512" "xts" ];
devices = [ devices = [
{ name = "home"; device = "/dev/vg840/enchome"; preLVM = false; } { name = "wuca"; device = "/dev/sda2"; }
]; ];
}; };
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/mapper/vg840-wuroot"; device = "/dev/mapper/wuvga-root";
fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"];
};
"/bku" = {
device = "/dev/mapper/wuvga-bku";
fsType = "btrfs"; fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"]; options = ["defaults" "noatime" "ssd" "compress=lzo"];
}; };
"/home" = { "/home" = {
device = "/dev/mapper/home"; device = "/dev/mapper/wuvga-home";
fsType = "btrfs"; fsType = "btrfs";
options = ["defaults" "noatime" "ssd" "compress=lzo"]; options = ["defaults" "noatime" "ssd" "compress=lzo"];
}; };
@ -174,5 +177,5 @@ with import <stockholm/lib>;
KERNEL=="hpet", GROUP="audio" KERNEL=="hpet", GROUP="audio"
''; '';
services.virtualboxHost.enable = true; virtualisation.virtualbox.host.enable = true;
} }

8
tv/2configs/hw/w110er.nix
View File

@ -12,9 +12,11 @@
boot.initrd.availableKernelModules = [ "ahci" ]; boot.initrd.availableKernelModules = [ "ahci" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.loader.gummiboot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
networking.wireless.enable = true; networking.wireless.enable = true;
nix = { nix = {
@ -31,10 +33,6 @@
HandleSuspendKey=ignore HandleSuspendKey=ignore
''; '';
services.xserver = {
vaapiDrivers = [ pkgs.vaapiIntel ];
};
system.activationScripts.powertopTunables = '' system.activationScripts.powertopTunables = ''
echo 1 > /sys/module/snd_hda_intel/parameters/power_save echo 1 > /sys/module/snd_hda_intel/parameters/power_save
echo 1500 > /proc/sys/vm/dirty_writeback_centisecs echo 1500 > /proc/sys/vm/dirty_writeback_centisecs

2
tv/2configs/urlwatch.nix
View File

@ -47,7 +47,7 @@ with import <stockholm/lib>;
#http://hackage.haskell.org/package/web-page #http://hackage.haskell.org/package/web-page
# ref <stockholm/krebs/3modules>, services.openssh.knownHosts.github* # ref <stockholm/krebs/3modules>, services.openssh.knownHosts.github*
https://help.github.com/articles/what-ip-addresses-does-github-use-that-i-should-whitelist/ https://help.github.com/articles/github-s-ip-addresses/
# <stockholm/tv/2configs/xserver/xserver.conf.nix> # <stockholm/tv/2configs/xserver/xserver.conf.nix>
# is derived from `configFile` in: # is derived from `configFile` in: