diff --git a/config/common/default.nix b/config/common/default.nix index 252e38f..ef26bbd 100644 --- a/config/common/default.nix +++ b/config/common/default.nix @@ -19,7 +19,6 @@ with lib; { bottom man-pages man-pages-posix - linux-manual unzip zip figlet @@ -29,6 +28,13 @@ with lib; { fish.enable = true; }; + deployment = { + tags = [ "all" ]; + targetHost = mkDefault config.networking.fqdn; + targetPort = mkDefault 22; + targetUser = mkDefault null; + }; + security.dhparams.defaultBitSize = 4096; system.activationScripts.motd.text = let diff --git a/config/common/users/emily/default.nix b/config/common/users/emily/default.nix index 83bf133..2eb1dca 100644 --- a/config/common/users/emily/default.nix +++ b/config/common/users/emily/default.nix @@ -24,6 +24,7 @@ htop restic ] ++ lib.optionals config.kyouma.machine-type.graphical [ + linux-manual colmena thunderbird obsidian diff --git a/config/hosts/lain/configuration.nix b/config/hosts/lain/configuration.nix index 0a33ee9..e1799d7 100644 --- a/config/hosts/lain/configuration.nix +++ b/config/hosts/lain/configuration.nix @@ -9,7 +9,7 @@ console.enable = false; deployment = { - targetHost = "192.168.178.170"; + targetHost = "192.168.178.166"; targetUser = "nixos"; }; diff --git a/flake.nix b/flake.nix index 642dbe2..128e9fb 100644 --- a/flake.nix +++ b/flake.nix @@ -26,12 +26,6 @@ hosts = [ "web-dus" "crime" "ryuuko" "lain" ]; hostCfg = hostname: { imports = [ (./config/hosts/${hostname}/configuration.nix) ]; - deployment = with nixpkgs.lib; { - tags = [ "all" ]; - targetHost = mkDefault config.networking.fqdn; - targetPort = mkDefault 22; - targetUser = mkDefault null; - }; }; in { meta = {