Remove dead code

5 files changed, 21 insertions, 133 deletions

diff --git a/config/pjournal.nix b/config/pjournal.nix
deleted file mode 100644
index 06e93d0..0000000
--- a/config/pjournal.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let cfg = config.services.pjournal;
-in {
-  options = {
-    services.pjournal = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-      };
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.callPackage ../pkgs/pjournal/default.nix { };
-      };
-
-      base_url = mkOption {
-        type = types.str;
-        default = "http://localhost:8080";
-      };
-
-      port = mkOption {
-        type = types.int;
-        default = 8080;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
-
-    services.postgresql = {
-      enable = true;
-      ensureDatabases = [ "pjournal" ];
-      ensureUsers = [{
-        name = "pjournal";
-        ensurePermissions = { "DATABASE pjournal" = "ALL PRIVILEGES"; };
-      }];
-    };
-
-    systemd.services.pjournal = {
-      description = "pjournal instance";
-      after = [ "multi-user.target" "postgresql.service" ];
-      wantedBy = [ "multi-user.target" ];
-      environment = { RUST_BACKTRACE = "1"; };
-      script = ''
-        # This will fail the first time. Run pjournal init to initialize
-        # the database.
-        ${cfg.package}/bin/pjournal \
-        --database-url postgres://pjournal@/pjournal \
-        --port ${toString cfg.port} \
-        --base-url ${cfg.base_url} 
-      '';
-      serviceConfig = { User = "pjournal"; };
-    };
-
-  };
-}
diff --git a/data/aliases.nix b/data/aliases.nix
index 95d8ebe..699e2c7 100644
--- a/data/aliases.nix
+++ b/data/aliases.nix
@@ -44,7 +44,11 @@ rec {
       address = ip.dragon;
       port = 11109;
     };
-    pjournal = {
+    bridge = {
+      address = ip.dragon;
+      port = 11110;
+    };
+    bridge_nightly = {
       address = ip.dragon;
       port = 11110;
     };
diff --git a/machines/x220-aji.nix b/machines/x220-aji.nix
index 6f02a42..771d1b8 100644
--- a/machines/x220-aji.nix
+++ b/machines/x220-aji.nix
@@ -6,11 +6,8 @@
     ../config/yubikey.nix
     ../config/postgresql.nix
     # ../config/ap.nix
-    ../config/pjournal.nix
   ];
 
-  services.pjournal.enable = true;
-
   services.thinkfan.enable = true;
   services.thinkfan.sensors = ''
     hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon4/temp1_input
diff --git a/modules/users.nix b/modules/users.nix
index 19726cb..ec78433 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -29,7 +29,8 @@ in {
           "hledger"
           "nginx"
         ];
-        openssh.authorizedKeys.keyFiles = [ ../data/yubikey_rsa.pub ../data/steam-deck.pub ];
+        openssh.authorizedKeys.keyFiles =
+          [ ../data/yubikey_rsa.pub ../data/steam-deck.pub ];
       };
       guest = {
         isNormalUser = true;
@@ -93,18 +94,6 @@ in {
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKhRj4eYL01OAboBynL05+YRrYeglZoagbqkGzgX2uJq kagee"
         ];
       };
-      pjournal = {
-        group = "pjournal";
-        createHome = false;
-        uid = 507;
-        isNormalUser = true;
-      };
-      pjournal_test = {
-        group = "pjournal_test";
-        createHome = false;
-        uid = 508;
-        isSystemUser = true;
-      };
       builder = lib.mkIf enableBuilder {
         isSystemUser = true;
         openssh.authorizedKeys.keys = [
@@ -127,6 +116,16 @@ in {
         home = "/var/lib/hledger-web";
         group = "hledger";
       };
+      bridge = {
+        group = "bridge";
+        createHome = false;
+        isNormalUser = true;
+      };
+      bridge_nightly = {
+        group = "bridge_nightly";
+        createHome = false;
+        isSystemUser = true;
+      };
     };
     extraGroups = {
       fcgi = {
@@ -154,11 +153,11 @@ in {
         gid = 505;
       };
       readonly = { gid = 506; };
-      pjournal = { gid = 507; };
-      pjournal_test = { gid = 508; };
+      bridge = {};
+      bridge_nightly = {};
       hledger = lib.mkIf config.orbekk.hledger-web.enable { };
-      minecraft = {};
-      builder = {};
+      minecraft = { };
+      builder = { };
     };
   };
 }
diff --git a/pkgs/pjournal/default.nix b/pkgs/pjournal/default.nix
deleted file mode 100644
index 0d49726..0000000
--- a/pkgs/pjournal/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ callPackage, fetchgit, fetchFromGitHub, makeRustPlatform, stdenv, pkgs, ... }:
-
-let mkRustPlatform = { date, channel }:
-      let
-        mozillaOverlay = fetchFromGitHub {
-            owner = "mozilla";
-            repo = "nixpkgs-mozilla";
-            rev = "5300241b41243cb8962fad284f0004afad187dad";
-            sha256 = "1h3g3817anicwa9705npssvkwhi876zijyyvv4c86qiklrkn5j9w";
-          };
-          mozilla = callPackage "${mozillaOverlay.out}/package-set.nix" {};
-          rustSpecific = (mozilla.rustChannelOf { inherit date channel; }).rust;
-      in
-        makeRustPlatform {
-          cargo = rustSpecific;
-          rustc = rustSpecific;
-        };
-in let
-  rustPlatform = mkRustPlatform {
-    date = "2020-01-15";
-    channel = "nightly";
-  };
-in rustPlatform.buildRustPackage rec {
-  pname = "pjournal";
-  version = "0.1.0";
-
-  # https://git.breakds.org/breakds/nixvital/src/branch/master/pkgs/simple-reflection-server/default.nix
-  postInstall = ''
-    mkdir $out/etc/
-    cp -r templates $out/etc
-    cp -r static $out/etc
-    wrapProgram "$out/bin/pjournal" \
-      --add-flags "--template-path $out/etc/templates" \
-      --add-flags "--static-path $out/etc/static"
-  '';
-
-  preConfigure = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  buildInputs = with pkgs; [
-    openssl pkgconfig postgresql makeWrapper
-  ];
-
-  src = fetchgit {
-    url = "https://git.orbekk.com/pjournal.git";
-    rev = "079e2067f30c099202fd51751ff966c527741b7a";
-    sha256 = "0pm8npys8z1ap7wjk85gvh1gyglrq4hah8mwyc8pqq8xqd6r666j";
-  };
-
-  cargoSha256 = "1jvsvhb5xfxdxv7wj77wniavmkm1v78ghqfrd7az84yzy3fzs2n2";
-
-  # verifyCargoDeps = true;
-}