From eba4867b84655a296032aaf11320a78654375856 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien.malka@me.com>
Date: Wed, 22 Dec 2021 11:54:06 +0100
Subject: [PATCH] Playing a little bit too much with users

---
 base.nix                       |  1 +
 machines/macintosh/default.nix |  3 ++-
 users/default.nix              | 20 ++++++++++++++++++++
 users/julien.nix               |  5 +++--
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 users/default.nix

diff --git a/base.nix b/base.nix
index a290ce6..0a51251 100644
--- a/base.nix
+++ b/base.nix
@@ -3,6 +3,7 @@
 {
 
   imports = [ 
+    ./users/default.nix
     ./users/julien.nix 
   ];
   luj.nix.enable = true;
diff --git a/machines/macintosh/default.nix b/machines/macintosh/default.nix
index bcde40f..74f5722 100644
--- a/machines/macintosh/default.nix
+++ b/machines/macintosh/default.nix
@@ -57,9 +57,10 @@
     git
     rxvt_unicode
     xorg.xbacklight
+    neovim
   ];
 
-  environment.variables.EDITOR = "urxvt";
+  environment.variables.EDITOR = "nvim";
 
   programs.dconf.enable = true;
 
diff --git a/users/default.nix b/users/default.nix
new file mode 100644
index 0000000..8a97653
--- /dev/null
+++ b/users/default.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }: {
+
+
+  users.mutableUsers = false;
+  users.defaultUserShell = pkgs.fish;
+  sops.secrets.user-root-password.neededForUsers = true;
+
+  programs.fish.enable = true;
+
+users.users.root = {
+        uid = config.ids.uids.root;
+        description = "System administrator";
+        home = "/root";
+        shell = lib.mkForce config.users.defaultUserShell;
+        group = "root";
+        passwordFile = config.sops.secrets.user-root-password.path;
+      };
+
+
+}
diff --git a/users/julien.nix b/users/julien.nix
index 35021a0..677e140 100644
--- a/users/julien.nix
+++ b/users/julien.nix
@@ -1,9 +1,9 @@
 { config, pkgs, lib, ... }: {
 
 
-  users.mutableUsers = false;
   sops.secrets.user-julien-password.neededForUsers = true;
 
+
   users.users.julien = {
     isNormalUser = true;
     home = "/home/julien";
@@ -18,5 +18,6 @@
     ];
   };
 
-  nix.allowedUsers = [ "lol" "julien" ];
+
+  nix.allowedUsers = [ "julien" ];
 }