summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Ørbekk <kj@orbekk.com>2019-07-25 12:28:03 -0400
committerKjetil Ørbekk <kj@orbekk.com>2019-07-25 12:28:06 -0400
commit5b26cad95fa9233d510bb58b56f957e486055982 (patch)
tree9acdda4a1c5b968c5aab9cfc42685a8a75d59118
parent0e26d90cac07549fea9e0dd08f331b1b50d49f82 (diff)
fix grub serial configuration on dragon
-rw-r--r--config/weechat.nix14
-rw-r--r--machines/dragon.nix3
2 files changed, 10 insertions, 7 deletions
diff --git a/config/weechat.nix b/config/weechat.nix
index e75224c..d90272c 100644
--- a/config/weechat.nix
+++ b/config/weechat.nix
@@ -1,12 +1,12 @@
{ config, pkgs, ... }:
{
- nixpkgs.config.packageOverrides = pkgs: {
- weechat = pkgs.weechat.override {
- extraBuildInputs = with pkgs; [
- pythonPackages.potr
- ];
- };
- };
+ # nixpkgs.config.packageOverrides = pkgs: {
+ # weechat = pkgs.weechat.override {
+ # extraBuildInputs = with pkgs; [
+ # pythonPackages.potr
+ # ];
+ # };
+ # };
systemd.services = {
weechat = {
diff --git a/machines/dragon.nix b/machines/dragon.nix
index 9d0a03c..3c3520c 100644
--- a/machines/dragon.nix
+++ b/machines/dragon.nix
@@ -87,6 +87,9 @@
loader.grub.extraConfig = ''
GRUB_TERMINAL="serial"
GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
+ serial --speed 115200 --unit=0
+ terminal_input serial
+ terminal_output serial
'';
loader.grub.enable = true;
loader.grub.version = 2;