From 3d8045fa8e3b646f0aa82de61cf04741fc6e374f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Wed, 22 Dec 2021 17:15:29 +0100
Subject: [PATCH] feat: remove obelisk

---
 flake.nix      | 19 +++----------------
 system/nix.nix |  7 +------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/flake.nix b/flake.nix
index 50967b8..0d14158 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,11 +18,6 @@
     inputs.flake-utils.follows = "flake-utils";
   };
 
-  inputs.obelisk = {
-    url = "github:obsidiansystems/obelisk";
-    flake = false;
-  };
-
   inputs.photoprism2nix = {
     url = "github:GTrunSec/photoprism2nix";
     inputs.nixpkgs.follows = "nixpkgs";
@@ -51,7 +46,7 @@
   };
 
   outputs = { self, nixpkgs, nixos-hardware, flake-utils, home-manager, nur
-    , neovim, obelisk, photoprism2nix, pre-commit-hooks, nvim-ts-autotag
+    , neovim, photoprism2nix, pre-commit-hooks, nvim-ts-autotag
     , nvim-ts-context-commentstring, nvim-lspfuzzy }@inputs:
     let
       overlays = {
@@ -78,9 +73,6 @@
         deconz = self: super: {
           deconz = self.qt5.callPackage ./pkgs/deconz { };
         };
-        obelisk = self: super: {
-          obelisk = (import obelisk { inherit (self) system; }).command;
-        };
         # custom overlay so it's using the flake's nixpkgs
         photoprism = self: super: {
           photoprism = photoprism2nix.defaultPackage.${self.system};
@@ -90,13 +82,8 @@
       homeManagerModules = { git = import ./home/modules/git.nix; };
       systemDefaults = {
         modules = [ nixosModules.flakeDefaults ];
-        overlays = [
-          nur.overlay
-          overlays.neovim
-          overlays.deconz
-          overlays.photoprism
-          overlays.obelisk
-        ];
+        overlays =
+          [ nur.overlay overlays.neovim overlays.deconz overlays.photoprism ];
       };
       lib = rec {
         createSystem = hostName:
diff --git a/system/nix.nix b/system/nix.nix
index ac8d6e4..e714ca3 100644
--- a/system/nix.nix
+++ b/system/nix.nix
@@ -8,14 +8,9 @@
     options = "--delete-older-than 30d";
   };
 
-  nix.binaryCaches = [
-    "https://hydra.iohk.io"
-    "https://nixcache.reflex-frp.org"
-    "https://shajra.cachix.org"
-  ];
+  nix.binaryCaches = [ "https://hydra.iohk.io" "https://shajra.cachix.org" ];
   nix.binaryCachePublicKeys = [
     "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
-    "ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI="
     "shajra.cachix.org-1:V0x7Wjgd/mHGk2KQwzXv8iydfIgLupbnZKLSQt5hh9o="
   ];
 }