diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2021-10-19 19:19:02 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2021-10-19 19:19:02 +0200 |
| commit | 0d0fb5657f2557fb5b81f0305513437b7fc37541 (patch) | |
| tree | 936651ec86df3386d60ab610f45ae2d3bfff9f4a | |
| parent | 81da1cf8552d7144405fda5a75a6b35a20cf134c (diff) | |
| download | nixos-0d0fb5657f2557fb5b81f0305513437b7fc37541.tar nixos-0d0fb5657f2557fb5b81f0305513437b7fc37541.tar.gz nixos-0d0fb5657f2557fb5b81f0305513437b7fc37541.tar.bz2 nixos-0d0fb5657f2557fb5b81f0305513437b7fc37541.tar.xz nixos-0d0fb5657f2557fb5b81f0305513437b7fc37541.zip | |
...
| -rw-r--r-- | accounts/gkleen@sif/default.nix | 6 | ||||
| -rw-r--r-- | modules/stage-1/default.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 1442e83f..98806ff4 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix | |||
| @@ -150,8 +150,10 @@ in { | |||
| 150 | 150 | ||
| 151 | gh = { | 151 | gh = { |
| 152 | enable = true; | 152 | enable = true; |
| 153 | editor = "${config.home-manager.users.${userName}.programs.emacs.package}/bin/emacsclient"; | 153 | settings = { |
| 154 | gitProtocol = "ssh"; | 154 | editor = "${config.home-manager.users.${userName}.programs.emacs.package}/bin/emacsclient"; |
| 155 | gitProtocol = "ssh"; | ||
| 156 | }; | ||
| 155 | }; | 157 | }; |
| 156 | 158 | ||
| 157 | nix-index.enable = true; | 159 | nix-index.enable = true; |
diff --git a/modules/stage-1/default.nix b/modules/stage-1/default.nix index 5a14584e..5d49475f 100644 --- a/modules/stage-1/default.nix +++ b/modules/stage-1/default.nix | |||
| @@ -561,7 +561,7 @@ in | |||
| 561 | is the path it should be copied from (or null for the same | 561 | is the path it should be copied from (or null for the same |
| 562 | path inside and out). | 562 | path inside and out). |
| 563 | ''; | 563 | ''; |
| 564 | example = literalExample | 564 | example = literalExpression |
| 565 | '' | 565 | '' |
| 566 | { "/etc/dropbear/dropbear_rsa_host_key" = | 566 | { "/etc/dropbear/dropbear_rsa_host_key" = |
| 567 | ./secret-dropbear-key; | 567 | ./secret-dropbear-key; |
