aboutsummaryrefslogtreecommitdiffstats
path: root/home/root/common
diff options
context:
space:
mode:
Diffstat (limited to 'home/root/common')
-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/common/core/zsh/default.nix2
4 files changed, 2 insertions, 8 deletions
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";