From 75ae06baf8239b9384ab6accc515aaa825194869 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 12 Oct 2017 15:22:55 +0200 Subject: git: Don't sign commits by default It's too slow with the NitroKey and probably not of that much benefit --- git/.config/git/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/git/.config/git/config b/git/.config/git/config index da295997..ef771932 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -47,5 +47,4 @@ cmd = icdiff --line-numbers $LOCAL $REMOTE [gpg] program = gpg -[commit] - gpgsign = true + -- cgit 1.4.1 From 4c695301e4759fbc25fef42d8e2d1fe430ec2549 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 13 Oct 2017 11:10:30 +0200 Subject: git: Push relevant tags by default See --follow-tags in git-push(1) --- git/.config/git/config | 1 + 1 file changed, 1 insertion(+) diff --git a/git/.config/git/config b/git/.config/git/config index ef771932..4cf2e0dc 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 -- cgit 1.4.1 From d92c9ac5802040585d0d1bd742bd59a78c2a3922 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 13 Oct 2017 20:38:44 +0200 Subject: xprofile: Fix missing notifications Dunst wasn't being started. --- xprofile/.xprofile | 1 + 1 file changed, 1 insertion(+) 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 & -- cgit 1.4.1 From ee14f070df766bddd8710124dbcfc2737422882d Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 18 Oct 2017 12:35:11 +0200 Subject: Emacs: Add npm-yarn aliases --- emacs/.emacs.d/main.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index d138d976..80ff2d5a 100644 --- a/emacs/.emacs.d/main.el +++ b/emacs/.emacs.d/main.el @@ -494,6 +494,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 +503,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 +512,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 +521,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 +531,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: ") -- cgit 1.4.1 From 51fc99f1e180a30c2a7bc21517b41009fbb72f3f Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 18 Oct 2017 12:35:31 +0200 Subject: Emacs: Fix flycheck setup in js2-mode --- emacs/.emacs.d/main.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index 80ff2d5a..b4ddd664 100644 --- a/emacs/.emacs.d/main.el +++ b/emacs/.emacs.d/main.el @@ -2092,13 +2092,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 -- cgit 1.4.1 From 75c5e4df2e02756caded5047806d5e7794eea3bb Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 18 Oct 2017 12:35:45 +0200 Subject: Emacs: Change mu4e shortcuts --- emacs/.emacs.d/main.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index b4ddd664..7508dd0f 100644 --- a/emacs/.emacs.d/main.el +++ b/emacs/.emacs.d/main.el @@ -1279,10 +1279,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" @@ -1297,7 +1297,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 @@ -1313,7 +1313,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 -- cgit 1.4.1 From 0a297c13575bcc98c037219017da3a2695a33eee Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 18 Oct 2017 12:35:52 +0200 Subject: Emacs: Add use-fixed-fonts function Counterpart to use-variable fonts --- emacs/.emacs.d/main.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index 7508dd0f..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)) -- cgit 1.4.1 From 83ce2da5aa4ccefd2418fc79bd34532c75b7e3a3 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 18 Oct 2017 12:36:22 +0200 Subject: Git: Use github username instead of email --- git/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/.config/git/config b/git/.config/git/config index 4cf2e0dc..e710bbef 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -23,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/"] -- cgit 1.4.1 From 92dc1beb83f9e0b56f645d7934488907389d640e Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 18 Oct 2017 12:36:37 +0200 Subject: i3: Change gaps to only inner --- i3/.config/i3/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit 1.4.1