Enable jupyter, consolidate ports, open bitcoind

1 files changed, 12 insertions, 18 deletions

diff --git a/Biz/Dev/Configuration.nix b/Biz/Dev/Configuration.nix
index ecc9a46..fcd55b7 100644
--- a/Biz/Dev/Configuration.nix
+++ b/Biz/Dev/Configuration.nix
@@ -1,19 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  ports = {
-    murmur = 64738;
-    torrents = { from = 3000; to = 3099; };
-    delugeWeb = 8112;
-    jellyfin = 8096;
-    httpdev = { from = 8000; to = 8099; };
-    devallocHost = 8095;
-    hoogle = 8008;
-    mpd = 6600;
-    mpd-stream = 8097;
-    tor = 143;
-    et = 2022;
-  };
+  ports = import ../Cloud/Ports.nix;
 in {
   networking = {
     nameservers = [ "1.1.1.1" "8.8.8.8" ];
@@ -33,6 +21,8 @@ in {
         ports.mpd-stream
         ports.tor
         ports.et
+        ports.bitcoind
+        ports.jupyter
       ];
       allowedTCPPortRanges = [
         ports.torrents
@@ -220,10 +210,10 @@ in {
     };
 
     jupyter = {
-      enable = false;
-      port = 3099;
+      enable = true;
+      port = ports.jupyter;
       ip = "*";
-      password = "'sha1:4b14a407cabe:fbab8e5400f3f4f3ffbdb00e996190d6a84bf51e'";
+      password = "'argon2:$argon2id$v=19$m=10240,t=10,p=8$nvQhgk+htbIYi961YYAf1w$ekpwiTT5L4+OAods0K7EDw'";
       kernels = {
         python3 = let
           env = (pkgs.python3.withPackages (p: with p; [
@@ -239,8 +229,9 @@ in {
             "{connection_file}"
           ];
           language = "python";
-          #logo32 = "${env.sitePackages}/lib/python3.6/site-packages/ipykernel/resources/logo-32x32.png";
-          #logo64 = "${env.sitePackages}/lib/python3.6/site-packages/ipykernel/resources/logo-64x64.png";
+          # error: must be of type 'null or path'
+          #logo32 = "${env.sitePackages}/ipykernel/resources/logo-32x32.png";
+          #logo64 = "${env.sitePackages}/ipykernel/resources/logo-64x64.png";
         };
       };
     };
@@ -314,4 +305,7 @@ in {
   # servers. You should change this only after NixOS release notes say you
   # should.
   system.stateVersion = "20.09"; # Did you read the comment?
+
+  # TODO: upstream this
+  users.users.jupyter.isSystemUser = true;
 }