commit 031cdb7319dd3e92b603ce42ab8ea1b8ce66c331 · ryan.freumh.org/nixos

flake.nix

···

       56
       56
        
                   #  (_: { patches = [ ./pkgs/package.patch ]; });

     

       57
       57
        
                   neovim-unwrapped = final.overlay-unstable.neovim-unwrapped;

     

       58
       58
        
                   stig = final.overlay-unstable.stig;

     

       59
       59
       +
                   pantalaimon = prev.callPackage ./pkgs/pantalaimon.nix { };

     

       59
       60
        
                 })

     

       60
       61
        
               ];

     

       61
       62
        
           in {

+1 -1

home/default.nix

···

       129
       129
        
               trust = "ultimate";

     

       130
       130
        
             }];

     

       131
       131
        
           };

     

       132
       132
       -
           services.gpg-agent.pinentryPackage = pkgs.pinentry-tty;

     

       132
       132
       +
           services.gpg-agent.pinentryPackage = pkgs.pinentry-qt;

     

       133
       133
        
       

     

       134
       134
        
           programs.git = {

     

       135
       135
        
             enable = true;

+26

home/emacs/config/appearance.el

···

       1
       1
       +
       (load-theme 'gruvbox-dark-medium t)

     

       2
       2
       +
       

     

       3
       3
       +
       (defun set-transparent-background ()

     

       4
       4
       +
         (when (not (display-graphic-p))

     

       5
       5
       +
           (set-face-attribute 'default nil :background "unspecified-bg")

     

       6
       6
       +
           (set-face-attribute 'line-number nil :background "unspecified-bg")

     

       7
       7
       +
           (set-face-attribute 'line-number-current-line nil :background "unspecified-bg"))

     

       8
       8
       +
         (when (display-graphic-p)

     

       9
       9
       +
           (set-frame-parameter nil 'alpha-background 80)

     

       10
       10
       +
           (add-to-list 'default-frame-alist '(alpha-background . 80))

     

       11
       11
       +
           (set-face-attribute 'line-number nil :background nil)

     

       12
       12
       +
           (set-face-attribute 'line-number-current-line nil :background nil))

     

       13
       13
       +
         )

     

       14
       14
       +
       

     

       15
       15
       +
       (add-hook 'window-setup-hook 'set-transparent-background)

     

       16
       16
       +
       

     

       17
       17
       +
       ; (menu-bar-mode -1)

     

       18
       18
       +
       (tool-bar-mode -1)

     

       19
       19
       +
       (scroll-bar-mode -1)

     

       20
       20
       +
       

     

       21
       21
       +
       (set-face-attribute 'default nil :height 110)

     

       22
       22
       +
       

     

       23
       23
       +
       (global-display-line-numbers-mode 1)

     

       24
       24
       +
       (setq display-line-numbers-type 'relative)

     

       25
       25
       +
       

     

       26
       26
       +
       (setq completion-show-help nil)

+167

home/emacs/config/email.el

···

       1
       1
       +
       (require 'mu4e)

     

       2
       2
       +
       

     

       3
       3
       +
       (setq mu4e-get-mail-command "mbsync -a")

     

       4
       4
       +
       

     

       5
       5
       +
       (setq sendmail-program "msmtp")

     

       6
       6
       +
       (setq message-sendmail-f-is-evil t)

     

       7
       7
       +
       (setq message-sendmail-extra-arguments '("--read-envelope-from"))

     

       8
       8
       +
       (setq message-send-mail-function 'message-send-mail-with-sendmail)

     

       9
       9
       +
       

     

       10
       10
       +
       (let ((full-name "Ryan Gibb")

     

       11
       11
       +
             (signature "Ryan Gibb"))

     

       12
       12
       +
         (setq mu4e-contexts

     

       13
       13
       +
       	`(,

     

       14
       14
       +
       	  (let ((mail-address "ryan@freumh.org")

     

       15
       15
       +
       		(dir-name (concat "/ryan@freumh.org")))

     

       16
       16
       +
       	    (make-mu4e-context

     

       17
       17
       +
       	     :name (concat "1 " mail-address)

     

       18
       18
       +
       	     :match-func

     

       19
       19
       +
       	     `(lambda (msg)

     

       20
       20
       +
       		(when msg

     

       21
       21
       +
       		  (string-match-p

     

       22
       22
       +
       		   ,(concat "^" dir-name)

     

       23
       23
       +
       		   (mu4e-message-field msg :maildir))))

     

       24
       24
       +
       	     :vars

     

       25
       25
       +
       	     `((user-mail-address    . ,mail-address)

     

       26
       26
       +
       	       (user-full-name       . ,full-name)

     

       27
       27
       +
       	       (mu4e-sent-folder     . ,(concat dir-name "/Sent"))

     

       28
       28
       +
       	       (mu4e-drafts-folder   . ,(concat dir-name "/Drafts"))

     

       29
       29
       +
       	       (mu4e-trash-folder    . ,(concat dir-name "/Trash"))

     

       30
       30
       +
       	       (mu4e-refile-folder   . ,(concat dir-name "/Archive"))

     

       31
       31
       +
       	       (mu4e-compose-signature . ,signature)

     

       32
       32
       +
       	       (mu4e-maildir-shortcuts .

     

       33
       33
       +
       				       ,'((:maildir "/ryan@freumh.org/Inbox"   :key ?i)

     

       34
       34
       +
       					  (:maildir "/ryan@freumh.org/Sent"    :key ?s)

     

       35
       35
       +
       					  (:maildir "/ryan@freumh.org/Drafts"  :key ?d)

     

       36
       36
       +
       					  (:maildir "/ryan@freumh.org/Archive" :key ?a)

     

       37
       37
       +
       					  (:maildir "/ryan@freumh.org/Trash"   :key ?t)))

     

       38
       38
       +
       	       )))

     

       39
       39
       +
       	  ,(let ((mail-address "ryangibb321@gmail.com")

     

       40
       40
       +
       		(dir-name (concat "/ryangibb321@gmail.com")))

     

       41
       41
       +
       	    (make-mu4e-context

     

       42
       42
       +
       	     :name (concat "2 " mail-address)

     

       43
       43
       +
       	     :match-func

     

       44
       44
       +
       	     `(lambda (msg)

     

       45
       45
       +
       		(when msg

     

       46
       46
       +
       		  (string-match-p

     

       47
       47
       +
       		   ,(concat "^" dir-name)

     

       48
       48
       +
       		   (mu4e-message-field msg :maildir))))

     

       49
       49
       +
       	     :vars

     

       50
       50
       +
       	     `((user-mail-address    . ,mail-address)

     

       51
       51
       +
       	       (user-full-name       . ,full-name)

     

       52
       52
       +
       	       (mu4e-sent-folder     . ,(concat dir-name "/[Gmail]/Sent Mail"))

     

       53
       53
       +
       	       (mu4e-drafts-folder   . ,(concat dir-name "/[Gmail]/Drafts"))

     

       54
       54
       +
       	       (mu4e-trash-folder    . ,(concat dir-name "/[Gmail]/Bin"))

     

       55
       55
       +
       	       (mu4e-refile-folder   . ,(concat dir-name "/[Gmail]/All Mail"))

     

       56
       56
       +
       	       (mu4e-compose-signature . ,signature)

     

       57
       57
       +
       	       (mu4e-maildir-shortcuts .

     

       58
       58
       +
       				       ,'((:maildir "/ryangibb321@gmail.com/Inbox"            :key ?i)

     

       59
       59
       +
       					  (:maildir "/ryangibb321@gmail.com/[Gmail]/Sent Mail"     :key ?s)

     

       60
       60
       +
       					  (:maildir "/ryangibb321@gmail.com/[Gmail]/Drafts"   :key ?d)

     

       61
       61
       +
       					  (:maildir "/ryangibb321@gmail.com/[Gmail]/All Mail" :key ?a)

     

       62
       62
       +
       					  (:maildir "/ryangibb321@gmail.com/[Gmail]/Bin"      :key ?t)))

     

       63
       63
       +
       	       )))

     

       64
       64
       +
       	  ,(let ((mail-address "ryan.gibb@cl.cam.ac.uk")

     

       65
       65
       +
       		(dir-name (concat "/ryan.gibb@cl.cam.ac.uk")))

     

       66
       66
       +
       	    (make-mu4e-context

     

       67
       67
       +
       	     :name (concat "3 " mail-address)

     

       68
       68
       +
       	     :match-func

     

       69
       69
       +
       	     `(lambda (msg)

     

       70
       70
       +
       		(when msg

     

       71
       71
       +
       		  (string-match-p

     

       72
       72
       +
       		   ,(concat "^" dir-name)

     

       73
       73
       +
       		   (mu4e-message-field msg :maildir))))

     

       74
       74
       +
       	     :vars

     

       75
       75
       +
       	     `((user-mail-address    . ,mail-address)

     

       76
       76
       +
       	       (user-full-name       . ,full-name)

     

       77
       77
       +
       	       (mu4e-sent-folder     . ,(concat dir-name "/Sent"))

     

       78
       78
       +
       	       (mu4e-drafts-folder   . ,(concat dir-name "/Drafts"))

     

       79
       79
       +
       	       (mu4e-trash-folder    . ,(concat dir-name "/Trash"))

     

       80
       80
       +
       	       (mu4e-refile-folder   . ,(concat dir-name "/Archive"))

     

       81
       81
       +
       	       (mu4e-compose-signature . ,signature)

     

       82
       82
       +
       	       (mu4e-maildir-shortcuts .

     

       83
       83
       +
       				       ,'((:maildir "/ryan.gibb@cl.cam.ac.uk/Inbox"     :key ?i)

     

       84
       84
       +
       					  (:maildir "/ryan.gibb@cl.cam.ac.uk/Sent" :key ?s)

     

       85
       85
       +
       					  (:maildir "/ryan.gibb@cl.cam.ac.uk/Drafts"    :key ?d)

     

       86
       86
       +
       					  (:maildir "/ryan.gibb@cl.cam.ac.uk/Archive"   :key ?a)

     

       87
       87
       +
       					  (:maildir "/ryan.gibb@cl.cam.ac.uk/Trash"     :key ?t)))

     

       88
       88
       +
       	       )))

     

       89
       89
       +
       	  ,(let ((mail-address "misc@freumh.org")

     

       90
       90
       +
       		(dir-name (concat "/misc@freumh.org")))

     

       91
       91
       +
       	    (make-mu4e-context

     

       92
       92
       +
       	     :name (concat "4 " mail-address)

     

       93
       93
       +
       	     :match-func

     

       94
       94
       +
       	     `(lambda (msg)

     

       95
       95
       +
       		(when msg

     

       96
       96
       +
       		  (string-match-p

     

       97
       97
       +
       		   ,(concat "^" dir-name)

     

       98
       98
       +
       		   (mu4e-message-field msg :maildir))))

     

       99
       99
       +
       	     :vars

     

       100
       100
       +
       	     `((user-mail-address    . ,mail-address)

     

       101
       101
       +
       	       (user-full-name       . ,full-name)

     

       102
       102
       +
       	       (mu4e-sent-folder     . ,(concat dir-name "/Sent"))

     

       103
       103
       +
       	       (mu4e-drafts-folder   . ,(concat dir-name "/Drafts"))

     

       104
       104
       +
       	       (mu4e-trash-folder    . ,(concat dir-name "/Trash"))

     

       105
       105
       +
       	       (mu4e-refile-folder   . ,(concat dir-name "/Archive"))

     

       106
       106
       +
       	       (mu4e-compose-signature . ,signature)

     

       107
       107
       +
       	       (mu4e-maildir-shortcuts .

     

       108
       108
       +
       				       ,'((:maildir "/misc@freumh.org/Inbox"   :key ?i)

     

       109
       109
       +
       					  (:maildir "/misc@freumh.org/Sent"    :key ?s)

     

       110
       110
       +
       					  (:maildir "/misc@freumh.org/Drafts"  :key ?d)

     

       111
       111
       +
       					  (:maildir "/misc@freumh.org/Archive" :key ?a)

     

       112
       112
       +
       					  (:maildir "/misc@freumh.org/Trash"   :key ?t)))

     

       113
       113
       +
       	       )))

     

       114
       114
       +
       

     

       115
       115
       +
                 )))

     

       116
       116
       +
       

     

       117
       117
       +
       (setq mu4e-context-policy 'pick-first)

     

       118
       118
       +
       

     

       119
       119
       +
       ; Fixing duplicate UID errors when using mbsync and mu4e

     

       120
       120
       +
       (setq mu4e-change-filenames-when-moving t)

     

       121
       121
       +
       

     

       122
       122
       +
       ; (setq mu4e-use-fancy-chars t)

     

       123
       123
       +
       ; (setq mu4e-attachment-dir "~/download")

     

       124
       124
       +
       (setq mu4e-view-show-images t)

     

       125
       125
       +
       

     

       126
       126
       +
       (setq mu4e-bookmarks

     

       127
       127
       +
             '((:name "Unified Inbox"

     

       128
       128
       +
                      :query "maildir:/ryan@freumh.org/Inbox OR maildir:/ryangibb321@gmail.com/Inbox OR maildir:/ryan.gibb@cl.cam.ac.uk/Inbox"

     

       129
       129
       +
       	       :favorite t

     

       130
       130
       +
                      :key ?i)

     

       131
       131
       +
               (:name "Unread messages"

     

       132
       132
       +
                      :query "flag:unread AND NOT flag:trashed AND NOT maildir:\"/ryangibb321@gmail.com/[Gmail]/All Mail\""

     

       133
       133
       +
                      :key ?u)

     

       134
       134
       +
               (:name "Today's messages"

     

       135
       135
       +
                      :query "date:today..now"

     

       136
       136
       +
                      :key ?t)

     

       137
       137
       +
               (:name "Last 7 days"

     

       138
       138
       +
                      :query "date:7d..now"

     

       139
       139
       +
                      :hide-unread t

     

       140
       140
       +
                      :key ?w)

     

       141
       141
       +
               (:name "Messages with images"

     

       142
       142
       +
                      :query "mime:image/*"

     

       143
       143
       +
                      :key ?p)))

     

       144
       144
       +
       

     

       145
       145
       +
       (setq mu4e-headers-fields

     

       146
       146
       +
             '((:maildir . 40)

     

       147
       147
       +
       	(:human-date . 12)

     

       148
       148
       +
       	(:flags . 6)

     

       149
       149
       +
       	(:mailing-list . 10)

     

       150
       150
       +
       	(:from-or-to . 22)

     

       151
       151
       +
       	(:thread-subject . nil)))

     

       152
       152
       +
       

     

       153
       153
       +
       (setq mu4e-search-show-threads nil)

     

       154
       154
       +
       

     

       155
       155
       +
       ; (with-eval-after-load "mm-decode"

     

       156
       156
       +
       ;   (add-to-list 'mm-discouraged-alternatives "text/html")

     

       157
       157
       +
       ;   (add-to-list 'mm-discouraged-alternatives "text/richtext"))

     

       158
       158
       +
       (setq shr-color-visible-luminance-min 80)

     

       159
       159
       +
       

     

       160
       160
       +
       (setq mail-user-agent 'mu4e-user-agent)

     

       161
       161
       +
       (setq message-dont-reply-to-names 'mu4e-personal-or-alternative-address-p)

     

       162
       162
       +
       

     

       163
       163
       +
       (setq mu4e-search-include-related nil)

     

       164
       164
       +
       

     

       165
       165
       +
       (evil-collection-define-key 'normal 'mu4e-main-mode-map (kbd "c") 'mu4e-search-query) ; should probably upsteam

     

       166
       166
       +
       (evil-collection-define-key 'normal 'mu4e-main-mode-map (kbd "i") 'mu4e-update-index)

     

       167
       167
       +

home/emacs/config/matrix.el

···

       1
       1
       +
       (setq ement-save-sessions t)

     

       2
       2
       +
       (evil-collection-define-key 'normal 'ement-room-mode-map (kbd "C-k") 'ement-view-room)

+17

home/emacs/config/save.el

···

       1
       1
       +
       (setq savehist-file "~/.emacs.d/savehist")

     

       2
       2
       +
       (savehist-mode 1)

     

       3
       3
       +
       (setq savehist-additional-variables

     

       4
       4
       +
             '(command-history

     

       5
       5
       +
               search-ring

     

       6
       6
       +
               regexp-search-ring

     

       7
       7
       +
               kill-ring))

     

       8
       8
       +
       (setq history-length 10000)

     

       9
       9
       +
       (setq savehist-save-minibuffer-history t)

     

       10
       10
       +
       

     

       11
       11
       +
       (desktop-save-mode 1)

     

       12
       12
       +
       (setq desktop-dirname "~/.emacs.d/desktop/")

     

       13
       13
       +
       (setq desktop-save t)

     

       14
       14
       +
       (add-hook 'emacs-startup-hook 'desktop-read)

     

       15
       15
       +
       

     

       16
       16
       +
       (setq backup-directory-alist `(("." . "~/.emacs.d/backups")))

     

       17
       17
       +

+80

home/emacs/config/vim.el

···

       1
       1
       +
       ; https://github.com/emacs-evil/evil-collection

     

       2
       2
       +
       (setq evil-want-integration t)

     

       3
       3
       +
       (setq evil-want-keybinding nil)

     

       4
       4
       +
       

     

       5
       5
       +
       (require 'evil)

     

       6
       6
       +
       (evil-mode 1)

     

       7
       7
       +
       

     

       8
       8
       +
       (define-key evil-normal-state-map (kbd "C-u") 'evil-scroll-up)

     

       9
       9
       +
       (define-key evil-visual-state-map (kbd "C-u") 'evil-scroll-up)

     

       10
       10
       +
       (global-set-key (kbd "C-x u") 'universal-argument)

     

       11
       11
       +
       

     

       12
       12
       +
       (add-hook 'minibuffer-setup-hook 'evil-insert-state)

     

       13
       13
       +
       

     

       14
       14
       +
       (setq evil-want-empty-ex-last-command nil)

     

       15
       15
       +
       

     

       16
       16
       +
       (global-undo-tree-mode)

     

       17
       17
       +
       (evil-set-undo-system 'undo-tree)

     

       18
       18
       +
       (setq undo-tree-visualizer-diff t)

     

       19
       19
       +
       (setq undo-tree-auto-save-history t)

     

       20
       20
       +
       (setq undo-tree-history-directory-alist

     

       21
       21
       +
         `(("." . ,(expand-file-name "undo-tree-history" user-emacs-directory))))

     

       22
       22
       +
       

     

       23
       23
       +
       (require 'evil-leader)

     

       24
       24
       +
       (global-evil-leader-mode)

     

       25
       25
       +
       (evil-leader/set-leader "<SPC>")

     

       26
       26
       +
       (evil-leader/set-key

     

       27
       27
       +
         "w" 'save-buffer)

     

       28
       28
       +
       (evil-leader/set-key

     

       29
       29
       +
         "u" 'undo-tree-visualize)

     

       30
       30
       +
       (evil-leader/set-key

     

       31
       31
       +
         "fb" 'helm-buffers-list)

     

       32
       32
       +
       

     

       33
       33
       +
       (require 'evil-collection)

     

       34
       34
       +
       ; (evil-collection-init)

     

       35
       35
       +
       (with-eval-after-load 'mu4e (evil-collection-mu4e-setup))

     

       36
       36
       +
       

     

       37
       37
       +
       ; (require 'vertico)

     

       38
       38
       +
       ; (vertico-mode)

     

       39
       39
       +
       ; 

     

       40
       40
       +
       ; (require 'consult)

     

       41
       41
       +
       ; (global-set-key (kbd "C-s") 'consult-line)

     

       42
       42
       +
       ; (define-key minibuffer-local-map (kbd "C-r") 'consult-history)

     

       43
       43
       +
       ; 

     

       44
       44
       +
       ; (require 'orderless)

     

       45
       45
       +
       ; (setq completion-styles '(orderless)

     

       46
       46
       +
       ;       completion-category-defaults nil

     

       47
       47
       +
       ;       completion-category-overrides '((file (styles partial-completion))))

     

       48
       48
       +
       ; 

     

       49
       49
       +
       ; (evil-leader/set-key

     

       50
       50
       +
       ;   "ff" 'consult-find

     

       51
       51
       +
       ;   "fg" 'consult-ripgrep)

     

       52
       52
       +
       ; 

     

       53
       53
       +
       ; (require 'posframe)

     

       54
       54
       +
       ; 

     

       55
       55
       +
       ; (require 'vertico-posframe)

     

       56
       56
       +
       ; (setq vertico-posframe-poshandler 'posframe-poshandler-frame-center)

     

       57
       57
       +
       ; (vertico-posframe-mode 1)

     

       58
       58
       +
       ; 

     

       59
       59
       +
       ; (setq consult-async-min-input 1)

     

       60
       60
       +
       ; 

     

       61
       61
       +
       ; (define-key minibuffer-local-map (kbd "C-w") 'backward-kill-word)

     

       62
       62
       +
       

     

       63
       63
       +
       ; esc quits

     

       64
       64
       +
       ; https://stackoverflow.com/questions/8483182/evil-mode-best-practice

     

       65
       65
       +
       (defun minibuffer-keyboard-quit ()

     

       66
       66
       +
         "Abort recursive edit.

     

       67
       67
       +
       In Delete Selection mode, if the mark is active, just deactivate it;

     

       68
       68
       +
       then it takes a second \\[keyboard-quit] to abort the minibuffer."

     

       69
       69
       +
         (interactive)

     

       70
       70
       +
         (if (and delete-selection-mode transient-mark-mode mark-active)

     

       71
       71
       +
             (setq deactivate-mark  t)

     

       72
       72
       +
           (when (get-buffer "*Completions*") (delete-windows-on "*Completions*"))

     

       73
       73
       +
           (abort-recursive-edit)))

     

       74
       74
       +
       (define-key evil-normal-state-map [escape] 'keyboard-quit)

     

       75
       75
       +
       (define-key evil-visual-state-map [escape] 'keyboard-quit)

     

       76
       76
       +
       (define-key minibuffer-local-map [escape] 'minibuffer-keyboard-quit)

     

       77
       77
       +
       (define-key minibuffer-local-ns-map [escape] 'minibuffer-keyboard-quit)

     

       78
       78
       +
       (define-key minibuffer-local-completion-map [escape] 'minibuffer-keyboard-quit)

     

       79
       79
       +
       (define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit)

     

       80
       80
       +
       (define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)

+30 -1

home/emacs/default.nix

···

       8
       8
        
             extraPackages = epkgs: with epkgs; [

     

       9
       9
        
               evil

     

       10
       10
        
               evil-leader

     

       11
       11
       +
               evil-collection

     

       12
       12
       +
               evil-ledger

     

       13
       13
       +
               evil-org

     

       11
       14
        
               undo-tree

     

       12
       15
        
               gruvbox-theme

     

       13
       13
       -
       	mu4e

     

       16
       16
       +
               helm

     

       17
       17
       +
               mu4e

     

       18
       18
       +
               ement

     

       19
       19
       +
               ledger-mode

     

       20
       20
       +
               org

     

       21
       21
       +
               org-evil

     

       14
       22
        
             ];

     

       15
       23
        
           };

     

       16
       24
        
           home.file = {

     

       17
       25
        
             ".emacs.d/init.el".source = ./init.el;

     

       26
       26
       +
              ".emacs.d/config".source = ./config;

     

       27
       27
       +
              ".mail.cap".text = ''

     

       28
       28
       +
                application/pdf; xdg-open %s

     

       29
       29
       +
              '';

     

       30
       30
       +
           };

     

       31
       31
       +
       

     

       32
       32
       +
           services.pantalaimon = {

     

       33
       33
       +
             enable = true;

     

       34
       34
       +
             settings = {

     

       35
       35
       +
               Default = {

     

       36
       36
       +
                 LogLevel = "Info";

     

       37
       37
       +
                 SSL = true;

     

       38
       38
       +
                 Notifications = "On";

     

       39
       39
       +
               };

     

       40
       40
       +
               Freumh = {

     

       41
       41
       +
                 Homeserver = "https://matrix.freumh.org";

     

       42
       42
       +
                 ListenAddress = "localhost";

     

       43
       43
       +
                 ListenPort = 8009;

     

       44
       44
       +
                 IgnoreVerification = true;

     

       45
       45
       +
               };

     

       46
       46
       +
             };

     

       18
       47
        
           };

     

       19
       48
        
         };

     

       20
       49
        
       }

+9 -58

home/emacs/init.el

···

       1
       1
       -
       (require 'evil)

     

       2
       2
       -
       (evil-mode 1)

     

       3
       3
       -
       

     

       4
       4
       -
       (define-key evil-normal-state-map (kbd "C-u") 'evil-scroll-up)

     

       5
       5
       -
       (define-key evil-visual-state-map (kbd "C-u") 'evil-scroll-up)

     

       6
       6
       -
       (global-set-key (kbd "C-x u") 'universal-argument)

     

       7
       7
       -
       

     

       8
       8
       -
       (define-key evil-normal-state-map (kbd "C-i") 'evil-jump-forward)

     

       9
       9
       -
       (define-key evil-visual-state-map (kbd "C-i") 'evil-jump-forward)

     

       10
       10
       -
       

     

       11
       11
       -
       (define-key evil-normal-state-map (kbd "C-o") 'evil-jump-backward)

     

       12
       12
       -
       (define-key evil-visual-state-map (kbd "C-o") 'evil-jump-backward)

     

       13
       13
       -
       

     

       14
       14
       -
       (global-undo-tree-mode)

     

       15
       15
       -
       (evil-set-undo-system 'undo-tree)

     

       16
       16
       -
       (setq undo-tree-visualizer-diff t)

     

       17
       17
       -
       (setq undo-tree-auto-save-history t)

     

       18
       18
       -
       (setq undo-tree-history-directory-alist

     

       19
       19
       -
         `(("." . ,(expand-file-name "undo-tree-history" user-emacs-directory))))

     

       1
       1
       +
       (add-to-list 'load-path "~/.emacs.d/config")

     

       20
       2
        
       

     

       21
       21
       -
       (require 'evil-leader)

     

       22
       22
       -
       (global-evil-leader-mode)

     

       23
       23
       -
       (evil-leader/set-leader "<SPC>")

     

       24
       24
       -
       (evil-leader/set-key

     

       25
       25
       -
         "w" 'save-buffer)

     

       26
       26
       -
       (evil-leader/set-key

     

       27
       27
       -
         "u" 'undo-tree-visualize)

     

       3
       3
       +
       (load "vim")

     

       4
       4
       +
       (load "appearance")

     

       5
       5
       +
       (load "save")

     

       6
       6
       +
       (load "email")

     

       7
       7
       +
       (load "matrix")

     

       28
       8
        
       

     

       29
       9
        
       ;; (setq interprogram-cut-function nil)

     

       30
       10
        
       ;; (setq interprogram-paste-function nil)

     

       31
       11
        
       

     

       32
       32
       -
       (load-theme 'gruvbox-dark-medium t)

     

       33
       33
       -
       (set-frame-parameter nil 'alpha-background 70)

     

       34
       34
       -
       (add-to-list 'default-frame-alist '(alpha-background . 70))

     

       35
       35
       -
       ;; (menu-bar-mode -1)

     

       36
       36
       -
       ;; (tool-bar-mode -1)

     

       37
       37
       -
       ;; (scroll-bar-mode -1)

     

       38
       38
       -
       (set-face-attribute 'default nil :height 110)

     

       12
       12
       +
       (require 'helm)

     

       13
       13
       +
       (helm-mode 1)

     

       39
       14
        
       

     

       40
       40
       -
       (global-display-line-numbers-mode 1)

     

       41
       41
       -
       (setq display-line-numbers-type 'relative)

     

       42
       42
       -
       (set-face-attribute 'line-number nil

     

       43
       43
       -
                           :foreground "gray"

     

       44
       44
       -
                           :background nil)

     

       45
       45
       -
       (set-face-attribute 'line-number-current-line nil

     

       46
       46
       -
                           :foreground "orange"

     

       47
       47
       -
                           :background nil)

     

       15
       15
       +
       (require 'ledger-mode)

     

       48
       16
        
       

     

       49
       49
       -
       (setq savehist-file "~/.emacs.d/savehist")

     

       50
       50
       -
       

     

       51
       51
       -
       (savehist-mode 1)

     

       52
       52
       -
       (setq savehist-additional-variables

     

       53
       53
       -
             '(command-history

     

       54
       54
       -
               search-ring

     

       55
       55
       -
               regexp-search-ring

     

       56
       56
       -
               kill-ring))

     

       57
       57
       -
       (setq history-length 10000)

     

       58
       58
       -
       (setq savehist-save-minibuffer-history t)

     

       59
       59
       -
       

     

       60
       60
       -
       (desktop-save-mode 1)

     

       61
       61
       -
       (setq desktop-dirname "~/.emacs.d/desktop/")

     

       62
       62
       -
       (setq desktop-save t)

     

       63
       63
       -
       (add-hook 'emacs-startup-hook 'desktop-read)

     

       64
       64
       -
       

     

       65
       65
       -
       (setq backup-directory-alist `(("." . "~/.emacs.d/backups")))

+8 -8

home/mail.nix

···

       10
       10
        
         sync-mail = pkgs.writeScriptBin "sync-mail" ''

     

       11
       11
        
           #!/usr/bin/env bash

     

       12
       12
        
           ${pkgs.isync}/bin/mbsync "$1"

     

       13
       13
       -
           ${pkgs.mu}/bin/mu index

     

       13
       13
       +
           ${pkgs.mu}/bin/mu index || ${pkgs.emacs29-pgtk}/bin/emacsclient --eval '(mu4e-update-index)'

     

       14
       14
        
         '';

     

       15
       15
        
         cfg = config.custom.mail;

     

       16
       16
        
       in {

     
···

       127
       127
        
                   enable = true;

     

       128
       128
        
                   boxes = [ "Inbox" ];

     

       129
       129
        
                   onNotify =

     

       130
       130
       -
                     "${pkgs.isync}/bin/mbsync ryan@freumh.org && ${pkgs.mu}/bin/mu index";

     

       130
       130
       +
                     "${pkgs.isync}/bin/mbsync ryan@freumh.org && ${pkgs.mu}/bin/mu index || ${pkgs.emacs29-pgtk}/bin/emacsclient --eval '(mu4e-update-index)'";

     

       131
       131
        
                 };

     

       132
       132
        
                 mbsync = {

     

       133
       133
        
                   enable = true;

     
···

       140
       140
        
                   enable = true;

     

       141
       141
        
                   extraAccounts = {

     

       142
       142
        
                     check-mail-cmd =

     

       143
       143
       -
                       "${pkgs.isync}/bin/mbsync ryan@freumh.org && ${pkgs.mu}/bin/mu index";

     

       143
       143
       +
                       "${pkgs.isync}/bin/mbsync ryan@freumh.org && ${pkgs.mu}/bin/mu index || ${pkgs.emacs29-pgtk}/bin/emacsclient --eval '(mu4e-update-index)'";

     

       144
       144
        
                     check-mail-timeout = "1m";

     

       145
       145
        
                     check-mail = "1h";

     

       146
       146
        
                     folders-sort =

     
···

       183
       183
        
                   enable = true;

     

       184
       184
        
                   boxes = [ "Inbox" ];

     

       185
       185
        
                   onNotify =

     

       186
       186
       -
                     "${pkgs.isync}/bin/mbsync misc@freumh.org && ${pkgs.mu}/bin/mu index";

     

       186
       186
       +
                     "${pkgs.isync}/bin/mbsync misc@freumh.org && ${pkgs.mu}/bin/mu index || ${pkgs.emacs29-pgtk}/bin/emacsclient --eval '(mu4e-update-index)'";

     

       187
       187
        
                 };

     

       188
       188
        
                 mbsync = {

     

       189
       189
        
                   enable = true;

     
···

       221
       221
        
                   enable = true;

     

       222
       222
        
                   boxes = [ "Inbox" ];

     

       223
       223
        
                   onNotify =

     

       224
       224
       -
                     "${pkgs.isync}/bin/mbsync ryan.gibb@cl.cam.ac.uk && ${pkgs.mu}/bin/mu index";

     

       224
       224
       +
                     "${pkgs.isync}/bin/mbsync ryan.gibb@cl.cam.ac.uk && ${pkgs.mu}/bin/mu index || ${pkgs.emacs29-pgtk}/bin/emacsclient --eval '(mu4e-update-index)'";

     

       225
       225
        
                 };

     

       226
       226
        
                 mbsync = {

     

       227
       227
        
                   enable = true;

     
···

       234
       234
        
                   enable = true;

     

       235
       235
        
                   extraAccounts = {

     

       236
       236
        
                     check-mail-cmd =

     

       237
       237
       -
                       "${pkgs.isync}/bin/mbsync ryan.gibb@cl.cam.ac.uk && ${pkgs.mu}/bin/mu index";

     

       237
       237
       +
                       "${pkgs.isync}/bin/mbsync ryan.gibb@cl.cam.ac.uk && ${pkgs.mu}/bin/mu index || ${pkgs.emacs29-pgtk}/bin/emacsclient --eval '(mu4e-update-index)'";

     

       238
       238
        
                     check-mail-timeout = "1m";

     

       239
       239
        
                     check-mail = "1h";

     

       240
       240
        
                     aliases = "rtg24@cam.ac.uk";

     
···

       274
       274
        
                   enable = true;

     

       275
       275
        
                   boxes = [ "Inbox" ];

     

       276
       276
        
                   onNotify =

     

       277
       277
       -
                     "${pkgs.isync}/bin/mbsync ryangibb321@gmail.com && ${pkgs.mu}/bin/mu index";

     

       277
       277
       +
                     "${pkgs.isync}/bin/mbsync ryangibb321@gmail.com && ${pkgs.mu}/bin/mu index || ${pkgs.emacs29-pgtk}/bin/emacsclient --eval '(mu4e-update-index)'";

     

       278
       278
        
                 };

     

       279
       279
        
                 mbsync = {

     

       280
       280
        
                   enable = true;

     
···

       287
       287
        
                   enable = true;

     

       288
       288
        
                   extraAccounts = {

     

       289
       289
        
                     check-mail-cmd =

     

       290
       290
       -
                       "${pkgs.isync}/bin/mbsync ryangibb321@gmail.com && ${pkgs.mu}/bin/mu index";

     

       290
       290
       +
                       "${pkgs.isync}/bin/mbsync ryangibb321@gmail.com && ${pkgs.mu}/bin/mu index || ${pkgs.emacs29-pgtk}/bin/emacsclient --eval '(mu4e-update-index)'";

     

       291
       291
        
                     check-mail-timeout = "1m";

     

       292
       292
        
                     check-mail = "1h";

     

       293
       293
        
                     folders-sort = [

+95

pkgs/pantalaimon.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , python3Packages

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , installShellFiles

     

       6
       6
       +
       , nixosTests

     

       7
       7
       +
       , gobject-introspection

     

       8
       8
       +
       , wrapGAppsNoGuiHook

     

       9
       9
       +
       , enableDbusUi ? true

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       python3Packages.buildPythonApplication rec {

     

       13
       13
       +
         pname = "pantalaimon";

     

       14
       14
       +
         version = "0.10.5";

     

       15
       15
       +
         pyproject = true;

     

       16
       16
       +
       

     

       17
       17
       +
         # pypi tarball miss tests

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "matrix-org";

     

       20
       20
       +
           repo = "pantalaimon";

     

       21
       21
       +
           rev = version;

     

       22
       22
       +
           hash = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk=";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         build-system = [

     

       26
       26
       +
           installShellFiles

     

       27
       27
       +
         ] ++ (with python3Packages; [

     

       28
       28
       +
           setuptools

     

       29
       29
       +
           pythonRelaxDepsHook

     

       30
       30
       +
         ]);

     

       31
       31
       +
       

     

       32
       32
       +
         pythonRelaxDeps = [

     

       33
       33
       +
           "matrix-nio"

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         dependencies = with python3Packages; [

     

       37
       37
       +
           aiohttp

     

       38
       38
       +
           appdirs

     

       39
       39
       +
           attrs

     

       40
       40
       +
           cachetools

     

       41
       41
       +
           click

     

       42
       42
       +
           janus

     

       43
       43
       +
           keyring

     

       44
       44
       +
           logbook

     

       45
       45
       +
           matrix-nio

     

       46
       46
       +
           peewee

     

       47
       47
       +
           prompt-toolkit

     

       48
       48
       +
         ]

     

       49
       49
       +
         ++ matrix-nio.optional-dependencies.e2e

     

       50
       50
       +
         ++ lib.optionals enableDbusUi optional-dependencies.ui;

     

       51
       51
       +
       

     

       52
       52
       +
         optional-dependencies.ui = with python3Packages; [

     

       53
       53
       +
           dbus-python

     

       54
       54
       +
           notify2

     

       55
       55
       +
           pygobject3

     

       56
       56
       +
           pydbus

     

       57
       57
       +
         ];

     

       58
       58
       +
       

     

       59
       59
       +
         nativeBuildInputs = [

     

       60
       60
       +
           wrapGAppsNoGuiHook

     

       61
       61
       +
           gobject-introspection

     

       62
       62
       +
         ];

     

       63
       63
       +
       

     

       64
       64
       +
         # Prevent double wrapping from wrapGApps and wrapPythonProgram

     

       65
       65
       +
         dontWrapGApps = true;

     

       66
       66
       +
         makeWrapperArgs = [

     

       67
       67
       +
           "\${gappsWrapperArgs[@]}"

     

       68
       68
       +
         ];

     

       69
       69
       +
       

     

       70
       70
       +
         nativeCheckInputs = with python3Packages; [

     

       71
       71
       +
           aioresponses

     

       72
       72
       +
           faker

     

       73
       73
       +
           pytest-aiohttp

     

       74
       74
       +
           pytestCheckHook

     

       75
       75
       +
         ]

     

       76
       76
       +
         ++ lib.flatten (lib.attrValues optional-dependencies);

     

       77
       77
       +
       

     

       78
       78
       +
         # darwin has difficulty communicating with server, fails some integration tests

     

       79
       79
       +
         doCheck = !stdenv.isDarwin;

     

       80
       80
       +
       

     

       81
       81
       +
         postInstall = ''

     

       82
       82
       +
           installManPage docs/man/*.[1-9]

     

       83
       83
       +
         '';

     

       84
       84
       +
       

     

       85
       85
       +
         passthru.tests = {

     

       86
       86
       +
           inherit (nixosTests) pantalaimon;

     

       87
       87
       +
         };

     

       88
       88
       +
       

     

       89
       89
       +
         meta = with lib; {

     

       90
       90
       +
           description = "End-to-end encryption aware Matrix reverse proxy daemon";

     

       91
       91
       +
           homepage = "https://github.com/matrix-org/pantalaimon";

     

       92
       92
       +
           license = licenses.asl20;

     

       93
       93
       +
           maintainers = with maintainers; [ valodim ];

     

       94
       94
       +
         };

     

       95
       95
       +
       }