Changeset 6cbb9a9 in dotfiles

Timestamp:

Nov 18, 2020, 8:39:02 PM (4 years ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

c1c560a

Parents:

d2872a5

git-author:

Mikhail Kirillov <w96k@…> (11/18/20 19:54:38)

git-committer:

Mikhail Kirillov <w96k@…> (11/18/20 20:39:02)

Message:

Update configs

Files:

• emacs/.emacs.d/.emacs-config.org (modified) (7 diffs)
• emacs/.gnus (modified) (1 diff)
• guix/config.scm (modified) (4 diffs)
• guix/user.scm (modified) (11 diffs)

emacs/.emacs.d/.emacs-config.org

@@ -134 +134 @@
 ** Эмодзи (для telega.el)
    #+BEGIN_SRC emacs-lisp
-     (use-package emojify)
+   (use-package emojify)
    #+END_SRC
    
+** Иконки (all the icons)
+   #+BEGIN_SRC emacs-lisp
+     (use-package all-the-icons-dired
+       :diminish
+       :init
+       (add-hook 'dired-mode-hook 'all-the-icons-dired-mode))
+
+     ;; (use-package all-the-icons-ivy-rich
+     ;;   :ensure t
+     ;;   :diminish
+     ;;   :init (all-the-icons-ivy-rich-mode 1))
+   #+END_SRC
 * Редактирование кода в общем
 ** Файловый менеджер
@@ -144 +156 @@
        :hook (dired-mode .  dired-hide-dotfiles-mode))
 
-     (require 'dired)
+(require 'dired)
 (setq dired-async-mode t)
 
@@ -150 +162 @@
 
 ;; Show files in kilobytes
-     (setq dired-listing-switches "-alh")
+(setq dired-listing-switches "-alh")
 
      (defun xah-dired-sort ()
@@ -176 +188 @@
 ;;   :hook (prog-mode . flymake-mode))
 
-(use-package flycheck
-  
-  :bind (("C-c e" . flycheck-list-errors))
-  :config
-  (setq-default left-fringe-width 8 right-fringe-width 8
-                flycheck-indication-mode 'right-margin
-                left-margin-width 1 right-margin-width 0)
-  (add-hook 'flycheck-mode-hook #'flycheck-set-indication-mode)
-  (global-flycheck-mode))
+     (use-package flycheck
+       
+       :bind (("C-c e" . flycheck-list-errors))
+       :config
+       (setq-default left-fringe-width 8 right-fringe-width 8
+                     flycheck-indication-mode 'right-margin
+                     left-margin-width 1 right-margin-width 0)
+       (add-hook 'flycheck-mode-hook #'flycheck-set-indication-mode)
+       (global-flycheck-mode))
+
+     (use-package flycheck-elsa
+       :ensure
+       :hook
+       (emacs-lisp-mode . flycheck-elsa-setup))
    #+END_SRC
 ** Дерево отмен
    #+BEGIN_SRC emacs-lisp
      ;;; Undo system
-     (use-package undo-tree
-       :diminish
-       :config (global-undo-tree-mode))
+(use-package undo-tree
+  :diminish
+  :config (global-undo-tree-mode))
    #+END_SRC
    
@@ -202 +219 @@
        :bind (("C-x C-d" . treemacs)))
 
-     (use-package treemacs-projectile
-       :ensure)
+(use-package treemacs-projectile
+  :ensure)
    #+END_SRC
 ** Автоформатирование
    #+BEGIN_SRC emacs-lisp
      ;;; Autoformatting code
-(use-package aggressive-indent
-  :ensure t
-:config (global-aggressive-indent-mode))
+     (use-package aggressive-indent
+       :ensure t
+     ;;:config (global-aggressive-indent-mode)
+     )
    #+END_SRC
 ** SSH
@@ -303 +321 @@
        (ivy-mode 1))
 
