about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-06-22 01:45:51 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-06-22 02:05:33 +0200
commita911f4231c6c0a4c7d7621873ae452a37d12faf4 (patch)
treef5edd606ebcf90096e8b53b3aea79c46cd41c912
parentfc432e46a22494e1cafb53b0555da92301815921 (diff)
devhell: Move users_dev.nix into base profile
IMHO this module is really too small to factor it out into its own
profile module, so I'm putting it into the base profile as it's really
common among all of devhell's machines.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
-rw-r--r--devhell/users/users_dev.nix10
-rw-r--r--modules/user/devhell/profiles/base.nix7
2 files changed, 7 insertions, 10 deletions
diff --git a/devhell/users/users_dev.nix b/devhell/users/users_dev.nix
deleted file mode 100644
index 41649ae0..00000000
--- a/devhell/users/users_dev.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  users.extraUsers.dev = {
-    isNormalUser = true;
-    extraGroups = [ "vboxusers" "wheel" "mpd" "networkmanager" "libvirtd" ];
-    uid = 1000;
-    shell = "${pkgs.zsh}/bin/zsh";
-  };
-}
diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix
index 6f55a79d..123da3ef 100644
--- a/modules/user/devhell/profiles/base.nix
+++ b/modules/user/devhell/profiles/base.nix
@@ -46,6 +46,13 @@ in {
 
     networking.firewall.enable = false;
 
+    users.users.dev = {
+      isNormalUser = true;
+      extraGroups = [ "vboxusers" "wheel" "mpd" "networkmanager" "libvirtd" ];
+      uid = 1000;
+      shell = "${pkgs.zsh}/bin/zsh";
+    };
+
     programs = {
       ssh = {
         startAgent = false;