Collected changes

3 files changed, 50 insertions, 48 deletions

diff --git a/emacs/inits/01-basic.el b/emacs/inits/01-basic.el
index c3d540d..a362dba 100644
--- a/emacs/inits/01-basic.el
+++ b/emacs/inits/01-basic.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2021-01-04 15h39 EST (hobbies)>
+;; Time-stamp: <2021-01-06 22:25:23 (tslil@bison)>
 
 ;; -----------------------------------------------------------------------------
 ;; Interface
@@ -71,7 +71,7 @@
 
 (setq standard-indent 2)
 (setq-default tab-width 2
-							indent-tabs-mode t)
+	      indent-tabs-mode t)
 (add-hook 'before-save-hook #'whitespace-cleanup)
 
 (show-paren-mode t)
diff --git a/emacs/inits/14-movement.el b/emacs/inits/14-movement.el
index c02990d..9963c1d 100644
--- a/emacs/inits/14-movement.el
+++ b/emacs/inits/14-movement.el
@@ -1,20 +1,20 @@
-;; Time-stamp: <2021-01-06 22:22:59 (tslil@bison)>
+;; Time-stamp: <2021-01-06 23:07:54 (tslil@bison)>
 
 ;; -------------------------------------------------------------------
 ;; Repeated key presses for region
 
 (use-package expand-region :ensure t
-  :bind (("M-r" . er/expand-region))
-  :config
-  (setq expand-region-fast-keys-enabled t
-	expand-region-contract-fast-key "c"
-	expand-region-reset-fast-key "e"
-	expand-region-autocopy-register "i"))
+	:bind (("M-r" . er/expand-region))
+	:config
+	(setq expand-region-fast-keys-enabled t
+				expand-region-contract-fast-key "c"
+				expand-region-reset-fast-key "e"
+				expand-region-autocopy-register "i"))
 
 ;; -------------------------------------------------------------------
 ;; Window switching
 (use-package switch-window :ensure t
-  :bind (("C-x o" . switch-window)
+	:bind (("C-x o" . switch-window)
 	 ("C-x C-o" . other-frame)
 	 ("C-c o" . switch-window)
 	 ("C-c n" . switch-window-then-maximize)
@@ -27,8 +27,8 @@
 	 ("j" . nil)
 	 ("k" . nil)
 	 ("l" . nil))
-  :config
-  (setq switch-window-input-style 'minibuffer
+	:config
+	(setq switch-window-input-style 'minibuffer
 	switch-window-shortcut-style 'qwerty
 	switch-window-multiple-frames nil
 	switch-window-qwerty-shortcuts
@@ -37,32 +37,33 @@
 ;; -------------------------------------------------------------------
 ;; Character jumping
 (use-package avy
-  :ensure t
-  :demand
-  :bind (("C-," . avy-goto-char-timer)
+	:ensure t
+	:demand
+	:bind (("C-," . avy-goto-char-timer)
 	 ("C-." . avy-goto-char-in-line)
 	 ("M-g s" . avy-goto-word-or-subword-1)
 	 ("M-g w" . avy-goto-word-1)
 	 ("M-g a" . avy-goto-word-0)
 	 ("M-g M-g" . avy-goto-line))
-  :config
-  (setq avy-keys '(?a ?r ?s ?t ?g ?k ?n ?e ?i ?o ?q ?w ?f ?p)
+	:config
+	(setq avy-keys '(?a ?r ?s ?t ?g ?k ?n ?e ?i ?o ?q ?w ?f ?p)
 	avy-dispatch-alist '((?w . avy-action-kill-move)
-			     (?W . avy-action-kill-stay)
-			     (?j . avy-action-teleport)
-			     (?m . avy-action-mark)
-			     (?c . avy-action-copy)
-			     (?y . avy-action-yank)
-			     (?i . avy-action-ispell)
-			     (?z . avy-action-zap-to-char))))
+					 (?W . avy-action-kill-stay)
+					 (?j . avy-action-teleport)
+					 (?m . avy-action-mark)
+					 (?c . avy-action-copy)
+					 (?y . avy-action-yank)
+					 (?i . avy-action-ispell)
+					 (?z . avy-action-zap-to-char))))
 
 (use-package frog-jump-buffer
-  :ensure t
-  :bind (("M-SPC" . frog-jump-buffer))
-  :config
-  (setq frog-menu-avy-keys '(?a ?r ?s ?t ?g ?k ?n ?e ?i ?o ?'
-				?q ?w ?f ?p ?b ?j ?l ?u ?y ?\;
-				?z ?x ?c ?d ?v ?m ?h ?, ?.)))
+	:ensure t
+	:bind (("M-SPC" . frog-jump-buffer))
+	:config
+	(setq frog-jump-buffer-ignore-buffers '("\\` " "*")
+				frog-menu-avy-keys '(?a ?r ?s ?t ?g ?k ?n ?e ?i ?o ?'
+																?q ?w ?f ?p ?b ?j ?l ?u ?y ?\;
+																?z ?x ?c ?d ?v ?m ?h ?, ?.)))
 
 ;; -------------------------------------------------------------------
 ;; General stuff
@@ -93,19 +94,19 @@
 ;; Hardcore mode
 (defconst hardcore-nav-mode t)
 (when hardcore-nav-mode
-  (global-set-key (kbd "<XF86Back>") nil)
-  (global-set-key (kbd "<XF86Forward>") nil)
-  (global-set-key (kbd "<right>") nil)
-  (global-set-key (kbd "<left>") nil)
-  (global-set-key (kbd "<up>") nil)
-  (global-set-key (kbd "<down>") nil)
-  (global-set-key (kbd "S-<right>") nil)
-  (global-set-key (kbd "S-<left>") nil)
-  (global-set-key (kbd "S-<up>") nil)
-  (global-set-key (kbd "C-<down>") nil)
-  (global-set-key (kbd "C-<right>") nil)
-  (global-set-key (kbd "C-<left>") nil)
-  (global-set-key (kbd "C-<up>") nil)
-  (global-set-key (kbd "C-<down>") nil)
-  (global-set-key (kbd "<Home>") nil)
-  (global-set-key (kbd "<End>") nil))
+	(global-set-key (kbd "<XF86Back>") nil)
+	(global-set-key (kbd "<XF86Forward>") nil)
+	(global-set-key (kbd "<right>") nil)
+	(global-set-key (kbd "<left>") nil)
+	(global-set-key (kbd "<up>") nil)
+	(global-set-key (kbd "<down>") nil)
+	(global-set-key (kbd "S-<right>") nil)
+	(global-set-key (kbd "S-<left>") nil)
+	(global-set-key (kbd "S-<up>") nil)
+	(global-set-key (kbd "C-<down>") nil)
+	(global-set-key (kbd "C-<right>") nil)
+	(global-set-key (kbd "C-<left>") nil)
+	(global-set-key (kbd "C-<up>") nil)
+	(global-set-key (kbd "C-<down>") nil)
+	(global-set-key (kbd "<Home>") nil)
+	(global-set-key (kbd "<End>") nil))
diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index 0ac6512..3dffd5c 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2021-01-04 15h49 EST (hobbies)>
+;; Time-stamp: <2021-01-07 00:32:16 (tslil@bison)>
 
 ;; -----------------------------------------------------------------------------
 ;; General setup
@@ -329,4 +329,5 @@
 	:init
 	(advice-add 'python-mode :before 'elpy-enable)
 	:config
-	(setq python-shell-interpreter "python3"))
+	(setq python-shell-interpreter "python3"
+				python-indent-offset 2))