Skip to content

Commit

Permalink
Remove peerix
Browse files Browse the repository at this point in the history
I'm not using it anyway, it keeps causing build issues and the peerix
repo hasn't seen any commits since 2022.
  • Loading branch information
TLATER committed Oct 8, 2023
1 parent a2f0fad commit 8374dc2
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 92 deletions.
54 changes: 0 additions & 54 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
1 change: 0 additions & 1 deletion keys/peerix/yui.pub

This file was deleted.

22 changes: 1 addition & 21 deletions nixos-config/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
];
};

Expand Down Expand Up @@ -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
];
Expand Down Expand Up @@ -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;
};
};
};

Expand Down
12 changes: 0 additions & 12 deletions nixos-config/yui/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down

0 comments on commit 8374dc2

Please sign in to comment.