aboutsummaryrefslogtreecommitdiffstats
path: root/home/root
diff options
context:
space:
mode:
Diffstat (limited to 'home/root')
-rw-r--r--home/root/caladan.nix6
-rw-r--r--home/root/common/core/default.nix1
-rw-r--r--home/root/common/core/git.nix2
-rw-r--r--home/root/common/core/ssh.nix5
-rw-r--r--home/root/kaitain.nix4
-rw-r--r--home/root/richese.nix4
6 files changed, 12 insertions, 10 deletions
diff --git a/home/root/caladan.nix b/home/root/caladan.nix
index 287f220..228bb90 100644
--- a/home/root/caladan.nix
+++ b/home/root/caladan.nix
@@ -8,7 +8,7 @@
"bin/knock".source = ../common/scripts/knock;
};
- #nix.extraOptions = ''
- # !include /run/secrets/nix-access-token-github
- #'';
+ 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/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
'';