From ad01a1fd65395a88963f624769adc118796c1db6 Mon Sep 17 00:00:00 2001 From: pegasust Date: Sat, 10 Dec 2022 18:55:34 -0700 Subject: [PATCH] improv: componentize ssh --- nix-conf/home-manager/base/neovim.nix | 0 nix-conf/home-manager/base/ssh.nix | 23 ++++++++++++++++++++++- nix-conf/home-manager/home.nix | 5 ----- 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 nix-conf/home-manager/base/neovim.nix diff --git a/nix-conf/home-manager/base/neovim.nix b/nix-conf/home-manager/base/neovim.nix new file mode 100644 index 0000000..e69de29 diff --git a/nix-conf/home-manager/base/ssh.nix b/nix-conf/home-manager/base/ssh.nix index 0967ef4..435c7bf 100644 --- a/nix-conf/home-manager/base/ssh.nix +++ b/nix-conf/home-manager/base/ssh.nix @@ -1 +1,22 @@ -{} +{ config +, proj_root +, myLib +, ... +}: +let cfg = config.base.ssh; +in +{ + options.base.ssh.enable = myLib.mkOption { + type = myLib.types.bool; + default = true; + example = false; + description = '' + Enables SSH + ''; + }; + config.programs.ssh = { + inherit (cfg) enable; + forwardAgent = true; + extraConfig = builtins.readFile "${proj_root}/ssh/config"; + }; +} diff --git a/nix-conf/home-manager/home.nix b/nix-conf/home-manager/home.nix index b77930e..8b970c9 100644 --- a/nix-conf/home-manager/home.nix +++ b/nix-conf/home-manager/home.nix @@ -139,9 +139,4 @@ in }; initExtra = myHome.shellInitExtra or ""; }; - programs.ssh = { - enable = true; - forwardAgent = true; - extraConfig = builtins.readFile "${proj_root}/ssh/config"; - }; }