Merge branch 'master' of git.greyserv.net:marrub/scripts

# Conflicts:
#	emacs/init.el

applications/alacritty.yml

@@ -19,9 +19,9 @@ scrolling:
 
 font:
   normal:
-    family: Dina
+    family: Iosevka
     style: Regular
-  size: 10.0
+  size: 12.0
   offset:
     x: 0
     y: 0

applications/mpv.conf

@@ -1,3 +1,4 @@
 save-position-on-quit
 resume-playback
 msg-level=all=warn
+sub-auto=fuzzy

emacs/early-init.el

@@ -30,20 +30,20 @@
 (set-face-attribute 'default nil :family "Courier Prime Code"
                     :height 120 :weight 'normal :width 'normal)
 
-(set-face-attribute 'variable-pitch nil :family "Source Sans Pro"
-                    :height 120 :weight 'normal :width 'normal)
-
 (copy-face 'default 'fixed-pitch)
 (copy-face 'default 'mode-line)
 
+;; fontset usage
+(dolist (range '((#x2310  . #x26bf)
+                 (#x26c0  . #x329f)
+                 (#x1f000 . #x1fa9f)))
+  (set-fontset-font t range "Noto Color Emoji"))
+
+(set-fontset-font t '(#x2e80 . #x9fff) "Noto Sans CJK JP")
+
 (setq agw-mode-line-family
       (if (string-equal system-type "windows-nt")
           "Noto Mono"
-          "tewi2a"))
-
-;; font alternatives
-(setq face-font-family-alternatives
-      '(("Courier Prime Code" "Noto Mono")
-        ("Source Sans Pro" "Noto Sans" "Noto Sans CJK JP" "Noto Color Emoji")))
+          "Iosevka"))
 
 ;; EOF

emacs/init.el

@@ -86,8 +86,8 @@
                   header-line
                   header-line-highlight))
           (set-face-attribute face nil
+                              :height 120
                               :family agw-mode-line-family
-                              :height 90
                               :weight 'normal
                               :width  'normal))
   (set-face-attribute 'mode-line nil
@@ -95,6 +95,26 @@
                       :foreground "#92ebf0"))
 
 ;; major modes
+(use-package mmm-mode
+  :ensure t
+  :init
+  (setq mmm-submode-decoration-level 0)
+  :config
+  (require 'mmm-auto)
+  (mmm-add-group 'rust-doc
+   '((rust-doc-line
+      :submode markdown-mode
+      :face mmm-comment-submode-face
+      :front "///\s+"
+      :back "\n")
+     (rust-doc-block
+      :submode markdown-mode
+      :face mmm-comment-submode-face
+      :front "/\\*\\*"
+      :back "\\*\\*/")))
+  (mmm-add-mode-ext-class 'ruby-mode nil 'here-doc)
+  (mmm-add-mode-ext-class 'rust-mode nil 'rust-doc))
+
 (use-package cc-mode
   :mode (("\\.zsc\\'" . c-mode)
          ("\\.zc\\'"  . c-mode))
@@ -119,20 +139,24 @@
   :hook ((markdown-mode . flyspell-mode))
   :mode (("\\.mdwn\\'" . markdown-mode)))
 
+(use-package ninja-mode
+  :ensure t)
+
 (use-package ruby-mode
+  :hook ((ruby-mode . mmm-mode))
   :init
   (defvaralias 'ruby-indent-level 'tab-width)
   (setq ruby-insert-encoding-magic-comment nil))
 
 (use-package rust-mode
   :ensure t
+  :hook ((rust-mode . mmm-mode))
   :init
   (defvaralias 'rust-indent-offset 'tab-width))
 
 ;; org-mode
 (use-package org
-  :hook ((org-mode . variable-pitch-mode)
-         (org-mode . flyspell-mode)
+  :hook ((org-mode . flyspell-mode)
          (org-mode . agw-org-mode))
   :init
   (setq org-fontify-whole-heading-line t
@@ -153,18 +177,6 @@
                                (file . find-file)
                                (wl . wl)))
   :config
-  (dolist (face '(org-block
-                  org-block-begin-line
-                  org-block-end-line
-                  org-checkbox
-                  org-code
-                  org-date
-                  org-document-info-keyword
-                  org-table
-                  org-verbatim
-                  org-special-keyword
-                  org-drawer))
-    (set-face-attribute face nil :inherit 'fixed-pitch))
   (set-face-attribute
    'org-document-title nil
    :foreground "#aa573c"

fish/prompt

@@ -19,7 +19,7 @@ function fish_right_prompt
 end
 
 function fish_greeting
-	if test -f /usr/share/dict/words && test (which shuf)
+	if test -f /usr/share/dict/words && test (which shuf) && test (which ruby)
 		set_color c50ed2
 
 		echo -n "Word of the moment: "(shuf -n1 /usr/share/dict/words) |

games/lutris/lutris.conf

@@ -1,5 +1,5 @@
 [lutris]
-migration_version = 6
+migration_version = 8
 dont-support-lutris = True
 width = 948
 height = 593