From 29a13e0149205e615b6c6db75b280af310981b56 Mon Sep 17 00:00:00 2001
From: David Crompton <david.crompton@mail.utoronto.ca>
Date: Wed, 24 Apr 2024 09:42:07 -0400
Subject: [PATCH] Users: Add Josh & Groups: NFRF Add Josh

---
 machines/kcnhub/packages/containers.nix |  8 +++++++-
 machines/kcnhub/packages/python.nix     |  1 +
 machines/kcnhub/servers/overleaf.nix    |  3 ++-
 machines/kcnhub/users.nix               |  1 +
 machines/kcnhub/users/groups/nfrf.nix   |  1 +
 machines/kcnhub/users/josh.nix          | 11 +++++++++++
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 machines/kcnhub/users/josh.nix

diff --git a/machines/kcnhub/packages/containers.nix b/machines/kcnhub/packages/containers.nix
index cdef6d0..ccd7cb2 100644
--- a/machines/kcnhub/packages/containers.nix
+++ b/machines/kcnhub/packages/containers.nix
@@ -2,8 +2,14 @@
   virtualisation = {
     podman = {
       enable = true;
-      dockerCompat = true;
     };
+    docker.rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+    # For compatability, and for some reason this isn't able to be per
+    # container?
+    oci-containers.backend = "docker";
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/machines/kcnhub/packages/python.nix b/machines/kcnhub/packages/python.nix
index 60cbaef..d18088c 100644
--- a/machines/kcnhub/packages/python.nix
+++ b/machines/kcnhub/packages/python.nix
@@ -7,6 +7,7 @@
       matplotlib
       tqdm
       seaborn
+      neuronpy
     ]))
   ];
 }
diff --git a/machines/kcnhub/servers/overleaf.nix b/machines/kcnhub/servers/overleaf.nix
index 8234b14..ddb5bef 100644
--- a/machines/kcnhub/servers/overleaf.nix
+++ b/machines/kcnhub/servers/overleaf.nix
@@ -9,10 +9,11 @@ in {
       # "Normal" User: for Podman Usage
       isNormalUser = true;
       home = stateDir;
+      linger = true;
     };
     groups.overleaf = {};
   };
-  
+
   services.caddy.virtualHosts = {
     "overleaf.ws.kcnhub.com" = {
       extraConfig = ''
diff --git a/machines/kcnhub/users.nix b/machines/kcnhub/users.nix
index 9a4eda0..12e7337 100644
--- a/machines/kcnhub/users.nix
+++ b/machines/kcnhub/users.nix
@@ -16,6 +16,7 @@
     ./users/reza.nix
     ./users/michael.nix
     ./users/ryan.nix
+    ./users/josh.nix
 
     # Groups
     ./users/groups/admin.nix
diff --git a/machines/kcnhub/users/groups/nfrf.nix b/machines/kcnhub/users/groups/nfrf.nix
index 767177a..543736f 100644
--- a/machines/kcnhub/users/groups/nfrf.nix
+++ b/machines/kcnhub/users/groups/nfrf.nix
@@ -4,6 +4,7 @@
       "spandan"
       "frances"
       "nooshin"
+      "josh"
     ];
   };
 }
diff --git a/machines/kcnhub/users/josh.nix b/machines/kcnhub/users/josh.nix
new file mode 100644
index 0000000..98474d9
--- /dev/null
+++ b/machines/kcnhub/users/josh.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  users.users.josh = {
+    isNormalUser = true;
+    extraGroups = [ ];
+    homeSize = "50g";
+    homeProjectId = 117;
+    packages = with pkgs; [
+
+    ];
+  };
+}