From 6a0712944b261c74a81a6fa5f27b6971cbf7bfe6 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 25 Aug 2021 03:34:12 +0000 Subject: [PATCH] Move keybase out into separate set --- sets/keybase.nix | 10 ++++++++++ sets/packages.nix | 1 - sets/workstation.nix | 2 -- system/rainbowdash/default.nix | 1 + system/starlight/default.nix | 1 + 5 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 sets/keybase.nix diff --git a/sets/keybase.nix b/sets/keybase.nix new file mode 100644 index 0000000..5d68f4c --- /dev/null +++ b/sets/keybase.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: + +{ + services = { + keybase.enable = true; + kbfs.enable = true; + }; + + environment.systemPackages = with pkgs; [ keybase-gui ]; +} diff --git a/sets/packages.nix b/sets/packages.nix index 1ee8ce4..d7a19eb 100644 --- a/sets/packages.nix +++ b/sets/packages.nix @@ -141,7 +141,6 @@ in # Security (pass.withExtensions (exts: [ exts.pass-otp ])) - keybase-gui wireguard yubikey-manager yubioath-desktop diff --git a/sets/workstation.nix b/sets/workstation.nix index 32ab56f..350446c 100644 --- a/sets/workstation.nix +++ b/sets/workstation.nix @@ -18,8 +18,6 @@ services = { flatpak.enable = true; fwupd.enable = true; - kbfs.enable = true; - keybase.enable = true; pcscd.enable = true; syncthing = { enable = true; diff --git a/system/rainbowdash/default.nix b/system/rainbowdash/default.nix index 98e423a..4bf731b 100644 --- a/system/rainbowdash/default.nix +++ b/system/rainbowdash/default.nix @@ -13,6 +13,7 @@ ../../sets/1password.nix ../../sets/workstation.nix ../../sets/krb5.nix + ../../sets/keybase.nix ]; environment.systemPackages = [ diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 061307f..2afb6d1 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -12,6 +12,7 @@ ../../sets/hacking.nix ../../sets/hardware.nix ../../sets/krb5.nix + ../../sets/keybase.nix ../../sets/printing.nix ../../sets/radio.nix ../../sets/ssh.nix