Changeset 2865cf4 in dotfiles
- Timestamp:
- Sep 8, 2020, 11:30:04 PM (4 years ago)
- Branches:
- master
- Children:
- 8254fe1
- Parents:
- e93b7a8
- Files:
-
- 1 deleted
- 10 edited
-
X/.Xdefaults (modified) (2 diffs)
-
emacs/.emacs.d/.emacs-config.org (modified) (7 diffs)
-
emacs/.emacs.d/init.el~ (deleted)
-
guix/.bash_profile (modified) (2 diffs)
-
guix/.config/fontconfig/fonts.conf (modified) (2 diffs)
-
guix/.config/gtk-3.0/settings.ini (modified) (1 diff)
-
guix/.config/shepherd/init.scm (modified) (1 diff)
-
guix/.config/shepherd/services.scm (modified) (1 diff)
-
guix/config.scm (modified) (1 diff)
-
guix/user.scm (modified) (2 diffs)
-
wm/.stumpwmrc (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
X/.Xdefaults
re93b7a8 r2865cf4 1 !URxvt.termName: rxvt-256color1 URxvt.termName: rxvt-256color 2 2 3 3 !TomorrowNightEighties 4 *.foreground: # 0000005 *.background: # ffffff6 *.cursorColor: # 0000004 *.foreground: #cccccc 5 *.background: #2d2d2d 6 *.cursorColor: #f2777a 7 7 8 8 ! Black / Grey 9 *.color0: # ffffff10 *.color8: # 3333339 *.color0: #999999 10 *.color8: #666666 11 11 12 12 ! Red / Bright Red 13 *.color1: # a6000014 *.color9: # 97250013 *.color1: #f2777a 14 *.color9: #FF3334 15 15 16 16 ! Green + Bright Green 17 *.color2: # 005e0018 *.color10: # 315b0017 *.color2: #99cc99 18 *.color10: #9ec400 19 19 20 20 ! Yellow (Orange) + Bright Yellow (Yellow) 21 *.color3: # 813e0022 *.color11: # 70480f21 *.color3: #f99157 22 *.color11: #ffcc66 23 23 24 24 ! Blue + Bright Blue 25 *.color4: # 0030a626 *.color12: # 223fbf25 *.color4: #6699cc 26 *.color12: #6699cc 27 27 28 28 ! Magenta (Purple) + Bright Magenta 29 *.color5: # 72104230 *.color13: # 8f007529 *.color5: #cc99cc 30 *.color13: #b777e0 31 31 32 32 ! Cyan (Aqua) + Bright Cyan 33 *.color6: # 00538b34 *.color14: # 30517f33 *.color6: #66cccc 34 *.color14: #54ced6 35 35 36 36 ! Light Grey (Selection) + White (Current Line) 37 *.color7: # f0f0f038 *.color15: # f8f8f837 *.color7: #515151 38 *.color15: #393939 39 39 40 40 ! Xterm 41 XTerm.vt100*faceName: Fira Code42 XTerm*faceSize: 941 XTerm.vt100*faceName: Terminus 42 XTerm*faceSize: 10 43 43 XTerm*renderFont: true 44 44 45 45 ! URxvt 46 URxvt.font: xft: Fira Mono:style=Regular:size=10.547 URxvt.boldFont: xft: Fira Mono:style=Bold:size=10.548 URxvt.italicFont: xft: Fira Mono:style=Light:size=10.549 URxvt.letterSpace: -146 URxvt.font: xft: Terminus:style=Regular:size=10 47 URxvt.boldFont: xft:Terminus:style=Bold:size=10 48 URxvt.italicFont: xft:Terminus:style=Light:size=10 49 URxvt.letterSpace: 0 50 50 URxvt.scrollBar: false 51 51 URxvt.urlLauncher: icecat … … 55 55 Urxvt.visualBell: True 56 56 57 ! Emacs58 Emacs.fontBackend: xft59 Emacs.font: Fira Code:size=1460 61 57 ! Font Settings 62 Xft.autohint: 058 Xft.autohint: 1 63 59 Xft.lcdfilter: lcddefault 64 Xft.hintstyle: hint none65 Xft.hinting: 060 Xft.hintstyle: hintfull 61 Xft.hinting: 1 66 62 Xft.antialias: 1 67 63 Xft.rgba: rgb -
emacs/.emacs.d/.emacs-config.org
re93b7a8 r2865cf4 10 10 А также отступа между строк 11 11 #+BEGIN_SRC emacs-lisp 12 ;;; Set font 13 (add-to-list 'default-frame-alist '(font . "Fira Code-10.5")) 14 (set-frame-font "Fira Code-10.5" nil t) 15 (setq-default line-spacing 0) 16 17 (use-package fira-code-mode 18 :ensure 19 :hook prog-mode) 20 21 (global-prettify-symbols-mode) 12 ;;; Set font 13 (add-to-list 'default-frame-alist '(font . "Terminus-10")) 14 (set-frame-font "Terminus-10" nil t) 15 (setq-default line-spacing 0) 16 (global-prettify-symbols-mode) 17 18 ;; Fira Code with ligatures 19 ;; Needs better pc than my thinkpad x200t 20 ;; (when (window-system) 21 ;; (set-frame-font "Fira Code")) 22 ;; (add-to-list 'default-frame-alist '(font . "Fira Code-10.5")) 23 ;; (set-frame-font "Fira Code-10.5" nil t) 24 ;; (global-prettify-symbols-mode) 25 ;; (let ((alist '( 26 ;; (33 . ".\\(?:\\(?:==\\|!!\\)\\|[!=]\\)") 27 ;; (35 . ".\\(?:###\\|##\\|_(\\|[#(?[_{]\\)") 28 ;; (36 . ".\\(?:>\\)") 29 ;; (37 . ".\\(?:\\(?:%%\\)\\|%\\)") 30 ;; (38 . ".\\(?:\\(?:&&\\)\\|&\\)") 31 ;; (42 . ".\\(?:\\(?:\\*\\*/\\)\\|\\(?:\\*[*/]\\)\\|[*/>]\\)") 32 ;; (43 . ".\\(?:\\(?:\\+\\+\\)\\|[+>]\\)") ;; Broken 33 ;; (45 . ".\\(?:\\(?:-[>-]\\|<<\\|>>\\)\\|[<>}~-]\\)") 34 ;; (46 . ".\\(?:\\(?:\\.[.<]\\)\\|[.=-]\\)") 35 ;; (47 . ".\\(?:\\(?:\\*\\*\\|//\\|==\\)\\|[*/=>]\\)") ;; Broken 36 ;; (48 . ".\\(?:x[a-zA-Z]\\)") 37 ;; (58 . ".\\(?:::\\|[:=]\\)") 38 ;; (59 . ".\\(?:;;\\|;\\)") 39 ;; (60 . ".\\(?:\\(?:!--\\)\\|\\(?:~~\\|->\\|\\$>\\|\\*>\\|\\+>\\|--\\|<[<=-]\\|=[<=>]\\||>\\)\\|[*$+~/<=>|-]\\)") 40 ;; (61 . ".\\(?:\\(?:/=\\|:=\\|<<\\|=[=>]\\|>>\\)\\|[<=>~]\\)") 41 ;; (62 . ".\\(?:\\(?:=>\\|>[=>-]\\)\\|[=>-]\\)") 42 ;; (63 . ".\\(?:\\(\\?\\?\\)\\|[:=?]\\)") 43 ;; (91 . ".\\(?:]\\)") 44 ;; (92 . ".\\(?:\\(?:\\\\\\\\\\)\\|\\\\\\)") 45 ;; (94 . ".\\(?:=\\)") 46 ;; (119 . ".\\(?:ww\\)") 47 ;; (123 . ".\\(?:-\\)") 48 ;; (124 . ".\\(?:\\(?:|[=|]\\)\\|[=>|]\\)") 49 ;; (126 . ".\\(?:~>\\|~~\\|[>=@~-]\\)") 50 ;; ) 51 ;; )) 52 ;; (dolist (char-regexp alist) 53 ;; (set-char-table-range composition-function-table (car char-regexp) 54 ;; `([,(cdr char-regexp) 0 font-shape-gstring])))) 22 55 #+END_SRC 23 56 ** Назначение темы 24 57 Вы ее в видите в блоках кода 25 58 #+BEGIN_SRC emacs-lisp 26 (defmacro modus-themes-format-sexp (sexp &rest objects) 27 `(eval (read (format ,(format "%S" sexp) ,@objects)))) 28 29 (dolist (theme '("operandi" "vivendi")) 30 (modus-themes-format-sexp 31 (defun modus-%1$s-theme-load () 32 (setq modus-%1$s-theme-slanted-constructs t 33 modus-%1$s-theme-bold-constructs t 34 modus-%1$s-theme-fringes 'subtle ; {nil,'subtle,'intense} 35 modus-%1$s-theme-mode-line nil ; {nil,'3d,'moody} 36 modus-%1$s-theme-faint-syntax nil 37 modus-%1$s-theme-intense-hl-line nil 38 modus-%1$s-theme-intense-paren-match t 39 modus-%1$s-theme-prompts 'subtle ; {nil,'subtle,'intense} 40 modus-%1$s-theme-completions 'opinionated ; {nil,'moderate,'opinionated} 41 modus-%1$s-theme-diffs nil ; {nil,'desaturated,'fg-only} 42 modus-%1$s-theme-org-blocks 'rainbow ; {nil,'greyscale,'rainbow} 43 modus-%1$s-theme-variable-pitch-headings t 44 modus-%1$s-theme-rainbow-headings t 45 modus-%1$s-theme-section-headings t 46 modus-%1$s-theme-scale-headings t 47 modus-%1$s-theme-scale-1 1.05 48 modus-%1$s-theme-scale-2 1.1 49 modus-%1$s-theme-scale-3 1.15 50 modus-%1$s-theme-scale-4 1.20 51 modus-%1$s-theme-scale-5 1.25) 52 (load-theme 'modus-%1$s t)) 53 theme)) 54 55 (defun modus-themes-toggle () 56 "Toggle between `modus-operandi' and `modus-vivendi' themes." 57 (interactive) 58 (if (eq (car custom-enabled-themes) 'modus-operandi) 59 (progn 60 (disable-theme 'modus-operandi) 61 (modus-vivendi-theme-load)) 62 (disable-theme 'modus-vivendi) 63 (modus-operandi-theme-load))) 64 65 (modus-themes-toggle) 66 #+END_SRC 67 68 ** Отображение номера строк 69 #+BEGIN_SRC emacs-lisp 70 ;;; Отображение номера строки ненужно из-за наличия avy-jump 71 ;; (use-package display-line-numbers 72 ;; :init 73 ;; (setq display-line-numbers-type 'relative) 74 ;; (global-display-line-numbers-mode)) 59 ;;; Load a theme 60 ;;; https://emacsthemes.com/themes/sanityinc-tomorrow-themes.html 61 (use-package color-theme-sanityinc-tomorrow 62 :ensure 63 :config (load-theme 'sanityinc-tomorrow-eighties t)) 64 #+END_SRC 65 66 ** Мод-лайн 67 #+BEGIN_SRC emacs-lisp 68 (custom-set-faces 69 '(mode-line ((t (:background "#2d2d2d" 70 :foreground "#cccccc" 71 :box (:line-width 1 72 :color "#666666" 73 :style nil) 74 :weight bold 75 :height 1.0))))) 76 #+END_SRC 77 78 ** Отображение номера строк и пробелов 79 #+BEGIN_SRC emacs-lisp 80 81 (use-package display-line-numbers 82 :config 83 ;; Set absolute line numbers. A value of "relative" is also useful. 84 (setq display-line-numbers-type t) 85 ;; Those two variables were introduced in Emacs 27.1 86 (setq display-line-numbers-major-tick 20) 87 (setq display-line-numbers-minor-tick 5) 88 ;; Use absolute numbers in narrowed buffers 89 (setq display-line-numbers-widen t) 90 91 (define-minor-mode prot/display-line-numbers-mode 92 "Toggle `display-line-numbers-mode' and `hl-line-mode'." 93 :init-value nil 94 :global nil 95 (if prot/display-line-numbers-mode 96 (progn 97 (display-line-numbers-mode 1) 98 (hl-line-mode 1) 99 (setq-local truncate-lines t)) 100 (display-line-numbers-mode -1) 101 (hl-line-mode -1) 102 (setq-local truncate-lines nil))) 103 :bind ("<f7>" . prot/display-line-numbers-mode)) 104 105 (use-package whitespace 106 :config 107 (defun prot/toggle-invisibles () 108 "Toggles the display of indentation and space characters." 109 (interactive) 110 (if (bound-and-true-p whitespace-mode) 111 (whitespace-mode -1) 112 (whitespace-mode))) 113 :bind (("<f6>" . prot/toggle-invisibles) 114 ("C-c z" . delete-trailing-whitespace))) 75 115 #+END_SRC 76 116 ** Подсвечивать текущую строку … … 82 122 ** Эмодзи (для telega.el) 83 123 #+BEGIN_SRC emacs-lisp 84 (use-package emojify 85 :config 86 (global-emojify-mode) 87 (global-emojify-mode-line-mode)) 88 #+END_SRC 89 90 * Редактирование кода в общемsss 124 (use-package emojify) 125 #+END_SRC 126 127 * Редактирование кода в общем 91 128 ** Файловый менеджер 92 129 #+BEGIN_SRC emacs-lisp … … 163 200 #+END_SRC 164 201 ** Система контроля версий 165 Я стараюсь встроенный модуль VC 166 (VC > Magit) 167 168 #+BEGIN_SRC emacs-lisp 169 (use-package magit 170 :bind (("C-x g" . magit-status))) 202 Модуль VC + Magit 203 204 #+BEGIN_SRC emacs-lisp 205 (use-package magit 206 :bind (("C-x g" . magit-status))) 207 208 (use-package magit-todos 209 :hook (magit-mode . magit-todos)) 210 171 211 #+END_SRC 172 212 *** Пометки о модифицированных строках … … 183 223 (global-git-gutter+-mode) 184 224 (setq git-gutter+-window-width 1) 185 ;;(set-face-background 'git-gutter+-added "#99cc99")186 ;;(set-face-background 'git-gutter+-deleted "#f2777a")187 ;;(set-face-background 'git-gutter+-modified "#ffcc66")188 ;;(set-face-background 'git-gutter+-unchanged "#393939")225 (set-face-background 'git-gutter+-added "#99cc99") 226 (set-face-background 'git-gutter+-deleted "#f2777a") 227 (set-face-background 'git-gutter+-modified "#ffcc66") 228 (set-face-background 'git-gutter+-unchanged "#393939") 189 229 (setq git-gutter+-added-sign " ") 190 230 (setq git-gutter+-modified-sign " ") … … 639 679 *** Пункты списка для org-mode 640 680 #+BEGIN_SRC emacs-lisp 641 ;;; Bullets for org-mode 642 (use-package org-bullets 643 :commands org-bullets-mode 644 :config (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))) 681 ;;; Bullets for org-mode 682 (use-package org-bullets 683 :ensure 684 :commands org-bullets-mode 685 :hook (org-mode . org-bullets-mode)) 645 686 #+END_SRC 646 687 *** Агенда … … 696 737 (use-package telega 697 738 :config 698 (telega-mode-line-mode 1)699 739 (setq telega-chat-fill-column 60) 700 740 (setq telega-sticker-size '(8 . 32)) … … 863 903 (pdf-loader-install)) 864 904 #+END_SRC 865 ** Показать пробелы866 #+BEGIN_SRC emacs-lisp867 (use-package whitespace868 :config (global-set-key (kbd "C-c w") 'whitespace-mode))869 #+END_SRC870 905 ** Управление финансами 871 906 #+BEGIN_SRC emacs-lisp -
guix/.bash_profile
re93b7a8 r2865cf4 1 1 export PATH=$PATH:~/.bin:~/.local/bin 2 3 2 alias python=python3 4 3 … … 14 13 # Honor per-interactive-shell startup file 15 14 if [ -f ~/.bashrc ]; then . ~/.bashrc; fi 16 if [ -e /home/w96k/.nix-profile/etc/profile.d/nix.sh ]; then . /home/w96k/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer -
guix/.config/fontconfig/fonts.conf
re93b7a8 r2865cf4 26 26 </edit> 27 27 <edit name="hinting" mode="assign"> 28 <bool> false</bool>28 <bool>true</bool> 29 29 </edit> 30 30 <edit mode="assign" name="embeddedbitmap"> … … 32 32 </edit> 33 33 <edit mode="assign" name="hintstyle"> 34 <const>hint none</const>34 <const>hintfull</const> 35 35 </edit> 36 36 <edit mode="assign" name="lcdfilter"> -
guix/.config/gtk-3.0/settings.ini
re93b7a8 r2865cf4 2 2 gtk-key-theme-name = Emacs 3 3 gtk-primary-button-warps-slider = false 4 gtk-theme-name=High -Contrast4 gtk-theme-name=HighContrast -
guix/.config/shepherd/init.scm
re93b7a8 r2865cf4 3 3 (register-services emacs) 4 4 (action 'shepherd 'daemonize) ; send shepherd into background 5 (for-each start (list emacs ssh-agent ))5 (for-each start (list emacs ssh-agent redshift)) -
guix/.config/shepherd/services.scm
re93b7a8 r2865cf4 12 12 #:requires '() 13 13 #:start (make-system-constructor "eval $(ssh-agent)"))) 14 15 (define redshift 16 (make <service> 17 #:provides '(redshift) 18 #:requires '() 19 #:start (make-system-constructor "redshift -l 45:37") 20 #:stop (make-system-destructor 21 "pkill -f redshift"))) 22 23 (register-services emacs) 24 (register-services redshift) 25 -
guix/config.scm
re93b7a8 r2865cf4 66 66 "git" 67 67 "stow" 68 "guile-ssh" 68 69 "stumpwm")) 69 70 (list `(,stumpwm "lib")) -
guix/user.scm
re93b7a8 r2865cf4 92 92 "emacs-modus-vivendi-theme" 93 93 "emacs-explain-pause-mode" 94 "emacs-magit-todos" 94 95 ;; Emacs ends here 95 96 "evince" … … 202 203 "zip" 203 204 "redshift" 205 "mumble" 204 206 "universal-ctags")) -
wm/.stumpwmrc
re93b7a8 r2865cf4 22 22 (load-module "app-menu") 23 23 (load-module "swm-gaps") 24 ;;(load-module "screenshot")25 26 ;;(clx-truetype:cache-fonts)27 24 28 25 (print *time-modeline-string*) 29 30 ;; Colors from modus operandi31 (setf *colors*32 '("#454545" ; 033 "#a60000" ; 134 "#005e00" ; 235 "#813e00" ; 336 "#0033c0" ; 437 "#721045" ; 538 "#00538b" ; 639 "#191919" ; 740 "#f0f0f0" ; 841 "khaki3"))42 (update-color-map (current-screen))43 26 44 27 (setf *mode-line-pad-x* 0 … … 56 39 *hidden-window-color* "" 57 40 *cpu-modeline-fmt* "%C" 58 *mode-line-background-color* "# e0e0e0"41 *mode-line-background-color* "#2d2d2d" 59 42 *startup-mode-line* t 60 43 *window-name-source* :class 61 *delim* " ^ 4::^0"44 *delim* " ^2::^7 " 62 45 *screen-mode-line-format* (list 63 46 ;; Windows 64 "^ 4%v ^>"47 "^7%v ^>" 65 48 ;; CPU 66 "^ 0%C" *delim*49 "^7%C" *delim* 67 50 ;; RAM 68 51 "%M" *delim* … … 74 57 75 58 (set-normal-gravity :top) 76 ;;(set-win-bg-color "#2d2d2d")59 (set-win-bg-color "#2d2d2d") 77 60 78 61 (defcommand icecat () () … … 158 141 ;; ;; Show / Hide mode-line 159 142 ;; (define-key *root-map* (kbd "M") "mode-line") 160 161
Note:
See TracChangeset
for help on using the changeset viewer.
