Separated out the SSH config. Cleaned up apps.

This commit is contained in:
kat witch 2021-02-26 08:44:54 +00:00
parent ae16fd6737
commit 6838b19f27
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
3 changed files with 26 additions and 24 deletions

View file

@ -2,6 +2,7 @@
{ {
imports = [ imports = [
./ssh.nix
./desktop.nix ./desktop.nix
./gaming.nix ./gaming.nix
./network.nix ./network.nix
@ -51,28 +52,6 @@
}; };
}; };
programs.ssh = {
enable = true;
controlMaster = "auto";
controlPersist = "10m";
hashKnownHosts = true;
matchBlocks = let
kat = {
forwardAgent = true;
extraOptions = {
RemoteForward =
"/run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra";
};
port = 62954;
};
in {
"athame" = { hostname = "athame.kittywit.ch"; } // kat;
"samhain" = { hostname = "192.168.1.135"; } // kat;
"yule" = { hostname = "192.168.1.92"; } // kat;
"boline" = { hostname = "boline.kittywit.ch"; } // kat;
};
};
programs.bat.enable = true; programs.bat.enable = true;
programs.tmux = { programs.tmux = {
enable = true; enable = true;

View file

@ -48,7 +48,6 @@ in {
unstable.google-chrome unstable.google-chrome
v4l-utils v4l-utils
transmission-gtk transmission-gtk
jdk11
lm_sensors lm_sensors
baresip baresip
psmisc psmisc
@ -61,7 +60,6 @@ in {
nitrogen nitrogen
terminator terminator
pavucontrol pavucontrol
appimage-run
gparted gparted
scrot scrot
gimp-with-plugins gimp-with-plugins

25
config/users/kat/ssh.nix Normal file
View file

@ -0,0 +1,25 @@
{ configs, pkgs, ... }:
{
programs.ssh = {
enable = true;
controlMaster = "auto";
controlPersist = "10m";
hashKnownHosts = true;
matchBlocks = let
common = {
forwardAgent = true;
extraOptions = {
RemoteForward =
"/run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra";
};
port = 62954;
};
in {
"athame" = { hostname = "athame.kittywit.ch"; } // common;
"samhain" = { hostname = "192.168.1.135"; } // common;
"yule" = { hostname = "192.168.1.92"; } // common;
"boline" = { hostname = "boline.kittywit.ch"; } // common;
};
};
}