diff options
| author | tv <tv@shackspace.de> | 2015-08-28 21:54:35 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-08-28 21:54:35 +0200 |
| commit | e5ecd75ac266a77c31790e52c2ea000574be9e22 (patch) | |
| tree | eecdc35c4a8f257d86178f6eb864c9404a2f1aa7 /lass/1systems | |
| parent | 62865ae6ae46e006cea7ee80b931fc5be27d3449 (diff) | |
| parent | ecae9b59753c13ea5bff57a6f7c44086c77844d6 (diff) | |
Merge remote-tracking branch 'uriel/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/cloudkrebs.nix | 4 | ||||
| -rw-r--r-- | lass/1systems/mors.nix | 9 | ||||
| -rw-r--r-- | lass/1systems/uriel.nix | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix index 515810e44..7c95e0f87 100644 --- a/lass/1systems/cloudkrebs.nix +++ b/lass/1systems/cloudkrebs.nix @@ -28,10 +28,6 @@ target = "root@cloudkrebs"; host = config.krebs.hosts.cloudkrebs; deps = { - nixpkgs = { - url = https://github.com/Lassulus/nixpkgs; - rev = "1879a011925c561f0a7fd4043da0768bbff41d0b"; - }; secrets = { url = "/home/lass/secrets/${config.krebs.build.host.name}"; }; diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index e7f8d5276..d07fe14d9 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -15,12 +15,13 @@ ../2configs/wine.nix ../2configs/texlive.nix ../2configs/binary-caches.nix - ../2configs/ircd.nix + #../2configs/ircd.nix ../2configs/chromium-patched.nix ../2configs/new-repos.nix #../../2configs/tv/synaptics.nix ../2configs/retiolum.nix ../2configs/wordpress.nix + ../2configs/bitlbee.nix ]; krebs.build = { @@ -28,10 +29,6 @@ target = "root@mors"; host = config.krebs.hosts.mors; deps = { - nixpkgs = { - url = https://github.com/Lassulus/nixpkgs; - rev = "961fd7b7a0f88dde7dac2f7a4c05ee4e1a25381d"; - }; secrets = { url = "/home/lass/secrets/${config.krebs.build.host.name}"; }; @@ -128,7 +125,7 @@ #VM writeback timeout echo '1500' > '/proc/sys/vm/dirty_writeback_centisecs' #Autosuspend for USB device Broadcom Bluetooth Device [Broadcom Corp] - echo 'auto' > '/sys/bus/usb/devices/1-1.4/power/control' + #echo 'auto' > '/sys/bus/usb/devices/1-1.4/power/control' #Autosuspend for USB device Biometric Coprocessor echo 'auto' > '/sys/bus/usb/devices/1-1.3/power/control' diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index 041b891b6..7c3d08123 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -28,10 +28,6 @@ with builtins; target = "root@uriel"; host = config.krebs.hosts.uriel; deps = { - nixpkgs = { - url = https://github.com/Lassulus/nixpkgs; - rev = "961fcbabd7643171ea74bd550fee1ce5c13c2e90"; - }; secrets = { url = "/home/lass/secrets/${config.krebs.build.host.name}"; }; |