diff options
| -rw-r--r-- | emacs/.emacs.d/main.el | 25 | ||||
| -rw-r--r-- | git/.config/git/config | 6 | ||||
| -rw-r--r-- | i3/.config/i3/config | 4 | ||||
| -rwxr-xr-x | xprofile/.xprofile | 1 |
4 files changed, 24 insertions, 12 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index d138d976..1b30808f 100644 --- a/emacs/.emacs.d/main.el +++ b/emacs/.emacs.d/main.el @@ -172,6 +172,11 @@ (variable-pitch-mode) (setq cursor-type '(bar . 1))) + (defun use-fixed-fonts () + (interactive) + (variable-pitch-mode -1) + (setq cursor-type 'box)) + (defun ap/set-fonts (mono-face mono-font-size variable-face variable-font-size antialias &optional new-line-spacing) (if (boundp 'ns-antialias-text) (setq ns-antialias-text antialias)) @@ -494,6 +499,7 @@ ((string-equal (projectile-project-type) "node-yarn") (cmd-to-echo "yarn" "install")) (t (cmd-to-echo "npm" "install"))))) + (defalias 'npm-install #'yarn-install) (defun yarn-add-dev (package) (interactive "spackage: ") @@ -502,6 +508,7 @@ ((string-equal (projectile-project-type) "node-yarn") (cmd-to-echo "yarn" (concat "add --dev " package))) (t (cmd-to-echo "npm" (concat "install --save-dev " package)))))) + (defalias 'npm-save-dev #'yarn-add-dev) (defun yarn-add (package) (interactive "spackage: ") @@ -510,6 +517,7 @@ ((string-equal (projectile-project-type) "node-yarn") (cmd-to-echo "yarn" (concat "add " package))) (t (cmd-to-echo "npm" (concat "install --save " package)))))) + (defalias 'npm-save #'yarn-add) (defun yarn-remove (package) (interactive "spackage: ") @@ -518,6 +526,7 @@ ((string-equal (projectile-project-type) "node-yarn") (cmd-to-echo "yarn" (concat "remove " package))) (t (cmd-to-echo "npm" (concat "remove " package)))))) + (defalias 'npm-remote #'yarn-remove) (defun yarn-run (cmd) (interactive (list @@ -527,6 +536,7 @@ ((string-equal (projectile-project-type) "node-yarn") (cmd-to-echo "yarn" (concat "run " cmd))) (t (cmd-to-echo "npm" (concat "run " cmd)))))) + (defalias 'npm-run #'yarn-run) (defun npx-run (cmd) (interactive "scommand: ") @@ -1274,10 +1284,10 @@ With two prefix arguments, write out the day and month name." (mu4e-refile-folder . "/personal/alanpearce/Archive") (mu4e-trash-folder . "/personal/alanpearce/Trash") (mu4e-maildir-shortcuts . (("/personal/alanpearce/INBOX" . ?i) - ("/personal/alanpearce/Archive" . ?s) + ("/personal/alanpearce/Archive" . ?a) ("/personal/alanpearce/Sent" . ?s) ("/personal/alanpearce/Spam" . ?p) - ("/personal/alanpearce/Orders" . ?o))) + ("/personal/alanpearce/Orders" . ?r))) )) (make-mu4e-context :name "Riseup" @@ -1292,7 +1302,7 @@ With two prefix arguments, write out the day and month name." (mu4e-refile-folder . "/personal/riseup/Archive") (mu4e-trash-folder . "/personal/riseup/Trash") (mu4e-maildir-shortcuts . (("/personal/riseup/INBOX" . ?i) - ("/personal/riseup/Archive" . ?r) + ("/personal/riseup/Archive" . ?a) ("/personal/riseup/Sent" . ?s) ("/personal/riseup/Spam" . ?p))))) (make-mu4e-context @@ -1308,7 +1318,7 @@ With two prefix arguments, write out the day and month name." (mu4e-refile-folder . "/satoshipay/[Gmail]/.All Mail") (mu4e-trash-folder . "/satoshipay/[Gmail]/.Bin") (mu4e-maildir-shortcuts . (("/satoshipay/INBOX" . ?i) - ("/satoshipay/[Gmail]/.All Mail" . ?r) + ("/satoshipay/[Gmail]/.All Mail" . ?a) ("/satoshipay/[Gmail]/.Sent Mail" . ?s) ("/satoshipay/[Gmail]/.Spam" . ?p)))))) mu4e-user-mail-address-list (append @@ -2087,13 +2097,14 @@ With prefix TO-CURRENT-BUFFER, insert command output into buffer." (use-package add-node-modules-path :config (progn (define-hook-helper js2-mode () + :name node-modules-flycheck (add-node-modules-path) (when (executable-find "eslint") - (setq flycheck-javascript-eslint-executable "eslint")) + (setq-local flycheck-javascript-eslint-executable (executable-find "eslint"))) (when (executable-find "prettier-standard") - (setq flycheck-javascript-standard-executable "prettier-standard")) + (setq-local flycheck-javascript-standard-executable (executable-find "prettier-standard"))) (when (executable-find "standard") - (setq flycheck-javascript-standard-executable "standard"))))) + (setq-local flycheck-javascript-standard-executable (executable-find "standard")))))) ;;;;;;; Flow diff --git a/git/.config/git/config b/git/.config/git/config index da295997..e710bbef 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -9,6 +9,7 @@ ui = true [push] default = current + followTags = true [alias] up = merge FETCH_HEAD st = status -sb @@ -22,7 +23,7 @@ pr = pull-request delete-merged = "!sh -c 'git branch --merged | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d'" [github] - user = alan@alanpearce.eu + user = alanpearce [ghq "ssh://alanpearce.eu/"] vcs = git [includeIf "gitdir:github.com/Spotcap/"] @@ -47,5 +48,4 @@ cmd = icdiff --line-numbers $LOCAL $REMOTE [gpg] program = gpg -[commit] - gpgsign = true + diff --git a/i3/.config/i3/config b/i3/.config/i3/config index bc205b3b..f035ca2a 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -276,8 +276,8 @@ client.background $base07 new_window pixel 1 new_float normal hide_edge_borders both -gaps inner 5 -gaps outer 5 +gaps inner 10 +gaps outer 0 for_window [class="Pinentry$"] floating enable for_window [class="Google-chrome"] border pixel 1 diff --git a/xprofile/.xprofile b/xprofile/.xprofile index 78e02b7c..b83f94b0 100755 --- a/xprofile/.xprofile +++ b/xprofile/.xprofile @@ -6,5 +6,6 @@ then autorandr --change --force fi xrdb -I$HOME/.xresources .xresources/main +dunst & xsetroot -cursor_name left_ptr -solid '#666666' & sxhkd & |