diff options
-rw-r--r-- | config.org | 59 |
1 files changed, 45 insertions, 14 deletions
diff --git a/config.org b/config.org index 4faef32..954f7a7 100644 --- a/config.org +++ b/config.org | |||
@@ -2194,20 +2194,6 @@ that one item is. | |||
2194 | (define-key acdw/leader "g" #'magit-status) | 2194 | (define-key acdw/leader "g" #'magit-status) |
2195 | #+end_src | 2195 | #+end_src |
2196 | 2196 | ||
2197 | **** Use =~/.authinfo= for passwords | ||
2198 | |||
2199 | The =auth-info= line should look like this: | ||
2200 | |||
2201 | #+begin_example | ||
2202 | machine git.example.com user acdw password hahayeahrightyamoroniwouldn'tgiveyouthat | ||
2203 | #+end_example | ||
2204 | |||
2205 | #+begin_src emacs-lisp :noweb-ref hooks | ||
2206 | (autoload 'magit-process-password-auth-source "magit") | ||
2207 | (add-hook 'magit-process-find-password-functions | ||
2208 | #'magit-process-password-auth-source) | ||
2209 | #+end_src | ||
2210 | |||
2211 | **** Windows setup | 2197 | **** Windows setup |
2212 | 2198 | ||
2213 | Following the [[https://github.com/magit/magit/wiki/Pushing-with-Magit-from-Windows][wiki page located here]]. Also make sure to run the | 2199 | Following the [[https://github.com/magit/magit/wiki/Pushing-with-Magit-from-Windows][wiki page located here]]. Also make sure to run the |
@@ -3218,6 +3204,51 @@ This function require [[https://github.com/simonthum/git-sync][git-sync]]. | |||
3218 | (define-key acdw/leader (kbd "C-M-f") #'acdw/git-sync-elfeed-db) | 3204 | (define-key acdw/leader (kbd "C-M-f") #'acdw/git-sync-elfeed-db) |
3219 | #+end_src | 3205 | #+end_src |
3220 | 3206 | ||
3207 | *** Passwords | ||
3208 | |||
3209 | **** Password cache | ||
3210 | |||
3211 | #+begin_src emacs-lisp :noweb-ref settings | ||
3212 | (setq-default password-cache-expiry nil) | ||
3213 | #+end_src | ||
3214 | |||
3215 | **** Use =~/.authinfo= for passwords | ||
3216 | |||
3217 | The =auth-info= line should look like this: | ||
3218 | |||
3219 | #+begin_example | ||
3220 | machine git.example.com user acdw password hahayeahrightyamoroniwouldn'tgiveyouthat | ||
3221 | #+end_example | ||
3222 | |||
3223 | #+begin_src emacs-lisp :noweb-ref hooks | ||
3224 | (autoload 'magit-process-password-auth-source "magit") | ||
3225 | (add-hook 'magit-process-find-password-functions | ||
3226 | #'magit-process-password-auth-source) | ||
3227 | #+end_src | ||
3228 | |||
3229 | *** TRAMP | ||
3230 | |||
3231 | It stands for ... something kind of stupid, I don't remember. I'm pulling this | ||
3232 | from [[https://github.com/grandfoobah/spartan-emacs/blob/master/spartan-layers/spartan-settings.el][Spartan Emacs]]. It recommends the following in =~/.ssh/config=: | ||
3233 | |||
3234 | #+begin_example | ||
3235 | Host * | ||
3236 | ForwardAgent yes | ||
3237 | AddKeysToAgent yes | ||
3238 | ControlMaster auto | ||
3239 | ControlPath ~/.ssh/master-%r@%h:%p | ||
3240 | ControlPersist yes | ||
3241 | ServerAliveInterval 10 | ||
3242 | ServerAliveCountMax 10 | ||
3243 | #+end_example | ||
3244 | |||
3245 | #+begin_src emacs-lisp :noweb-ref settings | ||
3246 | (setq-default tramp-default-method "ssh" | ||
3247 | tramp-copy-size-limit nil | ||
3248 | tramp-use-ssh-controlmaster-options nil | ||
3249 | tramp-default-remote-shell "/bin/bash") | ||
3250 | #+end_src | ||
3251 | |||
3221 | ** Linux (home) | 3252 | ** Linux (home) |
3222 | :PROPERTIES: | 3253 | :PROPERTIES: |
3223 | :header-args: :noweb-ref linux-specific | 3254 | :header-args: :noweb-ref linux-specific |