From fa7ed95114d1470d8b19622368ad72a3e5472bbf Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 5 Dec 2022 20:23:12 -0700
Subject: [PATCH] flake,h: switch from startpage to gostart

---
 flake.nix                | 19 ++++++++++---------
 hosts/europa/default.nix |  1 -
 hosts/h/default.nix      |  8 ++++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6346c60..e1dbb9b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,8 +35,8 @@
       url = "github:qbit/microca";
       inputs.nixpkgs.follows = "unstable";
     };
-    startpage = {
-      url = "github:qbit/startpage";
+    gostart = {
+      url = "github:qbit/gostart";
       inputs.nixpkgs.follows = "unstable";
     };
     taskobs = {
@@ -69,7 +69,7 @@
   };
 
   outputs = { self, unstable, unstableSmall, stable, oldStable, nixos-hardware
-    , reform, sshKnownHosts, microca, startpage, xintray, tsvnstat, taskobs
+    , reform, sshKnownHosts, microca, gostart, xintray, tsvnstat, taskobs
     , mcchunkie, gqrss, darwin, xin-secrets, peerix, ... }@inputs:
     let
       supportedSystems =
@@ -95,7 +95,7 @@
         inputs.microca.overlay
         inputs.taskobs.overlay
         inputs.reform.overlay
-        inputs.startpage.overlay
+        inputs.gostart.overlay
       ];
 
       # Set our configurationRevison based on the status of our git repo.
@@ -163,10 +163,8 @@
       devShells.aarch64-darwin.default = buildShell darwinPkgs;
 
       nixosConfigurations = {
-        europa = buildSys "x86_64-linux" unstable [
-          nixos-hardware.nixosModules.framework
-          startpage.nixosModule
-        ] "europa";
+        europa = buildSys "x86_64-linux" unstable
+          [ nixos-hardware.nixosModules.framework ] "europa";
         stan = buildSys "x86_64-linux" unstable [ ] "stan";
         weather = buildSys "aarch64-linux" stable
           [ nixos-hardware.nixosModules.raspberry-pi-4 ] "weather";
@@ -175,7 +173,10 @@
         box = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "box";
         luna = buildSys "x86_64-linux" stable
           [ "${nixos-hardware}/common/cpu/intel" ] "luna";
-        h = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "h";
+        h = buildSys "x86_64-linux" stable [
+          ./configs/hardened.nix
+          gostart.nixosModule
+        ] "h";
         router =
           buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "router";
 
diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix
index a542644..d114fbf 100644
--- a/hosts/europa/default.nix
+++ b/hosts/europa/default.nix
@@ -103,7 +103,6 @@ in {
   programs.steam.enable = true;
 
   services = {
-    startpage.enable = false;
     vnstat.enable = true;
     clamav.updater.enable = true;
     emacs = {
diff --git a/hosts/h/default.nix b/hosts/h/default.nix
index bc4e7b8..aa1fe06 100644
--- a/hosts/h/default.nix
+++ b/hosts/h/default.nix
@@ -88,6 +88,10 @@ in {
       sopsFile = config.xin-secrets.h.services;
       owner = config.users.users.golink.name;
     };
+    gostart = {
+      sopsFile = config.xin-secrets.h.services;
+      owner = config.users.users.gostart.name;
+    };
     wireguard_private_key = { sopsFile = config.xin-secrets.h.services; };
   };
 
@@ -192,6 +196,10 @@ in {
   };
 
   services = {
+    gostart = {
+      enable = true;
+      keyPath = "${config.sops.secrets.gostart.path}";
+    };
     golink = {
       enable = true;
       keyFile = "${config.sops.secrets.golink.path}";