Browse Source

Update host names

master
Nicolas Petton 2 months ago
parent
commit
36533722c8
No known key found for this signature in database GPG Key ID: E8BCD7866AFCF978
9 changed files with 288 additions and 261 deletions
  1. +138
    -174
      custom.el
  2. +3
    -0
      etc/transient/levels.el
  3. +0
    -0
      hosts/blueberry/init-exwm.el
  4. +1
    -0
      hosts/blueberry/init-notmuch.el
  5. +41
    -42
      hosts/blueberry/init-org-publish.el
  6. +15
    -11
      hosts/blueberry/init-org.el
  7. +0
    -0
      hosts/blueberry/init.el
  8. +0
    -1
      hosts/ws-rpi4
  9. +90
    -33
      init.el

+ 138
- 174
custom.el
File diff suppressed because it is too large
View File


+ 3
- 0
etc/transient/levels.el View File

@ -0,0 +1,3 @@
((magit-commit
(magit-commit-autofixup . 1)
(magit-commit-absorb . 1)))

hosts/ws-t480s/init-exwm.el → hosts/blueberry/init-exwm.el View File


hosts/ws-t480s/init-notmuch.el → hosts/blueberry/init-notmuch.el View File

@ -22,6 +22,7 @@
;; Sign messages by default
(add-hook 'message-setup-hook #'nico-maybe-sign-email)
(setq mml-secure-smime-encrypt-to-self t)
(defun nico-maybe-sign-email ()
"Sign the current buffer's email unless the message is sent to

hosts/ws-t480s/init-org-publish.el → hosts/blueberry/init-org-publish.el View File

@ -45,7 +45,6 @@
<li><a href='https://emacs.cafe'>Emacs Café</a></li>
<li><a href='/contact.html'>Contact</a></li>
<li><a href='http://github.com/NicolasPetton'><i class=\"fa fa-github\"></i></a></li>
<li><a href='http://instagram.com/nicolas_petton'><i class=\"fa fa-instagram\"></i></a></li>
<li><a href='http://twitter.com/NicolasPetton'><i class=\"fa fa-twitter\"></i></a></li>
</ul>
</div>
@ -69,49 +68,49 @@ Built with %c.
(setq org-publish-project-alist
`(("org"
:base-directory "~/work/nicolas-petton.fr/"
:base-extension "org"
:publishing-directory "~/Public/nicolas-petton.fr/"
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
:html-head ,(nico-html-head)
:html-preamble ,nico-website-html-preamble
:html-postamble ,nico-website-html-postamble)
("blog"
:base-directory "~/work/nicolas-petton.fr/blog"
:base-extension "org"
:publishing-directory "~/Public/nicolas-petton.fr/blog/"
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
:html-head ,(nico-blog-html-head)
:html-head-extra
:base-directory "~/work/nicolas-petton.fr/"
:base-extension "org"
:publishing-directory "~/Public/nicolas-petton.fr/"
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
:html-head ,(nico-html-head)
:html-preamble ,nico-website-html-preamble
:html-postamble ,nico-website-html-postamble)
("blog"
:base-directory "~/work/nicolas-petton.fr/blog"
:base-extension "org"
:publishing-directory "~/Public/nicolas-petton.fr/blog/"
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
:html-head ,(nico-blog-html-head)
:html-head-extra
"<link rel=\"alternate\" type=\"application/rss+xml\"
href=\"http://nicolas-petton.fr/blog/index.xml\"
title=\"RSS feed\">"
:html-preamble ,nico-website-html-preamble
:html-postamble ,nico-website-html-postamble)
("ressources"
:base-directory "~/work/nicolas-petton.fr/"
:base-extension "jpg\\|jpeg\\|gif\\|png\\|js\\|html\\|css\\|ogv\\|ogg\\|mp4\\|ico\\|asc"
:recursive t
:publishing-directory "~/Public/nicolas-petton.fr/"
:publishing-function org-publish-attachment)
("rss"
:base-directory "~/work/nicolas-petton.fr/blog/"
:base-extension "org"
:publishing-directory "~/Public/nicolas-petton.fr/blog/"
:publishing-function (org-rss-publish-to-rss)
:section-numbers nil
:table-of-contents nil
:html-link-home "http://nicolas-petton.fr/blog/"
:rss-image-url "http://nicolas-petton.fr/images/nicolas-petton.png"
:html-link-use-abs-url t)
("website" :components ("org" "blog" "rss" "ressources"))))
:html-preamble ,nico-website-html-preamble
:html-postamble ,nico-website-html-postamble)
("ressources"
:base-directory "~/work/nicolas-petton.fr/"
:base-extension "jpg\\|jpeg\\|gif\\|png\\|js\\|html\\|css\\|ogv\\|ogg\\|mp4\\|ico\\|asc"
:recursive t
:publishing-directory "~/Public/nicolas-petton.fr/"
:publishing-function org-publish-attachment)
("rss"
:base-directory "~/work/nicolas-petton.fr/blog/"
:base-extension "org"
:publishing-directory "~/Public/nicolas-petton.fr/blog/"
:publishing-function (org-rss-publish-to-rss)
:section-numbers nil
:table-of-contents nil
:html-link-home "http://nicolas-petton.fr/blog/"
:rss-image-url "http://nicolas-petton.fr/images/nicolas-petton.png"
:html-link-use-abs-url t)
("website" :components ("org" "blog" "rss" "ressources"))))
(provide 'init-org-publish)

hosts/ws-t480s/init-org.el → hosts/blueberry/init-org.el View File

@ -14,9 +14,21 @@
(require 's)
(require 'seq)
(add-hook 'org-mode-hook #'org-indent-mode)
;; preserve the indentation inside of source blocks
(setq org-src-preserve-indentation t)
(defface nico-org-buffer-face
'((t :family "Gentium Book Basic"
:height 1.3))
"Temporary buffer-local face")
(defun nico-set-org-buffer-face ()
(buffer-face-set 'nico-org-buffer-face ))
;; (add-hook 'org-mode-hook #'nico-set-org-buffer-face)
;; Allow's electric-pair-mode to surround things with = and ~ in org-mode
(modify-syntax-entry ?~ "(~" org-mode-syntax-table)
(modify-syntax-entry ?= "(=" org-mode-syntax-table)
@ -56,14 +68,9 @@ buffer to the matched subtree."
(setq org-agenda-files `(,org-default-notes-file
,nico/org-agenda-file
"~/org/gtd.org"
,nico/org-shared-agenda-file
"~/org/tickler.org"))
(setq org-refile-targets `(("~/org/gtd.org" :maxlevel . 3)
("~/org/someday.org" :level . 1)
(,nico/org-agenda-file :level . 1)
("~/org/tickler.org" :maxlevel . 2)
,nico/org-shared-agenda-file))
(setq org-refile-targets `((,nico/org-agenda-file :level . 1)
("~/org/inbox.org" :maxlevel . 1)
(,nico/org-shared-agenda-file :maxlevel . 1)))
@ -85,9 +92,6 @@ buffer to the matched subtree."
(add-to-list 'org-capture-templates
'("p" "Appt [agenda]" entry (file nico/org-shared-agenda-file)
"* %i%? \n%^T"))
(add-to-list 'org-capture-templates
'("T" "Tickler" entry (file+headline "~/org/tickler.org" "Tickler")
"* %i%? \nSCHEDULED: %^t"))
(defvar french-holiday
'((holiday-fixed 1 1 "Jour de l'an")

hosts/ws-t480s/init.el → hosts/blueberry/init.el View File


+ 0
- 1
hosts/ws-rpi4 View File

@ -1 +0,0 @@
./ws-t480s

+ 90
- 33
init.el View File

@ -1,7 +1,6 @@
;;; init.el --- user-init-file -*- lexical-binding: t -*-
;; Bootstrap quelpa
(package-initialize)
(unless (package-installed-p 'quelpa)
(with-temp-buffer
(url-insert-file-contents "https://github.com/quelpa/quelpa/raw/master/quelpa.el")
@ -206,11 +205,6 @@
:hook ((prog-mode . diff-hl-mode)
(magit-post-refresh . diff-hl-magit-post-refresh)))
(use-package direnv
:config (progn
(direnv-mode)
(setq direnv-always-show-summary nil)))
(use-package dired
:bind (:map dired-mode-map
("M-s" . find-name-dired)
@ -573,37 +567,90 @@ be global."
(setq nov-text-width 62)))
(use-package omnisharp
:after csharp-mode
:bind (:map omnisharp-mode-map
("C-c r" . omnisharp-run-code-action-refactoring)
("M-." . omnisharp-go-to-definition)
;; ("M-." . omnisharp-find-implementations)
("M-?" . omnisharp-find-usages))
:hook ((omnisharp-mode . configure-omnisharp)
(csharp-mode . omnisharp-mode))
:config
(progn
(add-to-list 'company-backends #'company-omnisharp)
(setq omnisharp-imenu-support t)
(defun configure-omnisharp ()
(local-set-key (kbd "C-c C-c") #'recompile))))
(use-package csharp-mode
:hook ((csharp-mode . configure-csharp))
:config (progn
(defun configure-csharp ()
(setq indent-tabs-mode nil)
(setq c-syntactic-indentation t)
(c-set-style "ellemtel")
(setq c-basic-offset 4)
(setq truncate-lines t)
(setq tab-width 4))))
;; (use-package omnisharp
;; :after csharp-mode
;; :bind (:map omnisharp-mode-map
;; ("C-c r" . omnisharp-run-code-action-refactoring)
;; ("M-." . omnisharp-go-to-definition)
;; ;; ("M-." . omnisharp-find-implementations)
;; ("M-?" . omnisharp-find-usages))
;; :hook ((omnisharp-mode . configure-omnisharp)
;; (csharp-mode . omnisharp-mode))
;; :config
;; (progn
;; (add-to-list 'company-backends #'company-omnisharp)
;; (setq omnisharp-imenu-support t)
;; (defun configure-omnisharp ()
;; (local-set-key (kbd "C-c C-c") #'recompile))))
;; (use-package csharp-mode
;; :hook ((csharp-mode . configure-csharp))
;; :config (progn
;; (defun configure-csharp ()
;; (setq indent-tabs-mode nil)
;; (setq c-syntactic-indentation t)
;; (c-set-style "ellemtel")
;; (setq c-basic-offset 4)
;; (setq truncate-lines t)
;; (setq tab-width 4))))
;; (use-package lsp-mode
;; :hook ((csharp-mode . lsp)
;; (js2-mode . lsp))
;; :config (progn
;; (setq lsp-keymap-prefix "C-c l"))
;; :commands lsp)
;; (use-package lsp-ui :commands lsp-ui-mode)
;; (use-package lsp-ivy :commands lsp-ivy-workspace-symbol)
;; (use-package dap-mode)
;; (use-package dap-LANGUAGE) ;; to load the dap adapter for your language
;; optional if you want which-key integration
(use-package which-key
:config
(which-key-mode))
(use-package open-url-at-point
:bind ("C-c C-o" . open-url-at-point))
(use-package org-roam
:ensure t
:hook
(after-init . org-roam-mode)
:custom
(org-roam-directory "~/org/roam/")
(org-roam-db-location (expand-file-name "roam.db" org-roam-directory))
(org-roam-completion-system 'ivy)
:bind (:map org-roam-mode-map
(("C-c r l" . org-roam)
("C-c r f" . org-roam-find-file)
("C-c r g" . org-roam-graph))
:map org-mode-map
(("C-c r i" . org-roam-insert))
(("C-c r I" . org-roam-insert-immediate))))
(use-package org-roam-protocol
:demand t
:after org-roam)
(use-package org-roam-server
:ensure t
:config
(setq org-roam-server-host "127.0.0.1"
org-roam-server-port 8080
org-roam-server-authenticate nil
org-roam-server-export-inline-images t
org-roam-server-serve-files nil
org-roam-server-served-file-extensions '("pdf" "mp4" "ogv")
org-roam-server-network-poll t
org-roam-server-network-arrows nil
org-roam-server-network-label-truncate t
org-roam-server-network-label-truncate-length 60
org-roam-server-network-label-wrap-length 20))
(use-package ox-twbs
:demand t
:after org)
@ -852,6 +899,16 @@ be global."
:bind (("C-+" . zoom-frm-in)
("C--" . zoom-frm-out)))
;; envrc must come late in the init.el file so add-hook adds it first
;; in `find-file-hook'.
;; (use-package envrc
;; :demand t
;; :config
;; (progn
;; (envrc-global-mode)
;; ;; ledger needs that for `ledger-toggle-current-transaction':
;; (unbind-key "C-c C-e" envrc-mode-map)))
(progn ; startup
(message "Loading %s...done (%.3fs)" user-init-file
(float-time (time-subtract (current-time)

Loading…
Cancel
Save