From 8374dc285e057622859ce4168e28277c854974b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Sun, 8 Oct 2023 20:38:14 +0200
Subject: [PATCH] Remove peerix

I'm not using it anyway, it keeps causing build issues and the peerix
repo hasn't seen any commits since 2022.
---
 flake.lock                   | 54 ------------------------------------
 flake.nix                    |  4 ---
 keys/peerix/yui.pub          |  1 -
 nixos-config/default.nix     | 22 +--------------
 nixos-config/yui/default.nix | 12 --------
 5 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 keys/peerix/yui.pub

diff --git a/flake.lock b/flake.lock
index 7ca55af2..61c9a08d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,22 +57,6 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1627913399,
-        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -130,21 +114,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1634851050,
-        "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -477,28 +446,6 @@
         "type": "github"
       }
     },
-    "peerix": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1661429880,
-        "narHash": "sha256-7/m468XZW82O7KhDtRdQ7RnPsh83+tA8N4U0FncFo1U=",
-        "owner": "cid-chan",
-        "repo": "peerix",
-        "rev": "32cd1b098b83c90726848bd6726f74e72c557abb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cid-chan",
-        "repo": "peerix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "disko": "disko",
@@ -515,7 +462,6 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nurpkgs": "nurpkgs",
         "nvfetcher": "nvfetcher",
-        "peerix": "peerix",
         "sops-nix": "sops-nix"
       }
     },
diff --git a/flake.nix b/flake.nix
index eaa480b0..058d6fda 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,10 +21,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
-    peerix = {
-      url = "github:cid-chan/peerix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     impermanence.url = "github:nix-community/impermanence";
 
     disko = {
diff --git a/keys/peerix/yui.pub b/keys/peerix/yui.pub
deleted file mode 100644
index 7fcc7524..00000000
--- a/keys/peerix/yui.pub
+++ /dev/null
@@ -1 +0,0 @@
-peerix-yui:mBGNsfAi3Dd75XHRkWumahuVYY60Hp0BBkruqBt1LPA=
\ No newline at end of file
diff --git a/nixos-config/default.nix b/nixos-config/default.nix
index 6f75eba8..cd114a83 100644
--- a/nixos-config/default.nix
+++ b/nixos-config/default.nix
@@ -6,7 +6,6 @@
 }: {
   imports = [
     flake-inputs.home-manager.nixosModules.home-manager
-    flake-inputs.peerix.nixosModules.peerix
     flake-inputs.sops-nix.nixosModules.sops
     flake-inputs.hyprland.nixosModules.default
 
@@ -28,7 +27,6 @@
       trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        (builtins.readFile ../keys/peerix/yui.pub)
       ];
     };
 
@@ -58,16 +56,6 @@
     validateSopsFiles = false;
   };
 
-  services.peerix = {
-    enable = true;
-    openFirewall = true;
-    user = "peerix";
-    group = "peerix";
-
-    # Work around https://github.com/cid-chan/peerix/issues/11
-    package = flake-inputs.peerix.packages.${pkgs.system}.peerix;
-  };
-
   nixpkgs.overlays = [
     flake-inputs.nurpkgs.overlay
   ];
@@ -115,21 +103,13 @@
   users = {
     defaultUserShell = pkgs.zsh;
 
-    groups = {
-      peerix = {};
-      network = {};
-    };
+    groups.network = {};
 
     users = {
       tlater = {
         isNormalUser = true;
         extraGroups = ["wheel" "video" "network"];
       };
-
-      peerix = {
-        group = "peerix";
-        isSystemUser = true;
-      };
     };
   };
 
diff --git a/nixos-config/yui/default.nix b/nixos-config/yui/default.nix
index 684fc808..371ca89b 100644
--- a/nixos-config/yui/default.nix
+++ b/nixos-config/yui/default.nix
@@ -67,18 +67,6 @@ in {
 
   fileSystems."/nix".options = ["defaults" "noatime"];
 
-  sops.secrets = {
-    "peerix/yui" = {
-      owner = config.users.users.peerix.name;
-      group = config.users.users.peerix.group;
-    };
-  };
-
-  services.peerix = {
-    privateKeyFile = config.sops.secrets."peerix/yui".path;
-    publicKeyFile = ../../keys/peerix/yui.pub;
-  };
-
   # Fix broken suspend on b550i motherboard
   #
   # The rule is a bit overzealous, as it disables wake from *either*