9 files changed, 40 insertions, 8 deletions
diff --git a/home/root/caladan.nix b/home/root/caladan.nix
new file mode 100644
index 0000000..228bb90
--- /dev/null
+++ b/home/root/caladan.nix
@@ -0,0 +1,14 @@
+{ config, inputs, lib, outputs, pkgs, ... }:
+{
+  imports = [
+    common/core
+  ];
+
+  home.file = {
+    "bin/knock".source = ../common/scripts/knock;
+  };
+
+  nix.extraOptions = ''
+    !include /run/secrets/nix-access-token-github
+  '';
+}
diff --git a/home/root/common/core/default.nix b/home/root/common/core/default.nix
index e2ca7c5..3043d2c 100644
--- a/home/root/common/core/default.nix
+++ b/home/root/common/core/default.nix
@@ -3,7 +3,6 @@
   imports = [
     ./bash.nix
     ./git.nix
-    #./ssh.nix
     ./tmux
     ./vim
     ./zsh
diff --git a/home/root/common/core/git.nix b/home/root/common/core/git.nix
index 49e10df..e1cb96b 100644
--- a/home/root/common/core/git.nix
+++ b/home/root/common/core/git.nix
@@ -1,6 +1,6 @@
 {
   programs.git = {
     enable = true;
-    extraConfig.pull.rebase = true;
+    settings.pull.rebase = true;
   };
 }
diff --git a/home/root/common/core/ssh.nix b/home/root/common/core/ssh.nix
deleted file mode 100644
index 929cc51..0000000
--- a/home/root/common/core/ssh.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  programs.ssh = {
-    enable = true;
-  };
-}
diff --git a/home/root/common/core/zsh/default.nix b/home/root/common/core/zsh/default.nix
index eaec714..a3587b8 100644
--- a/home/root/common/core/zsh/default.nix
+++ b/home/root/common/core/zsh/default.nix
@@ -19,7 +19,7 @@ export COLORFGBG=";0"
       save = 100000;
       size = 100000;
     };
-    initExtra = (builtins.readFile ./zshrc);
+    initContent = (builtins.readFile ./zshrc);
     shellAliases = {
       grep = "grep --color=auto";
       ip = "ip -c=auto";
diff --git a/home/root/darkstar.nix b/home/root/darkstar.nix
index 72dbda0..7399284 100644
--- a/home/root/darkstar.nix
+++ b/home/root/darkstar.nix
@@ -1,5 +1,11 @@
 { inputs, lib, pkgs, config, outputs, ... }:
 {
+  home = {
+    file = {
+      "bin/knock".source = ../common/scripts/knock;
+    };
+  };
+
   imports = [
     common/core
   ];
diff --git a/home/root/fangorn.nix b/home/root/fangorn.nix
new file mode 100644
index 0000000..72dbda0
--- /dev/null
+++ b/home/root/fangorn.nix
@@ -0,0 +1,10 @@
+{ inputs, lib, pkgs, config, outputs, ... }:
+{
+  imports = [
+    common/core
+  ];
+
+  nix.extraOptions = ''
+    !include /run/secrets/nix-access-token-github
+  '';
+}
diff --git a/home/root/kaitain.nix b/home/root/kaitain.nix
index 72dbda0..cb4ed48 100644
--- a/home/root/kaitain.nix
+++ b/home/root/kaitain.nix
@@ -4,6 +4,10 @@
     common/core
   ];
 
+  home.file = {
+    "bin/knock".source = ../common/scripts/knock;
+  };
+
   nix.extraOptions = ''
     !include /run/secrets/nix-access-token-github
   '';
diff --git a/home/root/richese.nix b/home/root/richese.nix
index 72dbda0..cb4ed48 100644
--- a/home/root/richese.nix
+++ b/home/root/richese.nix
@@ -4,6 +4,10 @@
     common/core
   ];
 
+  home.file = {
+    "bin/knock".source = ../common/scripts/knock;
+  };
+
   nix.extraOptions = ''
     !include /run/secrets/nix-access-token-github
   '';