From 131df3a3376445da5b05a02e3f954dfc74471f2d Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Thu, 18 Jun 2020 16:17:42 +0200
Subject: [PATCH] nixops: set astro's shell to bashInteractive

I hope this is lighter than `programs.zsh.enable = true;`
---
 nixbld-etc-nixos/configuration.nix | 1 +
 nixops/common-users.nix            | 3 +++
 nixops/desktop.nix                 | 2 +-
 nixops/light.nix                   | 2 +-
 nixops/rpi.nix                     | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 3cbcaf4..73217cb 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -230,6 +230,7 @@ in
   users.extraUsers.astro = {
     isNormalUser = true;
     extraGroups = ["plugdev" "dialout"];
+    shell = pkgs.bashInteractive;
   };
   users.extraUsers.nix = {
     isNormalUser = true;
diff --git a/nixops/common-users.nix b/nixops/common-users.nix
index e6aee9d..4341c9a 100644
--- a/nixops/common-users.nix
+++ b/nixops/common-users.nix
@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   sb = {
     isNormalUser = true;
@@ -30,6 +32,7 @@
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGJJTSJdpDh82486uPiMhhyhnci4tScp5uUe7156MBC8 a"
     ];
+    shell = pkgs.bashInteractive;
   };
   pca006132 = {
     isNormalUser = true;
diff --git a/nixops/desktop.nix b/nixops/desktop.nix
index f420c43..5e46bcd 100644
--- a/nixops/desktop.nix
+++ b/nixops/desktop.nix
@@ -114,7 +114,7 @@ in
   users.mutableUsers = false;
   users.defaultUserShell = pkgs.fish;
   users.extraGroups.plugdev = { };
-  users.extraUsers = (import ./common-users.nix);
+  users.extraUsers = import ./common-users.nix { inherit pkgs; };
   security.sudo.wheelNeedsPassword = false;
   services.udev.packages = [ m-labs.openocd ];
   services.udev.extraRules = ''
diff --git a/nixops/light.nix b/nixops/light.nix
index 987d3d0..cfa0e8e 100644
--- a/nixops/light.nix
+++ b/nixops/light.nix
@@ -96,7 +96,7 @@
   users.mutableUsers = false;
   users.defaultUserShell = pkgs.fish;
   users.extraGroups.plugdev = { };
-  users.extraUsers = (import ./common-users.nix);
+  users.extraUsers = import ./common-users.nix { inherit pkgs; };
   
   security.sudo.wheelNeedsPassword = false;
 
diff --git a/nixops/rpi.nix b/nixops/rpi.nix
index bd2d904..b96bbc0 100644
--- a/nixops/rpi.nix
+++ b/nixops/rpi.nix
@@ -42,7 +42,7 @@ in
   users.extraGroups.plugdev = { };
   users.mutableUsers = false;
   users.defaultUserShell = pkgs.fish;
-  users.extraUsers = (import ./common-users.nix) // {
+  users.extraUsers = (import ./common-users.nix { inherit pkgs; }) // {
     nix = {
       isNormalUser = true;
     };