+     
+;; Workaround for slowness of ivy rich
+(defvar ivy-rich--ivy-switch-buffer-cache
+  (make-hash-table :test 'equal))
+
+(define-advice ivy-rich--ivy-switch-buffer-transformer
+    (:around (old-fn x) cache)
+  (let ((ret (gethash x ivy-rich--ivy-switch-buffer-cache)))
+    (unless ret
+      (setq ret (funcall old-fn x))
+      (puthash x ret ivy-rich--ivy-switch-buffer-cache))
+    ret))
+
+(define-advice +ivy/switch-buffer
+    (:before (&rest _) ivy-rich-reset-cache)
+  (clrhash ivy-rich--ivy-switch-buffer-cache))
+
+;; Icons in ivy
+(defun ivy-rich-switch-buffer-icon (candidate)
+  (with-current-buffer
+      (get-buffer candidate)
+    (let ((icon (all-the-icons-icon-for-mode major-mode)))
+      (if (symbolp icon)
+          (all-the-icons-icon-for-mode 'fundamental-mode)
+        icon))))
+
 (use-package ivy-rich
   :config 
-  (ivy-rich-mode))
+  (ivy-rich-mode)
+  (setcdr (assq t ivy-format-functions-alist) #'ivy-format-function-line)
+  (setq ivy-rich-display-transformers-list
+      '(ivy-switch-buffer
+        (:columns
+         (
+          (ivy-rich-switch-buffer-icon (:width 2))
+          (ivy-rich-candidate (:width 30))
+          (ivy-rich-switch-buffer-major-mode (:width 12 :face warning))
+          (ivy-rich-switch-buffer-project (:width 15 :face success))
+          (ivy-rich-switch-buffer-path (:width (lambda (x) (ivy-rich-switch-buffer-shorten-path x (ivy-rich-minibuffer-width 0.3))))))
+         :predicate
+         (lambda (cand) (get-buffer cand))))))
    #+END_SRC
 ** Автодополнение
@@ -747 +803 @@
       (substitute-key-definition 'kill-buffer 'kill-buffer-and-window global-map)
     #+END_SRC
-*** Аутлайн для лиспа на основе уровней комментов
-    #+BEGIN_SRC emacs-lisp
-      (use-package outshine
-        :diminish
-        :hook (emacs-lisp-mode-hook . outshine-mode))
-    #+END_SRC
 *** nobreak символы
     #+BEGIN_SRC emacs-lisp

emacs/.gnus

@@ -7 +7 @@
       '(nnimap "posteo"
                (nnimap-address "posteo.de")
-               (nnimap-server-port "imaps")
+               (nnimap-server-port "imaps")
                (nnimap-stream ssl)))
+
+(add-to-list 'gnus-secondary-select-methods '(nntp "news.gmane.io"))
 
 (setq smtpmail-smtp-server "posteo.de"

guix/config.scm

@@ -19 +19 @@
  linux
  python
+ gawk
  xdisorg)
 
@@ -50 +51 @@
 
     "vblank_mode=0"
+    
 
+    "vm.swappiness=5"
+    
     "thinkpad_acpi.fan_control=1"
-
-    ;;"cpufreq.default_governor="
     
     ;;"ahci.mobile_lpm_policy=1"
@@ -99 +101 @@
       "font-fira-code"
       "font-fira-mono"
+      "font-jetbrains-mono"
       "sbcl"
       "intel-vaapi-driver"
@@ -144 +147 @@
    (service special-files-service-type
             `(("/bin/bash"   ,(file-append bash "/bin/bash"))
-              ("/bin/python" ,(file-append python "/bin/python3"))))
+              ("/bin/python" ,(file-append python "/bin/python3"))
+              ("/bin/awk" ,(file-append gawk "/usr/bin/awk"))))
 
    (service nix-service-type)

guix/user.scm

@@ -2 +2 @@
  '(
    ;; Programming languages
-   ;;"julia"
-   ;;"bigloo"
+   "julia"
+   ;;"bigloo" ;; Doesn't compile
    "chibi-scheme"
    "perl"
@@ -18 +18 @@
    "polyml"
    "vala"
+   "erlang"
+   "elixir"
+   "fpc"
+   "p2c"
+   
 
 
@@ -39 +44 @@
    
    "alsa-utils"
-   ;;"ardour"
-   ;;"audacity" ;; Long to compile
+   ;;"ardour" ;; Long to compile
+   "audacity" ;; Long to compile
    "bash"
    "bashtop"
@@ -51 +56 @@
    "cpufrequtils"
    "cpupower"
+   "perf"
    "powertop"
    "curl"
@@ -56 +62 @@
    "djview"
    "djvulibre"
+   "dmidecode"
    "exercism"
    "mg"   ; Emacs-like 
@@ -64 +71 @@
    "emacs-ace-jump-mode"
    "emacs-all-the-icons"
+   "emacs-all-the-icons-dired"
    "emacs-avy"
    "emacs-bui"
@@ -82 +90 @@
    "emacs-dumb-jump"
    "emacs-edit-indirect"
+   "emacs-elixir-mode"
    "emacs-editorconfig"
    "emacs-elpy"
+   "emacs-erlang"
+   "emacs-ob-erlang"
    "emacs-emacsql"
    "emacs-emojify"
@@ -179 +190 @@
    "hicolor-icon-theme"
    "gnome-themes-extra"
-   "htop"
+   "htop" ;; Not really needed, because I mostly use top
    "pkg-config"
    "gobject-introspection"
    "icecat"
    "imagemagick"
+   "inkscape"
    "libreoffice"
    "llvm"
@@ -204 +216 @@
    "node"
    "nss-certs"
-   ;;"nyxt"
+   "nyxt"
    "openjdk"
    "openssh"
@@ -240 +252 @@
    "st"
    "stow"
+   "sysstat"
    "tcl"
    "tdlib"
@@ -285 +298 @@
    "minetest"
    "minetest-mineclone"
-   ;;"cataclysm-dda:tiles" ;; Long to rebuild every time
+   "cataclysm-dda:tiles" ;; Long to rebuild every time
    ))