fiddlerwoaroof/dotfiles - Change GWEZ4L4PS2QZPKRIPDLIEGVEFZ6QSN6SRPN445YGY4EFBS2LICFAC

chore: Merge remote-tracking branch 'origin/master'

Created by Edward on December 12, 2020

GWEZ4L4PS2QZPKRIPDLIEGVEFZ6QSN6SRPN445YGY4EFBS2LICFAC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies, dependencies, dependencies, dependencies, dependencies
BFD:BFD[4.1] → [5.129:152]
BFD:BFD[4.1] → [5.129:152]
BFD:BFD[4.1] → [5.129:152]
BFD:BFD[4.1] → [5.129:152]
BFD:BFD[5.152] → [5.128:128]
BFD:BFD[4.1] → [5.129:152]
BFD:BFD[4.1] → [5.129:152]
BFD:BFD[5.152] → [5.128:128]

File deletion: ct-sexp.lisp

BF:BFD[6.81] → [6.4490:4526]

BF:BFD[6.4526] → [6.2401:2401]

B:BD[6.2401] → [6.2402:4489]

#!/home/edwlan/bin/sbcl --script
(load "~/quicklisp/setup.lisp")
(ql:quickload '(:lquery :fwoar-lisputils :alexandria :net.didierverna.clon))
(eval-when (:compile-toplevel :load-toplevel :execute)
  (require :uiop))
(defpackage :fwoar.ct->sexp
  (:use :cl)
  (:local-nicknames (:clon :net.didierverna.clon))
  (:export ))
(in-package :fwoar.ct->sexp)
(defparameter *args*
  (uiop:command-line-arguments))
(defun extract-refs (work root)
  (lquery:$
    (inline root)
    "p[title]"
    (combine (attr "title")
             (text))
    (map-apply (lambda (ref text)
                 (list 'ref work
                       (serapeum:string-join (fwoar.string-utils:split " " (elt (fwoar.string-utils:split "," ref) 1)))
                       text)))))
(defun serialize-refs (out-fn refs)
  (alexandria:with-output-to-file (s out-fn :if-exists :append :if-does-not-exist :create)
    (let ((*print-case* :downcase))
      (map nil
           (lambda (ref)
             (prin1 ref s)
             (fresh-line s))
           refs))))
(defun translate (in out)
  (let ((root (plump:parse in))
        (out-path (parse-namestring out)))
    (serialize-refs out
                    (extract-refs (alexandria:make-keyword
                                   (string-upcase (pathname-name out-path)))
                                  root))))
(defparameter *synopsis*
  (net.didierverna.clon:defsynopsis (:postfix "OUT FILES...")))
(defun main ()
  (net.didierverna.clon:make-context :synopsis *synopsis*)
  (let ((*package* (find-package :fwoar.ct->sexp)))
    (destructuring-bind (out . files) (net.didierverna.clon:remainder)
      (format *error-output*
              "OUT: ~s~%FILES: ~s~%"
              out files)
      (map nil
           (lambda (file)
             (format *error-output* "PROCESSING FILE: ~s~%" file)
             (translate (parse-namestring file)
                        out))
           files))))
(net.didierverna.clon:dump (merge-pathnames "bin/ct-sexp"
                                            (user-homedir-pathname))
                           main)

File deletion: git-magit

BF:BFD[7.4] → [8.623:656]

BF:BFD[8.656] → [8.458:458]

B:BD[8.458] → [8.459:622]

#!/usr/bin/env zsh
emacsclient -n -e "
(let ((default-directory \"$PWD\"))
  (magit)
  (delete-other-windows)
  (select-frame-set-input-focus (selected-frame)))
"

File deletion: karabiner_20201110.json

BF:BFD[9.147] → [10.51824:51871]

BF:BFD[10.51871] → [10.32207:32207]

B:BD[10.32207] → [10.32208:51823]

{
    "global": {
        "check_for_updates_on_startup": true,
        "show_in_menu_bar": true,
        "show_profile_name_in_menu_bar": true
    },
    "profiles": [
        {
            "complex_modifications": {
                "parameters": {
                    "basic.simultaneous_threshold_milliseconds": 50,
                    "basic.to_delayed_action_delay_milliseconds": 500,
                    "basic.to_if_alone_timeout_milliseconds": 200,
                    "basic.to_if_held_down_threshold_milliseconds": 500,
                    "mouse_motion_to_scroll.speed": 100
                },
                "rules": [
                    {
                        "manipulators": [
                            {
                                "description": "Change caps_lock to command+control+option+shift.",
                                "from": {
                                    "key_code": "caps_lock",
                                    "modifiers": {
                                        "optional": [
                                            "any"
                                        ]
                                    }
                                },
                                "to": [
                                    {
                                        "key_code": "left_option",
                                        "modifiers": [
                                            "left_command",
                                            "left_control"
                                        ]
                                    }
                                ],
                                "type": "basic"
                            }
                        ]
                    },
                    {
                        "manipulators": [
                            {
                                "description": "map left shift to opening parenthesis",
                                "from": {
                                    "key_code": "left_shift",
                                    "modifiers": {
                                        "optional": []
                                    }
                                },
                                "to": [
                                    {
                                        "key_code": "left_shift",
                                        "modifiers": []
                                    }
                                ],
                                "to_if_alone": [
                                    {
                                        "key_code": "9",
                                        "modifiers": [
                                            "left_shift"
                                        ]
                                    }
                                ],
                                "type": "basic"
                            },
                            {
                                "description": "map left shift to opening parenthesis",
                                "from": {
                                    "key_code": "left_control",
                                    "modifiers": {
                                        "optional": [
                                            "any"
                                        ]
                                    }
                                },
                                "to": [
                                    {
                                        "key_code": "left_control",
                                        "modifiers": []
                                    }
                                ],
                                "to_if_alone": [
                                    {
                                        "key_code": "open_bracket",
                                        "modifiers": [
                                            "left_shift"
                                        ]
                                    }
                                ],
                                "type": "basic"
                            },
                            {
                                "description": "map left shift to opening parenthesis",
                                "from": {
                                    "key_code": "right_control",
                                    "modifiers": {
                                        "optional": [
                                            "any"
                                        ]
                                    }
                                },
                                "to": [
                                    {
                                        "key_code": "right_control",
                                        "modifiers": []
                                    }
                                ],
                                "to_if_alone": [
                                    {
                                        "key_code": "close_bracket",
                                        "modifiers": [
                                            "left_shift"
                                        ]
                                    }
                                ],
                                "type": "basic"
                            },
                            {
                                "description": "map right shift to closing parenthesis",
                                "from": {
                                    "key_code": "right_shift",
                                    "modifiers": {
                                        "optional": [
                                            "any"
                                        ]
                                    }
                                },
                                "to": [
                                    {
                                        "key_code": "right_shift",
                                        "modifiers": []
                                    }
                                ],
                                "to_if_alone": [
                                    {
                                        "key_code": "0",
                                        "modifiers": [
                                            "right_shift"
                                        ]
                                    }
                                ],
                                "type": "basic"
                            }
                        ]
                    }
                ]
            },
            "devices": [
                {
                    "disable_built_in_keyboard_if_exists": false,
                    "fn_function_keys": [],
                    "identifiers": {
                        "is_keyboard": true,
                        "is_pointing_device": false,
                        "product_id": 50475,
                        "vendor_id": 1133
                    },
                    "ignore": false,
                    "manipulate_caps_lock_led": false,
                    "simple_modifications": []
                },
                {
                    "disable_built_in_keyboard_if_exists": false,
                    "fn_function_keys": [],
                    "identifiers": {
                        "is_keyboard": true,
                        "is_pointing_device": false,
                        "product_id": 617,
                        "vendor_id": 1241
                    },
                    "ignore": false,
                    "manipulate_caps_lock_led": false,
                    "simple_modifications": []
                },
                {
                    "disable_built_in_keyboard_if_exists": false,
                    "fn_function_keys": [],
                    "identifiers": {
                        "is_keyboard": true,
                        "is_pointing_device": false,
                        "product_id": 591,
                        "vendor_id": 1452
                    },
                    "ignore": false,
                    "manipulate_caps_lock_led": true,
                    "simple_modifications": []
                },
                {
                    "disable_built_in_keyboard_if_exists": false,
                    "fn_function_keys": [],
                    "identifiers": {
                        "is_keyboard": false,
                        "is_pointing_device": true,
                        "product_id": 36915,
                        "vendor_id": 2522
                    },
                    "ignore": false,
                    "manipulate_caps_lock_led": false,
                    "simple_modifications": []
                },
                {
                    "disable_built_in_keyboard_if_exists": true,
                    "fn_function_keys": [],
                    "identifiers": {
                        "is_keyboard": true,
                        "is_pointing_device": false,
                        "product_id": 45849,
                        "vendor_id": 1133
                    },
                    "ignore": false,
                    "manipulate_caps_lock_led": true,
                    "simple_modifications": [
                        {
                            "from": {
                                "key_code": "left_command"
                            },
                            "to": {
                                "key_code": "left_option"
                            }
                        },
                        {
                            "from": {
                                "key_code": "left_option"
                            },
                            "to": {
                                "key_code": "left_command"
                            }
                        },
                        {
                            "from": {
                                "key_code": "right_option"
                            },
                            "to": {
                                "key_code": "right_command"
                            }
                        }
                    ]
                },
                {
                    "disable_built_in_keyboard_if_exists": false,
                    "fn_function_keys": [],
                    "identifiers": {
                        "is_keyboard": true,
                        "is_pointing_device": true,
                        "product_id": 8963,
                        "vendor_id": 4617
                    },
                    "ignore": false,
                    "manipulate_caps_lock_led": false,
                    "simple_modifications": []
                },
                {
                    "disable_built_in_keyboard_if_exists": false,
                    "fn_function_keys": [],
                    "identifiers": {
                        "is_keyboard": false,
                        "is_pointing_device": true,
                        "product_id": 8963,
                        "vendor_id": 4617
                    },
                    "ignore": false,
                    "manipulate_caps_lock_led": false,
                    "simple_modifications": []
                },
                {
                    "disable_built_in_keyboard_if_exists": false,
                    "fn_function_keys": [],
                    "identifiers": {
                        "is_keyboard": false,
                        "is_pointing_device": true,
                        "product_id": 1,
                        "vendor_id": 6899
                    },
                    "ignore": false,
                    "manipulate_caps_lock_led": false,
                    "simple_modifications": []
                },
                {
                    "disable_built_in_keyboard_if_exists": false,
                    "fn_function_keys": [],
                    "identifiers": {
                        "is_keyboard": true,
                        "is_pointing_device": false,
                        "product_id": 8963,
                        "vendor_id": 4617
                    },
                    "ignore": false,
                    "manipulate_caps_lock_led": false,
                    "simple_modifications": []
                }
            ],
            "fn_function_keys": [
                {
                    "from": {
                        "key_code": "f1"
                    },
                    "to": {
                        "key_code": "display_brightness_decrement"
                    }
                },
                {
                    "from": {
                        "key_code": "f2"
                    },
                    "to": {
                        "key_code": "display_brightness_increment"
                    }
                },
                {
                    "from": {
                        "key_code": "f3"
                    },
                    "to": {
                        "key_code": "mission_control"
                    }
                },
                {
                    "from": {
                        "key_code": "f4"
                    },
                    "to": {
                        "key_code": "launchpad"
                    }
                },
                {
                    "from": {
                        "key_code": "f5"
                    },
                    "to": {
                        "key_code": "illumination_decrement"
                    }
                },
                {
                    "from": {
                        "key_code": "f6"
                    },
                    "to": {
                        "key_code": "illumination_increment"
                    }
                },
                {
                    "from": {
                        "key_code": "f7"
                    },
                    "to": {
                        "key_code": "rewind"
                    }
                },
                {
                    "from": {
                        "key_code": "f8"
                    },
                    "to": {
                        "key_code": "play_or_pause"
                    }
                },
                {
                    "from": {
                        "key_code": "f9"
                    },
                    "to": {
                        "key_code": "fastforward"
                    }
                },
                {
                    "from": {
                        "key_code": "f10"
                    },
                    "to": {
                        "key_code": "mute"
                    }
                },
                {
                    "from": {
                        "key_code": "f11"
                    },
                    "to": {
                        "key_code": "volume_decrement"
                    }
                },
                {
                    "from": {
                        "key_code": "f12"
                    },
                    "to": {
                        "key_code": "volume_increment"
                    }
                }
            ],
            "name": "shift->paren",
            "parameters": {
                "delay_milliseconds_before_open_device": 1000
            },
            "selected": true,
            "simple_modifications": [],
            "virtual_hid_keyboard": {
                "caps_lock_delay_milliseconds": 0,
                "country_code": 0,
                "keyboard_type": "ansi",
                "mouse_key_xy_scale": 100
            }
        },
        {
            "complex_modifications": {
                "parameters": {
                    "basic.simultaneous_threshold_milliseconds": 50,
                    "basic.to_delayed_action_delay_milliseconds": 500,
                    "basic.to_if_alone_timeout_milliseconds": 1000,
                    "basic.to_if_held_down_threshold_milliseconds": 500,
                    "mouse_motion_to_scroll.speed": 100
                },
                "rules": []
            },
            "devices": [],
            "fn_function_keys": [
                {
                    "from": {
                        "key_code": "f1"
                    },
                    "to": {
                        "key_code": "display_brightness_decrement"
                    }
                },
                {
                    "from": {
                        "key_code": "f2"
                    },
                    "to": {
                        "key_code": "display_brightness_increment"
                    }
                },
                {
                    "from": {
                        "key_code": "f3"
                    },
                    "to": {
                        "key_code": "mission_control"
                    }
                },
                {
                    "from": {
                        "key_code": "f4"
                    },
                    "to": {
                        "key_code": "launchpad"
                    }
                },
                {
                    "from": {
                        "key_code": "f5"
                    },
                    "to": {
                        "key_code": "illumination_decrement"
                    }
                },
                {
                    "from": {
                        "key_code": "f6"
                    },
                    "to": {
                        "key_code": "illumination_increment"
                    }
                },
                {
                    "from": {
                        "key_code": "f7"
                    },
                    "to": {
                        "key_code": "rewind"
                    }
                },
                {
                    "from": {
                        "key_code": "f8"
                    },
                    "to": {
                        "key_code": "play_or_pause"
                    }
                },
                {
                    "from": {
                        "key_code": "f9"
                    },
                    "to": {
                        "key_code": "fastforward"
                    }
                },
                {
                    "from": {
                        "key_code": "f10"
                    },
                    "to": {
                        "key_code": "mute"
                    }
                },
                {
                    "from": {
                        "key_code": "f11"
                    },
                    "to": {
                        "key_code": "volume_decrement"
                    }
                },
                {
                    "from": {
                        "key_code": "f12"
                    },
                    "to": {
                        "key_code": "volume_increment"
                    }
                }
            ],
            "name": "no shift->paren",
            "parameters": {
                "delay_milliseconds_before_open_device": 1000
            },
            "selected": false,
            "simple_modifications": [],
            "virtual_hid_keyboard": {
                "caps_lock_delay_milliseconds": 0,
                "country_code": 0,
                "keyboard_type": "ansi",
                "mouse_key_xy_scale": 100
            }
        }
    ]
}

Deletion in emacs.d/lisp/utils.el at line 4 [11.629]
B:BD[11.629] → [12.196:234]
```
;;; utils -- Summary
;;; Commentary:
```
Solving an order conflict in emacs.d/lisp/utils.el at line 4 [11.629]
[13.231]
[11.630]

Deletion in emacs.d/lisp/utils.el at line 26 [11.629]

B:BD[11.645] → [12.235:919]

;;; Code:
(defun fwoar/doc-for-resource-type (resource-type)
  (cl-format nil
             "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/~{~a~^-~}"
             (list* "aws" "resource"
                    (cdr (s-split "::" (s-downcase resource-type))))))
(defun fwoar/document-cf (min max)
  "Jump to AWS Cloudformation docs for a resource type.
MIN: the point in the buffer where the resource type starts
MAX: the point in the buffer where the resource type ends
This uses (interactive \"r\") to automagically populate the arguments
from the selected region."
  (interactive "r")
  (browse-url
   (fwoar/doc-for-resource-type
    (buffer-substring min max))))

Solving an order conflict in emacs.d/lisp/utils.el at line 26 [11.629]
[13.916]
[14.166]
Deletion in emacs.d/lisp/utils.el at line 146 [11.629]
∅:D[15.967] → [16.961:962]
B:BD[16.961] → [16.961:962]
B:BD[16.962] → [13.917:1033]
```
(defmacro fwoar/defvaralias! (var val-var)
  `(progn
     (setq ,var ,val-var)
     (defvaralias ',var ',val-var)))
```
Solving an order conflict in emacs.d/lisp/utils.el at line 147 [11.629]
[13.1034]
[12.920]

Deletion in emacs.d/lisp/utils.el at line 160 [11.629]

B:BD[17.273] → [12.1038:1288]

  (fwoar/defvaralias! c-basic-offset tab-width)
  (fwoar/defvaralias! sh-basic-offset tab-width)
  (fwoar/defvaralias! js2-basic-offset tab-width)
  (fwoar/defvaralias! sgml-basic-offset tab-width)
  (fwoar/defvaralias! cperl-indent-level tab-width)

Solving an order conflict in emacs.d/lisp/utils.el at line 160 [11.629]
[13.1285]
[17.498]
Replacement in emacs.d/lisp/utils.el at line 172 [11.629]
B:BD[17.575] → [17.575:599]
```
  (centaur-tabs-mode 1)
```
[17.575]
[17.599]
```
  ;;(centaur-tabs-mode 1)
```
Solving an order conflict in emacs.d/lisp/utils.el at line 187 [11.629]
[13.1314]
[12.1289]
Deletion in emacs.d/lisp/utils.el at line 188 [11.629]
B:BD[12.1290] → [12.1290:1317]
∅:D[18.182] → [19.1088:1089]
∅:D[13.1314] → [19.1088:1089]
∅:D[12.1317] → [19.1088:1089]
B:BD[19.1088] → [19.1088:1089]
```
(defvar fwoar.is-ordinary)
```
Deletion in emacs.d/lisp/utils.el at line 189 [11.629]
B:BD[19.1109] → [13.1315:1320]
```
  ""
```

Deletion in emacs.d/lisp/utils.el at line 197 [11.629]

B:BD[19.1223] → [13.1321:1440]

  (comment
   (when-let ((ls-executable (executable-find "gls")))
     (setq insert-directory-program ls-executable)))

Deletion in emacs.d/lisp/utils.el at line 217 [11.629]
B:BD[19.1958] → [13.1441:1477]
```
  (package-initialize 'no-activate)
```

File deletion: helm-conf.el

BF:BFD[19.4163] → [12.3553:3589]

BF:BFD[12.3589] → [12.2173:2173]

B:BD[12.2173] → [12.2174:3552]


(use-package helm :ensure t :config
  (require 'helm-config)
  (helm-mode)
  (global-set-key (kbd "M-x") 'helm-M-x)
  (global-set-key (kbd "C-x C-f") 'helm-find-files)
  (evil-define-key 'normal 'global (kbd "<leader>f") 'helm-projectile)
  (evil-define-key 'normal 'global (kbd "<leader>j") 'helm-buffers-list)
  (evil-define-key 'normal 'global (kbd "<leader>s") 'helm-occur)
  (evil-define-key 'normal 'global (kbd "<leader>S") 'helm-projectile-rg)
  (define-key helm-map (kbd "C-r") 'fwoar--paste-register-from-helm-current-buffer)
  (define-key helm-map (kbd "<right>") 'helm-execute-persistent-action)
  (define-key helm-map
    (kbd "<left>")
    'helm-find-files-up-one-level))
(use-package helm-org
  :after helm
  :ensure t)
(use-package org-projectile-helm
  :after helm
  :ensure t
  :after org-projectile
  :config
  (define-key projectile-mode-map (kbd "C-c n p") 'org-projectile-helm-template-or-project))
(use-package helm-ag :after helm :ensure t)
(use-package helm-ag-r :after helm :ensure t)
(use-package helm-rg :after helm :ensure t)
(use-package helm-css-scss :after helm :ensure t)
(use-package helm-ls-git :after helm :ensure t)
(use-package helm-projectile :after helm :ensure t
             :config
  (evil-define-key 'normal 'global (kbd "<leader>h") 'helm-projectile-find-file-dwim)
  )
(use-package project-explorer :after helm :ensure t)

File deletion: helm-conf.el

BF:BFD[19.4163] → [12.10380:10416]

BF:BFD[12.10416] → [12.9000:9000]

B:BD[12.9000] → [12.9001:10379]


(use-package helm :ensure t :config
  (require 'helm-config)
  (helm-mode)
  (global-set-key (kbd "M-x") 'helm-M-x)
  (global-set-key (kbd "C-x C-f") 'helm-find-files)
  (evil-define-key 'normal 'global (kbd "<leader>f") 'helm-projectile)
  (evil-define-key 'normal 'global (kbd "<leader>j") 'helm-buffers-list)
  (evil-define-key 'normal 'global (kbd "<leader>s") 'helm-occur)
  (evil-define-key 'normal 'global (kbd "<leader>S") 'helm-projectile-rg)
  (define-key helm-map (kbd "C-r") 'fwoar--paste-register-from-helm-current-buffer)
  (define-key helm-map (kbd "<right>") 'helm-execute-persistent-action)
  (define-key helm-map
    (kbd "<left>")
    'helm-find-files-up-one-level))
(use-package helm-org
  :after helm
  :ensure t)
(use-package org-projectile-helm
  :after helm
  :ensure t
  :after org-projectile
  :config
  (define-key projectile-mode-map (kbd "C-c n p") 'org-projectile-helm-template-or-project))
(use-package helm-ag :after helm :ensure t)
(use-package helm-ag-r :after helm :ensure t)
(use-package helm-rg :after helm :ensure t)
(use-package helm-css-scss :after helm :ensure t)
(use-package helm-ls-git :after helm :ensure t)
(use-package helm-projectile :after helm :ensure t
             :config
  (evil-define-key 'normal 'global (kbd "<leader>h") 'helm-projectile-find-file-dwim)
  )
(use-package project-explorer :after helm :ensure t)

Deletion in emacs.d/lisp/configurations/slime-conf.el at line 143 [21.171]

B:BD[20.183] → [12.1486:1625]

(comment
)
(use-package slime-company
  :ensure t
  :after slime
  :config (setq slime-company-completion 'fuzzy))
(defvar passwords ())

Solving an order conflict in emacs.d/lisp/configurations/slime-conf.el at line 143 [21.171]
[13.1622]
[22.540]

Deletion in emacs.d/lisp/configurations/slime-conf.el at line 151 [21.171]

B:BD[22.571] → [12.1626:1874]

  :after smartparens
  :load-path (lambda ()
               (list
                (fwoar-git-repo "3dp/slime/"
                                "git@github.com:slime/slime.git"
                                "https://github.com/slime/slime.git")))

Solving an order conflict in emacs.d/lisp/configurations/slime-conf.el at line 151 [21.171]
[13.1871]
[22.803]

Deletion in emacs.d/lisp/configurations/slime-conf.el at line 152 [21.171]

B:BD[22.813] → [13.1872:2093]


  (defslimefun get-passwd (id prompt)
    (let ((val (assoc id passwords)))
      (cdr
       (if val val
         (car (push (cons id (read-passwd prompt))
                    passwords))))))
  (message "%s" load-path)

Deletion in emacs.d/lisp/configurations/slime-conf.el at line 226 [21.171]
B:BD[22.3267] → [12.2097:2171]
```
  (setq slime-contribs '(slime-media
                         slime-fancy
```
Solving an order conflict in emacs.d/lisp/configurations/slime-conf.el at line 226 [21.171]
[13.2168]
[22.3304]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 20 [21.8110]

B:BD[21.8443] → [13.3588:3789]

  (evil-define-key 'motion 'global  (kbd "TAB") nil)
  (evil-define-key 'motion 'global  (kbd "C-w C-o") 'fwoar-delete-mru-window)
  (evil-define-key 'motion 'global  (kbd "C-w C-w") 'evil-window-mru)

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 25 [21.8110]
B:BD[21.8592] → [12.3793:3853]
```
  (evil-define-key 'normal 'global (kbd "ZZ") 'save-buffer)
```
Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 25 [21.8110]
[13.3850]
[21.8647]
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 31 [21.8110]
B:BD[21.8768] → [12.3854:3938]
```
  (evil-define-key 'insert 'global  (kbd "TAB") 'company-indent-or-complete-common)
```
Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 31 [21.8110]
[13.3935]
[21.8852]
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 34 [21.8110]
B:BD[21.8867] → [12.3939:3983]
```
  (evil-set-leader '(normal) (kbd "<SPC>"))
```
Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 34 [21.8110]
[13.3980]
[21.8867]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 40 [21.8110]

B:BD[21.8891] → [12.3984:4290]

    (evil-define-key 'normal 'global (kbd "<leader>f") 'helm-projectile)
    (evil-define-key 'normal 'global (kbd "<leader>;") 'helm-semantic-or-imenu)
    (evil-define-key 'normal 'global (kbd "<leader>j") 'helm-buffers-list)
    (evil-define-key 'normal 'global (kbd "<leader>u") 'undo-tree-visualize))

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 40 [21.8110]
[13.4287]
[21.9081]
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 45 [21.8110]
B:BD[23.197] → [13.4288:4361]
```
  (evil-define-key 'normal magit-file-mode-map (kbd "<leader>a") 'magit)
```

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 50 [21.8110]

B:BD[15.1792] → [12.4365:4510]

    (evil-define-key 'motion 'global (kbd "]e") 'flycheck-next-error)
    (evil-define-key 'motion 'global (kbd "[e") 'flycheck-previous-error))

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 50 [21.8110]
[13.4507]
[21.9278]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 71 [21.8110]

B:BD[21.10554] → [12.4511:4713]

    (evil-define-key 'normal 'global (kbd ",W") 'sp-wrap-round)
    (evil-define-key 'normal 'global  (kbd "C-, W") 'sp-wrap-round)
    (evil-define-key 'normal 'global  (kbd "C-, C-W") 'sp-wrap-round)

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 71 [21.8110]
[13.4710]
[21.10751]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 74 [21.8110]

B:BD[21.10752] → [12.4714:4844]

    (evil-define-key 'normal 'global (kbd ",w(") 'sp-wrap-round)
    (evil-define-key 'normal 'global (kbd ",w)") 'sp-wrap-round)

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 74 [21.8110]
[13.4841]
[21.10872]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 83 [21.8110]

B:BD[21.11105] → [12.4845:5122]

    (evil-define-key 'normal 'global (kbd ",w$") 'wrap-in-dollar-brace)
    (evil-define-key 'normal 'global  (kbd "C-, $") 'wrap-in-dollar-brace)
    (evil-define-key 'normal 'global (kbd ",w{") 'sp-wrap-curly)
    (evil-define-key 'normal 'global (kbd ",w}") 'sp-wrap-curly)

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 83 [21.8110]
[13.5119]
[21.11367]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 90 [21.8110]

B:BD[21.11718] → [13.5120:5252]

    (evil-define-key 'normal 'global (kbd ",w[") 'sp-wrap-square)
    (evil-define-key 'normal 'global (kbd ",w]") 'sp-wrap-square)

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 100 [21.8110]
B:BD[21.12202] → [12.5256:5330]
```
    (evil-define-key 'normal 'global (kbd ",w\"") 'wrap-with-doublequote)
```
Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 100 [21.8110]
[13.5327]
[21.12271]
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 103 [21.8110]
B:BD[21.12364] → [13.5328:5393]
```
    (evil-define-key 'normal 'global (kbd ",S") 'sp-splice-sexp)
```
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 107 [21.8110]
B:BD[21.12550] → [12.5397:5479]
```
    (evil-define-key 'normal 'global (kbd ",A") 'sp-splice-sexp-killing-backward)
```
Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 107 [21.8110]
[13.5476]
[21.12627]
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 109 [21.8110]
B:BD[21.12787] → [13.5477:5558]
```
    (evil-define-key 'normal 'global (kbd ",D") 'sp-splice-sexp-killing-forward)
```
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 113 [21.8110]
B:BD[21.13021] → [12.5562:5642]
```
    (evil-define-key 'normal 'global (kbd ",F") 'sp-splice-sexp-killing-around)
```
Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 113 [21.8110]
[13.5639]
[21.13096]
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 118 [21.8110]
B:BD[21.13277] → [12.5643:5715]
```
    (evil-define-key 'normal 'global (kbd ",,") 'sp-backward-barf-sexp)
```
Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 118 [21.8110]
[13.5712]
[21.13344]
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 120 [21.8110]
B:BD[21.13484] → [13.5713:5784]
```
    (evil-define-key 'normal 'global (kbd ",.") 'sp-forward-barf-sexp)
```
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 124 [21.8110]
B:BD[21.13688] → [12.5788:5861]
```
    (evil-define-key 'normal 'global (kbd ",<") 'sp-backward-slurp-sexp)
```
Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 124 [21.8110]
[13.5858]
[21.13756]
Deletion in emacs.d/lisp/configurations/evil-conf.el at line 126 [21.8110]
B:BD[21.13898] → [13.5859:5931]
```
    (evil-define-key 'normal 'global (kbd ",>") 'sp-forward-slurp-sexp)
```

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 131 [21.8110]

B:BD[21.14124] → [13.5932:6320]

    (evil-define-key 'normal 'global (kbd ",~") 'sp-convolute-sexp)
    (evil-define-key 'normal 'global (kbd ",a") 'sp-absorb-sexp)
    (evil-define-key 'normal 'global (kbd ",e") 'sp-emit-sexp)
    (evil-define-key 'normal 'global (kbd ",`") 'sp-clone-sexp)
    (evil-define-key 'normal 'global (kbd ",J") 'sp-join-sexp)
    (evil-define-key 'normal 'global (kbd ",|") 'sp-split-sexp))

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 139 [21.8110]

B:BD[21.14505] → [13.6321:6688]

    (evil-define-key 'normal 'global (kbd "<leader>n(") 'sp-narrow-to-sexp)
    (evil-define-key 'normal 'global (kbd "<leader>n)") 'sp-narrow-to-sexp)
    (evil-define-key 'normal 'global (kbd "<leader>nn") 'narrow-to-defun)
    (evil-define-key 'normal 'global (kbd "<leader>nr") 'narrow-to-region)
    (evil-define-key 'normal 'global (kbd "<leader>nw") 'widen)))

Replacement in emacs.d/lisp/configurations/evil-conf.el at line 145 [21.8110]

B:BD[21.14813] → [21.14813:14918]

B:BD[21.14918] → [24.291:340]

∅:D[24.340] → [21.14966:15008]

B:BD[21.14966] → [21.14966:15008]

(use-package centaur-tabs
  :ensure t
  :after evil
  :config
  (setq centaur-tabs-adjust-buffer-order t
        centaur-tabs-adjust-buffer-order 'right)
  (centaur-tabs-enable-buffer-reordering)

[21.14813]

[21.15008]

(comment
 (use-package centaur-tabs
   :ensure t
   :after evil
   :config
   (setq centaur-tabs-adjust-buffer-order t
         centaur-tabs-adjust-buffer-order 'right)
   (centaur-tabs-enable-buffer-reordering)

Replacement in emacs.d/lisp/configurations/evil-conf.el at line 154 [21.8110]

B:BD[21.15009] → [13.6689:6762]

B:BD[21.15009] → [12.6692:6765]

∅:D[13.6762] → [21.15077:15226]

∅:D[12.6765] → [21.15077:15226]

B:BD[21.15077] → [21.15077:15226]

B:BD[21.15226] → [13.6763:6837]

B:BD[21.15226] → [12.6766:6840]

∅:D[13.6837] → [21.15295:15449]

∅:D[12.6840] → [21.15295:15449]

B:BD[21.15295] → [21.15295:15449]

  (evil-define-key 'normal 'global (kbd "gt") 'centaur-tabs-forward-tab)
  (evil-define-key 'normal 'global (kbd "gt") 'centaur-tabs-forward-tab)
  (define-key global-map (kbd "<header-line> <wheel-up>") 'centaur-tabs-forward-tab)
  (define-key global-map (kbd "s-}") 'centaur-tabs-forward-tab)
  (evil-define-key 'normal 'global (kbd "gT") 'centaur-tabs-backward-tab)
  (evil-define-key 'normal 'global (kbd "gT") 'centaur-tabs-backward-tab)
  (define-key global-map (kbd "<header-line> <wheel-down>") 'centaur-tabs-backward-tab)
  (define-key global-map (kbd "s-{") 'centaur-tabs-backward-tab))

[21.15009]

[15.1928]

   (evil-define-key 'normal 'global (kbd "gt") 'centaur-tabs-forward-tab)
   (define-key global-map (kbd "<header-line> <wheel-up>") 'centaur-tabs-forward-tab)
   (define-key global-map (kbd "s-}") 'centaur-tabs-forward-tab)
   (evil-define-key 'normal 'global (kbd "gT") 'centaur-tabs-backward-tab)
   (define-key global-map (kbd "<header-line> <wheel-down>") 'centaur-tabs-backward-tab)
   (define-key global-map (kbd "s-{") 'centaur-tabs-backward-tab)))

Deletion in emacs.d/lisp/configurations/cider-conf.el at line 38 [25.2154]
B:BD[25.3222] → [13.6839:6914]
```
  (evil-define-key 'normal clojure-mode-map (kbd "SPC") 'evil-send-leader)
```

Deletion in emacs.d/init.el at line 2 [26.136]

B:BD[11.6852] → [13.6918:7053]

(setq read-process-output-max (* 1024 1024))
(setq
 ;;gc-cons-threshold 100000000
 inhibit-splash-screen t
 inhibit-startup-message t)

Deletion in emacs.d/init.el at line 36 [26.136]
B:BD[11.7721] → [13.7054:7086]
```
(set-exec-path-from-shell-PATH)
```
Deletion in emacs.d/init.el at line 39 [26.136]
B:BD[27.244] → [13.7087:7121]
```
(use-package general
  :ensure t)
```
Deletion in emacs.d/init.el at line 59 [26.136]
B:BD[27.860] → [12.7125:7152]
```
           ;;company-xcode
```
Solving an order conflict in emacs.d/init.el at line 59 [26.136]
[13.7149]
[27.885]
Deletion in emacs.d/init.el at line 61 [26.136]
B:BD[27.934] → [13.7150:7190]
```
           ;;company-slime
           )
```

Deletion in emacs.d/init.el at line 175 [26.136]

B:BD[28.2733] → [12.7194:7466]

  :config
  (push (cons "gitlab.cj.com" "gitlab")
        browse-at-remote-remote-type-domains)
  (push (cons "gitlab.cj.dev" "gitlab")
        browse-at-remote-remote-type-domains)
  (push (cons "git.cnvrmedia.net" "stash")
        browse-at-remote-remote-type-domains))

Solving an order conflict in emacs.d/init.el at line 175 [26.136]
[13.7463]
[28.2836]

Deletion in emacs.d/init.el at line 203 [26.136]

B:BD[13.7843] → [13.7843:7931]

B:BD[29.190] → [12.7467:7613]

                                   :test 'equal)))
    (setq load-path new-load-path)))
(defun fwoar/setup-load-path ()
  (let* ((new-load-path (cl-adjoin "~/.emacs.d/lisp/configurations/"
                                   load-path

Solving an order conflict in emacs.d/init.el at line 203 [26.136]
[13.7843]
[12.7613]

Deletion in emacs.d/init.el at line 205 [26.136]

B:BD[12.7722] → [12.7722:7797]

B:BD[12.7797] → [30.210:368]

                                           "emacs.d/lisp/configurations/")
                                   new-load-path
                                   :test 'equal))
         (new-load-path (cl-adjoin (concat *dotfiles-repo*

Deletion in emacs.d/init.el at line 211 [26.136]

B:BD[13.7956] → [13.7956:8052]

B:BD[28.3592] → [12.7935:7959]

(defun fwoar/package-configuration (package)
  (fwoar/setup-load-path)
  (let* ((local-configs)
(fwoar/setup-load-path)

Solving an order conflict in emacs.d/init.el at line 211 [26.136]
[13.7956]
[30.433]

Deletion in emacs.d/init.el at line 224 [26.136]

B:BD[31.529] → [12.8056:8176]

    conf-file))
(defun load-package-configuration (package)
  (let ((conf-file (fwoar/package-configuration package)))

Solving an order conflict in emacs.d/init.el at line 224 [26.136]
[13.8173]
[31.529]
Deletion in emacs.d/init.el at line 236 [26.136]
B:BD[32.1968] → [13.8174:8209]
```
(load-package-configuration 'helm)
```

Deletion in emacs.d/init.el at line 274 [26.136]

B:BD[14.3073] → [12.8213:8299]

;; (evil-define-key 'visual 'global (kbd "<leader>m") 'mf/mirror-region-in-multifile)

Solving an order conflict in emacs.d/init.el at line 274 [26.136]
[13.8296]
[14.3148]
Deletion in emacs.d/init.el at line 326 [26.136]
B:BD[33.594] → [13.8297:8365]
```
  (evil-define-key 'visual 'global (kbd "<leader>c") 'org-capture))
```
Deletion in emacs.d/init.el at line 352 [26.136]
B:BD[33.1159] → [12.8369:8430]
```
  (evil-define-key 'normal 'global (kbd "<leader>v") 'deft))
```
Solving an order conflict in emacs.d/init.el at line 352 [26.136]
[13.8427]
[33.1211]

Deletion in emacs.d/init.el at line 364 [26.136]

B:BD[18.2442] → [13.8428:8595]

  (evil-define-key 'normal 'global (kbd "<leader>g") 'helm-generate-lisp-skeleton)
  (evil-define-key 'visual 'global (kbd "<leader>g") 'helm-generate-lisp-skeleton))

Deletion in emacs.d/init.el at line 526 [26.136]
B:BD[34.1619] → [13.8596:8667]
```
(evil-define-key 'normal 'global (kbd "<leader>o") 'fwoar-pl-selector)
```

Deletion in emacs.d/init.el at line 531 [26.136]

B:BD[35.244] → [13.8668:8750]

  (evil-define-key 'normal 'global (kbd "<leader>d") 'helm-imenu-in-all-buffers))

Deletion in emacs.d/init.el at line 648 [26.136]
∅:D[36.303] → [37.653:654]
∅:D[14.4066] → [37.653:654]
B:BD[37.653] → [37.653:654]
Deletion in emacs.d/init.el at line 655 [26.136]
B:BD[38.156] → [12.8754:8794]
```
;;(setq gc-cons-threshold (* 100 1024))
```
Solving an order conflict in emacs.d/init.el at line 655 [26.136]
[13.8791]
[38.194]

Deletion in emacs.d/init.el at line 790 [26.136]

B:BD[39.332] → [13.8792:8909]

    (kbd "<leader>t") 'maven-test-all
    (kbd "<leader>T") 'maven-test-toggle-between-test-and-class-other-window))

Deletion in emacs.d/init.el at line 805 [26.136]
B:BD[40.434] → [12.8913:8914]
Solving an order conflict in emacs.d/init.el at line 805 [26.136]
[13.8911]
[41.193]
Deletion in emacs.d/init.el at line 812 [26.136]
B:BD[41.445] → [13.8912:8945]
```
(put 'list-timers 'disabled nil)
```

chore: Merge remote-tracking branch 'origin/master'

Dependencies

In channels

Change contents

File deletion: dependencies, dependencies, dependencies, dependencies, dependencies, dependencies

File deletion: ct-sexp.lisp

File deletion: git-magit

File deletion: karabiner_20201110.json

Deletion in emacs.d/lisp/utils.el at line 4 [11.629]

Solving an order conflict in emacs.d/lisp/utils.el at line 4 [11.629]

Deletion in emacs.d/lisp/utils.el at line 26 [11.629]

Solving an order conflict in emacs.d/lisp/utils.el at line 26 [11.629]

Deletion in emacs.d/lisp/utils.el at line 146 [11.629]

Solving an order conflict in emacs.d/lisp/utils.el at line 147 [11.629]

Deletion in emacs.d/lisp/utils.el at line 160 [11.629]

Solving an order conflict in emacs.d/lisp/utils.el at line 160 [11.629]

Replacement in emacs.d/lisp/utils.el at line 172 [11.629]

Solving an order conflict in emacs.d/lisp/utils.el at line 187 [11.629]

Deletion in emacs.d/lisp/utils.el at line 188 [11.629]

Deletion in emacs.d/lisp/utils.el at line 189 [11.629]

Deletion in emacs.d/lisp/utils.el at line 197 [11.629]

Deletion in emacs.d/lisp/utils.el at line 217 [11.629]

File deletion: helm-conf.el

File deletion: helm-conf.el

Deletion in emacs.d/lisp/configurations/slime-conf.el at line 143 [21.171]

Solving an order conflict in emacs.d/lisp/configurations/slime-conf.el at line 143 [21.171]

Deletion in emacs.d/lisp/configurations/slime-conf.el at line 151 [21.171]

Solving an order conflict in emacs.d/lisp/configurations/slime-conf.el at line 151 [21.171]

Deletion in emacs.d/lisp/configurations/slime-conf.el at line 152 [21.171]

Deletion in emacs.d/lisp/configurations/slime-conf.el at line 226 [21.171]

Solving an order conflict in emacs.d/lisp/configurations/slime-conf.el at line 226 [21.171]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 20 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 25 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 25 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 31 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 31 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 34 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 34 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 40 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 40 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 45 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 50 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 50 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 71 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 71 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 74 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 74 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 83 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 83 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 90 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 100 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 100 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 103 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 107 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 107 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 109 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 113 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 113 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 118 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 118 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 120 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 124 [21.8110]

Solving an order conflict in emacs.d/lisp/configurations/evil-conf.el at line 124 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 126 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 131 [21.8110]

Deletion in emacs.d/lisp/configurations/evil-conf.el at line 139 [21.8110]

Replacement in emacs.d/lisp/configurations/evil-conf.el at line 145 [21.8110]

Replacement in emacs.d/lisp/configurations/evil-conf.el at line 154 [21.8110]

Deletion in emacs.d/lisp/configurations/cider-conf.el at line 38 [25.2154]

Deletion in emacs.d/init.el at line 2 [26.136]

Deletion in emacs.d/init.el at line 36 [26.136]

Deletion in emacs.d/init.el at line 39 [26.136]

Deletion in emacs.d/init.el at line 59 [26.136]

Solving an order conflict in emacs.d/init.el at line 59 [26.136]

Deletion in emacs.d/init.el at line 61 [26.136]

Deletion in emacs.d/init.el at line 175 [26.136]

Solving an order conflict in emacs.d/init.el at line 175 [26.136]

Deletion in emacs.d/init.el at line 203 [26.136]

Solving an order conflict in emacs.d/init.el at line 203 [26.136]

Deletion in emacs.d/init.el at line 205 [26.136]