X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/7e876b3c19fb559577b9072fad56a52ea81bb2a9..1fb89b3237d4d7e9a16e189fb4d43e06557e2cec:/.emacs.d/init.el?ds=sidebyside

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index f8a44e7..28c1ba7 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -60,8 +60,7 @@
   ;;    (debbugs "0.29")
   ;;    (delight "1.7")
   ;;    (emms "7.7")
-  ;;    (rt-liberation "2.4")
-  ;;    (yasnippet "0.14.0")))
+  ;;    (rt-liberation "2.4")))
 (package-initialize))
 
 (setq package-archive-upload-base "/ssh:caffeine:~/www/p/elpa")
@@ -147,10 +146,9 @@
 (defalias 'yes-or-no-p #'y-or-n-p)
 
 (when (display-graphic-p)
+  ;; (set-frame-font "Source Code Pro-10.5:weight=medium" nil t)
+  ;; (set-frame-font "FreeSans" nil t)
   (set-fontset-font t 'arabic "Vazir"))
-;; ;; (set-frame-font "Drafting Mono-14:weight=light" nil t)
-;; (set-frame-font "Drafting Mono:pixelsize=16" nil t)
-;; (set-face-attribute 'bold nil :weight 'semi-bold)
 
 ;;;; Elisp-level customizations
 
@@ -317,7 +315,9 @@
 (when (display-graphic-p)
   (with-eval-after-load 'faces
     (let ((grey "#e7e7e7"))
-      (set-face-attribute 'fixed-pitch nil :family "Source Code Pro")
+      (set-face-attribute 'fixed-pitch nil
+                          :font "Source Code Pro"
+                          :weight 'medium)
       (set-face-attribute 'mode-line nil
                           :background grey
                           :inherit 'fixed-pitch))))
@@ -375,16 +375,16 @@ For disabling the behaviour for certain buffers and/or modes."
   (make-local-variable 'mouse-autoselect-window)
   (setq mouse-autoselect-window nil))
 
-(defun b/move-indentation-or-beginning-of-line (arg)
-  "Move to the indentation or to the beginning of line."
-  (interactive "^p")
-  ;; (if (bolp)
-  ;;     (back-to-indentation)
-  ;;   (move-beginning-of-line arg))
-  (if (= (point)
-         (progn (back-to-indentation)
-                (point)))
-      (move-beginning-of-line arg)))
+;; (defun b/move-indentation-or-beginning-of-line (arg)
+;;   "Move to the indentation or to the beginning of line."
+;;   (interactive "^p")
+;;   ;; (if (bolp)
+;;   ;;     (back-to-indentation)
+;;   ;;   (move-beginning-of-line arg))
+;;   (if (= (point)
+;;          (progn (back-to-indentation)
+;;                 (point)))
+;;       (move-beginning-of-line arg)))
 
 (defun b/join-line-top ()
   "Like `join-line', but join next line to the current line."
@@ -438,7 +438,7 @@ Effectively a very simple light/dark theme toggle switch."
 
 ;;; General key bindings
 
-(global-set-key (kbd "C-a") #'b/move-indentation-or-beginning-of-line)
+;; (global-set-key (kbd "C-a") #'b/move-indentation-or-beginning-of-line)
 (global-set-key (kbd "C-c i") #'ielm)
 (global-set-key (kbd "C-c d") #'b/duplicate-line-or-region)
 (global-set-key (kbd "C-c j") #'b/join-line-top)
@@ -778,31 +778,6 @@ Effectively a very simple light/dark theme toggle switch."
   ;; Highlight TODO in buffers.
   (global-hl-todo-mode))
 
-(run-with-idle-timer 0.6 nil #'require 'yasnippet)
-(with-eval-after-load 'yasnippet
-  (declare-function yas-reload-all
-                    "yasnippet" (&optional no-jit interactive))
-  (declare-function yas-maybe-expand-abbrev-key-filter
-                    "yasnippet" (cmd))
-
-  (defconst yas-verbosity-cur yas-verbosity)
-  (setq yas-verbosity 2
-        yas-snippet-dirs `(,(b/etc "yasnippet/snippets")))
-  ;; (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
-  (yas-reload-all)
-  (setq yas-verbosity yas-verbosity-cur)
-
-  (defun b/yas-maybe-expand-abbrev-key-filter (cmd)
-    (when (and (yas-maybe-expand-abbrev-key-filter cmd)
-               (not (bound-and-true-p git-commit-mode)))
-      cmd))
-  (defconst b/yas-maybe-expand
-    '(menu-item "" yas-expand
-                :filter b/yas-maybe-expand-abbrev-key-filter))
-  (define-key yas-minor-mode-map (kbd "SPC") b/yas-maybe-expand)
-
-  (yas-global-mode))
-
 ;; `debbugs'
 (global-set-key (kbd "C-c D d") #'debbugs-gnu)
 (global-set-key (kbd "C-c D b") #'debbugs-gnu-bugs)
@@ -880,8 +855,7 @@ Effectively a very simple light/dark theme toggle switch."
 (with-eval-after-load 'delight
   (delight 'auto-fill-function " f" "simple")
   (delight 'abbrev-mode "" "abbrev")
-  (delight 'mml-mode " mml" "mml")
-  (delight 'yas-minor-mode "" "yasnippet"))
+  (delight 'mml-mode " mml" "mml"))
 
 (require 'bandali-po)