Pjournal stuff

2 files changed, 10 insertions, 12 deletions

diff --git a/config/desktop.nix b/config/desktop.nix
index f06ec4f..6b26b07 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -20,8 +20,10 @@
     };
   };
 
+  console.earlySetup = true;
+  console.keyMap = "dvorak";
+
   boot = {
-    earlyVconsoleSetup = true;
 
     loader = {
       systemd-boot.enable = true;
@@ -67,7 +69,7 @@
     xserver = {
       enable = true;
       layout = "us";
-      xkbVariant = "dvorak";
+      # xkbVariant = "dvorak";
 
       desktopManager.mate = {
         enable = true;
@@ -81,10 +83,6 @@
 
       displayManager.lightdm = {
         enable = true;
-        # autoLogin = {
-        #   enable = true;
-	#   user = "orbekk";
-	# };
       };
 
       synaptics = {
@@ -98,10 +96,4 @@
       extraOptions = ["-r"];
     };
   };
-
-  i18n = {
-    # consoleFont = "ter-132n";
-    consoleKeyMap = "dvorak";
-    # consolePackages = [ pkgs.terminus_font ];
-  };
 }
diff --git a/config/users.nix b/config/users.nix
index fdc20cc..e54f959 100644
--- a/config/users.nix
+++ b/config/users.nix
@@ -67,6 +67,11 @@ in {
         createHome = false;
         uid = 507;
       };
+      pjournal_test = {
+        group = "pjournal_test";
+        createHome = false;
+        uid = 508;
+      };
       mpd = lib.optionalAttrs config.services.mpd.enable {
         extraGroups = ["readonly"];
       };
@@ -83,6 +88,7 @@ in {
       terraria = { name = "terraria"; gid = 505; };
       readonly = { gid = 506; };
       pjournal = { gid = 507; };
+      pjournal_test = { gid = 508; };
     };
   };
 }