diff --git a/hosts/dell-5590/nixos/configuration.nix b/hosts/dell-5590/nixos/configuration.nix index 8edeaec..ecf82aa 100644 --- a/hosts/dell-5590/nixos/configuration.nix +++ b/hosts/dell-5590/nixos/configuration.nix @@ -141,6 +141,8 @@ source-sans-pro source-serif-pro iosevka + roboto-mono + fira-code ]; }; diff --git a/hosts/dell-5590/nixpkgs/configs/init.el b/hosts/dell-5590/nixpkgs/configs/init.el index dabd4b3..c6ed879 100644 --- a/hosts/dell-5590/nixpkgs/configs/init.el +++ b/hosts/dell-5590/nixpkgs/configs/init.el @@ -1,7 +1,9 @@ -;;(scroll-bar-mode -1) -;;(tool-bar-mode -1) -;;(tooltip-mode -1) -;;(menu-bar-mode -1) +;; Keyboard-centric user interface +(setq inhibit-startup-message t) +(scroll-bar-mode -1) +(tool-bar-mode -1) +(menu-bar-mode -1) + (require 'package) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) ;; Comment/uncomment this line to enable MELPA Stable if desired. See `package-archive-priorities` @@ -43,19 +45,18 @@ ) whitespace-line-column 100) ; column at which whitespace-mode says the line is too long ;;(set-face-attribute 'default nil :font "JetBrains Mono" :height 150) -(global-set-key (kbd "C-c c") 'org-capture) -(global-set-key (kbd "C-c a") 'org-agenda) +;; themes +(use-package doom-themes + :init (load-theme 'doom-nord t) + :init (doom-themes-org-config)) (setq disabled-command-function nil) (setq inhibit-startup-screen t) (setq visible-bell t) -; Advanced per-language checks. -;;(require 'flycheck) -;;(global-flycheck-mode 1) -;;(setq flycheck-checker-error-threshold 1000) ; for large go files and the escape checker -;; -;;(setq flycheck-check-syntax-automatically '(mode-enabled save)) +;; Only y/n answers +(defalias 'yes-or-no-p 'y-or-n-p) + ;; Backup @@ -66,6 +67,18 @@ backup-by-copying t) ;; Copy all files, don't rename them. (setq vc-make-backup-files t) (setq backup-directory-alist '(("" . "~/.emacs.d/backup"))) +(defvar emacs-autosave-directory + (concat user-emacs-directory "autosaves/") + "This variable dictates where to put auto saves. It is set to a + directory called autosaves located wherever your .emacs.d/ is + located.") + +;; Sets all files to be backed up and auto saved in a single directory. +(setq backup-directory-alist + `((".*" . ,emacs-autosave-directory)) + auto-save-file-name-transforms + `((".*" ,emacs-autosave-directory t))) + (setq calendar-week-start-day 1) @@ -98,19 +111,16 @@ ;; (setq web-mode-css-indent-offset 2) ;; (setq web-mode-code-indent-offset 2)) -(use-package doom-themes - :init (load-theme 'doom-nord t) - :init (doom-themes-org-config)) (use-package direnv :config (direnv-mode)) -(use-package lsp-mode - :config (setq lsp-keymap-prefix "C-c l") - :config (setq lsp-signature-auto-activate t) - :config (setq lsp-enable-on-type-formatting nil) - :config (lsp-enable-which-key-integration t) - :hook (lsp-mode . electric-pair-mode)) +;; (use-package lsp-mode +;; :config (setq lsp-keymap-prefix "C-c l") +;; :config (setq lsp-signature-auto-activate t) +;; :config (setq lsp-enable-on-type-formatting nil) +;; :config (lsp-enable-which-key-integration t) +;; :hook (lsp-mode . electric-pair-mode)) ;;(use-package web-mode ;; :mode ("\\.json\\'" . web-mode) @@ -155,9 +165,6 @@ ;;(use-package org ;; (setq org-startup-folded t) -;; (setq org-agenda-files -;; "~/Nextcloud/PRIVE/13_Org/agenda-DRI.org" -;; "~/Nextcloud/PRIVE/13_Org/perso.org") ;; (setq org-refile-use-outline-path 'file) ;; (setq org-refile-targets ;; '(("~/Nextcloud/PRIVE/13_Org/DRI.org" :maxlevel . 3) @@ -174,14 +181,19 @@ ;; (setq org-agenda-custom-commands ;; '(("t" "Today" tags-todo "+LEVEL=1+CATEGORY=\"tasks\"|+SCHEDULED<=\"\"|+DEADLINE<=\"\"")))) ;; -;;(setq org-caldav-url "https://next20.produhost.net/remote.php/dav/calendars/alexandre") -;;(setq org-caldav-calendars -;; '((:calendar-id "alexandre-dri" :files ("~/Nextcloud/PRIVE/13_Org/agenda.org") -;; :inbox "~/Nextcloud/PRIVE/13_Org/agenda-DRI.org") -;; ) -;;) - - +(use-package org-caldav + :ensure t + :config + (setq org-caldav-url "https://next20.produhost.net/remote.php/dav/calendars/alexandre") + (setq org-caldav-calendars + '((:calendar-id "alexandre-dri" :files ("~/Nextcloud/PRIVE/13_Org/agenda.org") + :inbox "~/Nextcloud/PRIVE/13_Org/agenda-DRI.org") + ) + ) + (setq org-caldav-delete-org-entries 'never) + (setq org-caldav-delete-calenda-entries 'never) + (setq org-icalendar-timezone "Europe/Paris") +) (use-package magit) (setq magit-fetch-modules-jobs 16); fetch 16 modules in parallel @@ -212,9 +224,6 @@ (require 'org-mu4e) ;;store link to message if in header view, not to header query (setq org-mu4e-link-query-in-headers-mode nil) -(setq org-capture-templates - '(("t" "todo" entry (file+headline "~/todo.org" "Tasks") - "* TODO [#A] %?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n%a\n"))) (setq mail-user-agent 'mu4e-user-agent) (setq org-mu4e-link-query-in-headers-mode t) @@ -270,6 +279,15 @@ /One Emacs to rule them all/ #+end_signature") (org-msg-mode) +(autoload 'markdown-mode "markdown-mode" + "Major mode for editing Markdown files" t) +(add-to-list 'auto-mode-alist + '("\\.\\(?:md\\|markdown\\|mkd\\|mdown\\|mkdn\\|mdwn\\)\\'" . markdown-mode)) + +(autoload 'gfm-mode "markdown-mode" + "Major mode for editing GitHub Flavored Markdown files" t) +(add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode)) + ;; Org-Roam basic configuration (setq org-directory (concat (getenv "HOME") "/Nextcloud/PRIVE/13_Org")) @@ -288,21 +306,20 @@ ("C-c n t" . org-roam-tag-add) ("C-c n a" . org-roam-alias-add) ("C-c n l" . org-roam-buffer-toggle))))) -(autoload 'markdown-mode "markdown-mode" - "Major mode for editing Markdown files" t) -(add-to-list 'auto-mode-alist - '("\\.\\(?:md\\|markdown\\|mkd\\|mdown\\|mkdn\\|mdwn\\)\\'" . markdown-mode)) - -(autoload 'gfm-mode "markdown-mode" - "Major mode for editing GitHub Flavored Markdown files" t) -(add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode)) ;; org-mode (require 'org) (require 'remember) (require 'org-mouse) +(setq org-startup-folded t + org-pretty-entities t + org-hide-emphasis-markers t + org-startup-with-inline-images t + org-image-actual-width '(300)) ;; files with ".org" open in org-mode (add-to-list 'auto-mode-alist '("\\.org$" . org-mode)) + +(setq org-agenda-files '("~/Nextcloud/PRIVE/13_Org/agenda-DRI.org" "~/Nextcloud/PRIVE/13_Org/perso.org")) ;; one file org (defvar org-gtd-file "~/Nextcloud/PRIVE/13_Org/DRI.org") @@ -317,9 +334,6 @@ (global-set-key "\C-cr" 'org-remember) (global-set-key "\C-cg" 'gtd) - -(global-set-key (kbd "C-c l") 'org-store-link) - ;; This seems like a good basic set of keywords to start out with: (setq org-todo-keywords '((type "TODO" "SCHEDULED" "NEXT" "WAITING" "DONE"))) @@ -329,6 +343,19 @@ ("WAITING" . (:foreground "yellow" :background "magenta2" :bold t :weight bold)) ("DONE" . (:foreground "gray50" :background "gray30")))) +;; tags +(setq org-tag-alist '(("@devis" . ?w) ("@projet" . ?h) ("@client" . ?h) ("@prospect" . ?h) ("interne" . ?l))) + + +(setq org-tag-faces + '( + ("DEVIS" . (:foreground "OrangeRed" :weight bold)) + ("@projet" . (:foreground "IndianRed1" :weight bold)) + ("interne" . (:foreground "LimeGreen" :weight bold)) + ) +) + + ;; Remember support. This creates several files: ;; ;; ~/todo.org Where remembered TODO's are stored. @@ -342,8 +369,6 @@ ;; org file.) The out-of-sight, out-of-mind rule applies here---if I ;; don't review these auxiliary org-files, I'll probably forget what's ;; in them. - -(require 'remember) (setq org-reverse-note-order t) ;; note at beginning of file by default. (setq org-default-notes-file "~/remember.org") (setq remember-annotation-functions '(org-remember-annotation)) @@ -363,4 +388,4 @@ (setq org-agenda-prefix-format " %-17:c%?-12t% s") ;; https://gist.github.com/dandrews/4644693 - +(setq org-ellipsis "⤵")