summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-04-17 14:01:37 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2017-04-17 14:01:37 +0200
commita4915785ee4d7f20b209893fd44891dfde1569ef (patch)
tree2d77111f02ac82f35f23d244bbae83a07dda963f
parentb7a3839b268268306f411247b4d78a7afe7756a9 (diff)
downloadnixos-a4915785ee4d7f20b209893fd44891dfde1569ef.tar
nixos-a4915785ee4d7f20b209893fd44891dfde1569ef.tar.gz
nixos-a4915785ee4d7f20b209893fd44891dfde1569ef.tar.bz2
nixos-a4915785ee4d7f20b209893fd44891dfde1569ef.tar.xz
nixos-a4915785ee4d7f20b209893fd44891dfde1569ef.zip
Refactor
-rw-r--r--bragi-hw.nix6
-rw-r--r--bragi.nix6
2 files changed, 6 insertions, 6 deletions
diff --git a/bragi-hw.nix b/bragi-hw.nix
index ab424091..f355ffa0 100644
--- a/bragi-hw.nix
+++ b/bragi-hw.nix
@@ -25,4 +25,10 @@
25 ]; 25 ];
26 26
27 nix.maxJobs = 2; 27 nix.maxJobs = 2;
28
29 boot.loader.grub.extraConfig = "serial; terminal_output.serial";
30 boot.kernelParams = [ "console=ttyS0,115200"
31 ];
32
33 nixpkgs.system = "i686-linux";
28} 34}
diff --git a/bragi.nix b/bragi.nix
index e2e23ab8..a79428cc 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -15,10 +15,6 @@ in rec {
15 boot.loader.grub.enable = true; 15 boot.loader.grub.enable = true;
16 boot.loader.grub.version = 2; 16 boot.loader.grub.version = 2;
17 17
18 boot.loader.grub.extraConfig = "serial; terminal_output.serial";
19 boot.kernelParams = [ "console=ttyS0,115200"
20 ];
21
22 boot.kernelModules = [ "usblp" ]; 18 boot.kernelModules = [ "usblp" ];
23 19
24 boot.tmpOnTmpfs = true; 20 boot.tmpOnTmpfs = true;
@@ -27,8 +23,6 @@ in rec {
27 networking.hostId = "2af11085"; 23 networking.hostId = "2af11085";
28 networking.wireless.enable = true; 24 networking.wireless.enable = true;
29 25
30 nixpkgs.system = "i686-linux";
31
32 nixpkgs.config.packageOverrides = pkgs: 26 nixpkgs.config.packageOverrides = pkgs:
33 rec { 27 rec {
34 haskellPackages = pkgs.recurseIntoAttrs ( 28 haskellPackages = pkgs.recurseIntoAttrs (