From a4915785ee4d7f20b209893fd44891dfde1569ef Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 17 Apr 2017 14:01:37 +0200 Subject: Refactor --- bragi-hw.nix | 6 ++++++ bragi.nix | 6 ------ 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 @@ ]; nix.maxJobs = 2; + + boot.loader.grub.extraConfig = "serial; terminal_output.serial"; + boot.kernelParams = [ "console=ttyS0,115200" + ]; + + nixpkgs.system = "i686-linux"; } diff --git a/bragi.nix b/bragi.nix index e2e23ab8..a79428cc 100644 --- a/bragi.nix +++ b/bragi.nix @@ -15,10 +15,6 @@ in rec { boot.loader.grub.enable = true; boot.loader.grub.version = 2; - boot.loader.grub.extraConfig = "serial; terminal_output.serial"; - boot.kernelParams = [ "console=ttyS0,115200" - ]; - boot.kernelModules = [ "usblp" ]; boot.tmpOnTmpfs = true; @@ -27,8 +23,6 @@ in rec { networking.hostId = "2af11085"; networking.wireless.enable = true; - nixpkgs.system = "i686-linux"; - nixpkgs.config.packageOverrides = pkgs: rec { haskellPackages = pkgs.recurseIntoAttrs ( -- cgit v1.2.3