diff --git a/.local/bin/README.org b/.local/bin/README.org index 55b297d..f4ca20e 100644 --- a/.local/bin/README.org +++ b/.local/bin/README.org @@ -19,28 +19,29 @@ # ### HTML ##################################################################### #+HTML_DOCTYPE: html5 -#+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: -#+INFOJS_OPT: view:info toc:1 home:https://phundrak.fr/ toc:t -#+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: +#+INFOJS_OPT: view:info toc:1 home:https://phundrak.com/config toc:t +#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: * Table of Contents :TOC_4_gh:noexport: :PROPERTIES: :CUSTOM_ID: h-400070eb-725f-4416-a4c6-da3053df750b :END: + - [[#presentation][Presentation]] - [[#4chandl][4chandl]] - [[#askpass][Askpass]] @@ -213,7 +214,7 @@ :CUSTOM_ID: h-a4ccdc0f-6813-4207-9479-4d68296f5fdb :HEADER-ARGS: :tangle cnew :exports code :END: - =cnew= is a small utility script similar to but simpler than [[#cppnew][cppnew]] that + =cnew= is a small utility script similar to but simpler than cppnew that creates a CMake template C project from the template that already exists in [[file:~/dev/templateC][~/dev/templateC]]. This script is a fish script, so let’s insert the shebang. #+BEGIN_SRC fish @@ -519,7 +520,7 @@ #+END_SRC Now, let’s select the mount point of our partition. We’ll call the function - =getmount= described in [[#get-the-drive-to-mount][Get the drive to mount]] to select it. + =getmount= described in [[#h-a17825bd-96e2-4c90-99ef-b0f2895cffb6][Get the mount point]] to select it. #+BEGIN_SRC fish getmount #+END_SRC @@ -707,7 +708,7 @@ :CUSTOM_ID: h-646dc678-4d87-4fec-8130-5d7d0fc16756 :END: Now that we have declared our functions and set our variables, we’ll read the - temporary file described in [[#get-the-mountable-elements][Get the mountable elements]]. The amount of lines + temporary file described in [[#h-2307005f-385e-4149-b885-55e699c822bb][Get the mountable elements]]. The amount of lines is passed in a switch statement. #+BEGIN_SRC fish switch (wc -l < $TMPDRIVES) @@ -1003,7 +1004,7 @@ :END: If several types of unmountable drives are available, let’s ask the user which type to unmount based on the content of the temporary file declared in - [[#get-the-unmountable-drives][Get the unmountable drives]]. First, let’s declare the function. + [[#h-dab41471-4f69-4be8-8d77-58ccc604e4e2][Get the unmountable drives]]. First, let’s declare the function. #+BEGIN_SRC fish function asktype #+END_SRC @@ -1269,7 +1270,7 @@ :END: For some reason, =yadm= won’t stop making polybar crash. So, I created this script that will wrap yadm with a call to yadm, and then a call to - =polybar-launch= declared in [[#polybar-launch][Polybar-launch]]. This is a oneliner, as you can + =polybar-launch= declared in [[#h-68587918-879b-42db-b304-901d01233f95][Polybar-launch]]. This is a oneliner, as you can see below: #+BEGIN_SRC fish #!/usr/bin/env fish diff --git a/.spacemacs b/.spacemacs index bfeac68..cbdd8f2 100644 --- a/.spacemacs +++ b/.spacemacs @@ -186,6 +186,7 @@ This function should only modify configuration layer settings." meson-mode modern-cpp-font-lock multiple-cursors + org-sidebar outorg pinentry visual-fill-column @@ -270,7 +271,7 @@ It should only modify the values of Spacemacs settings." ;; If non-nil, a form that evaluates to a package directory. For example, to ;; use different package directories for different Emacs versions, set this ;; to `emacs-version'. (default 'emacs-version) - dotspacemacs-elpa-subdirectory nil + dotspacemacs-elpa-subdirectory 'emacs-version ;; One of `vim', `emacs' or `hybrid'. ;; `hybrid' is like `vim' except that `insert state' is replaced by the @@ -280,7 +281,6 @@ It should only modify the values of Spacemacs settings." ;; (default 'vim) dotspacemacs-editing-style '(hybrid :variables hybrid-mode-enable-evilified-state t - hybrid-mode-enable-hjkl-bindings nil hybrid-mode-default-state 'normal) ;; Specify the startup banner. Default value is `official', it displays @@ -353,10 +353,7 @@ It should only modify the values of Spacemacs settings." dotspacemacs-colorize-cursor-according-to-state t ;; Default font or prioritized list of fonts. - dotspacemacs-default-font '("DejaVu Sans Mono" - :size 8.0 - :weight normal - :width normal) + dotspacemacs-default-font '("FiraCode Nerd Font Mono" :size 8.0 :weight normal :width normal) ;; The leader key (default "SPC") dotspacemacs-leader-key "SPC" @@ -528,7 +525,7 @@ It should only modify the values of Spacemacs settings." ;; If non-nil, start an Emacs server if one is not already running. ;; (default nil) - dotspacemacs-enable-server t + dotspacemacs-enable-server nil ;; Set the emacs server socket location. ;; If nil, uses whatever the Emacs default is, otherwise a directory path @@ -539,7 +536,7 @@ It should only modify the values of Spacemacs settings." ;; If non-nil, advise quit functions to keep server open when quitting. ;; (default nil) - dotspacemacs-persistent-server t + dotspacemacs-persistent-server nil ;; List of search tool executable names. Spacemacs uses the first installed ;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'. @@ -747,14 +744,12 @@ biefore packages are loaded." (spacemacs/declare-prefix "off" "fish config") (spacemacs/declare-prefix "ofi" "i3 config") (spacemacs/declare-prefix "ofp" "polybar config") - (spacemacs/declare-prefix "ofb" "yadm README") + (spacemacs/declare-prefix "ofr" "yadm README") (spacemacs/declare-prefix "oi" "insert") (spacemacs/declare-prefix "oii" "invisible space") (spacemacs/declare-prefix "om" "multiple-cursors") (spacemacs/declare-prefix "oo" "org-mode") (spacemacs/declare-prefix "ooi" "custom IDs") - (spacemacs/declare-prefix "oop" "private.org") - (spacemacs/declare-prefix "oos" "school.org") (spacemacs/declare-prefix "oot" "tables") (spacemacs/declare-prefix "oott" "toggle width") (spacemacs/declare-prefix "oote" "expand") @@ -776,7 +771,7 @@ biefore packages are loaded." "oF" 'flycheck-mode "ofb" (lambda () (interactive) (find-file "~/.local/bin/README.org")) "off" (lambda () (interactive) (find-file "~/.config/fish/README.org")) - "ofi" (lambda () (interactive) (find-file "~/.config/i3/config##yadm.j2")) + "ofi" (lambda () (interactive) (find-file "~/.config/i3/README.org")) "ofp" (lambda () (interactive) (find-file "~/.config/polybar/config##yadm.j2")) "ofr" (lambda () (interactive) (find-file "~/README.org")) "ofo" 'find-file-at-point @@ -786,8 +781,7 @@ biefore packages are loaded." "omp" 'mc/mark-previous-like-this "oma" 'mc/mark-all-like-this "ooi" 'eos/org-add-ids-to-headlines-in-file - "oop" (lambda () (interactive) (find-file "~/org/private.org")) - "oos" (lambda () (interactive) (find-file "~/org/school.org")) + "ooT" 'org-sidebar-tree "oott" 'org-table-toggle-column-width "oote" 'org-table-expand "oots" 'org-table-shrink @@ -829,6 +823,11 @@ biefore packages are loaded." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (with-eval-after-load 'org + + (org-link-set-parameters + "file" + :face (lambda (path) (if (file-exists-p path) 'org-link 'org-warning))) + ;; custom org functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defun ck/org-confirm-babel-evaluate (lang body) (not (or (string= lang "latex") (string= lang "maxima")))) @@ -903,7 +902,6 @@ So a typical ID could look like \"Org-4nd91V40HI\"." (org-babel-do-load-languages 'org-babel-load-languages '((C . t) - (ditaa . t) (dot . t) (emacs-lisp . t) (gnuplot . t) @@ -911,6 +909,7 @@ So a typical ID could look like \"Org-4nd91V40HI\"." (makefile . t) (python . t) (R . t) + (sass . t) (scheme . t) (shell . t))) @@ -1217,7 +1216,7 @@ This function is called at the very end of Spacemacs initialization." '(org-export-headline-levels 4) '(package-selected-packages (quote - (dap-mode bui tree-mode xkcd vmd-mode visual-fill-column typit mmt sudoku restclient-helm pony-mode pacmacs ox-reveal outorg ob-restclient ob-http meson-mode ibuffer-projectile lv helm-w3m w3m graphviz-dot-mode flycheck-gometalinter transient ess-smart-equals ess-R-data-view ctable ess julia-mode eshell-git-prompt emoji-cheat-sheet-plus edit-indirect dockerfile-mode docker docker-tramp company-restclient restclient know-your-http-well company-quickhelp company-emoji company-emacs-eclim eclim atomic-chrome websocket 2048-game ox-gfm slime-company slime common-lisp-snippets erlang insert-shebang fish-mode company-shell faceup racket-mode treepy graphql yapfify yaml-mode xterm-color web-beautify twittering-mode toml-mode tagedit stickyfunc-enhance smeargle slim-mode shell-pop selectric-mode scss-mode sass-mode ranger rainbow-identifiers pytest pyenv-mode py-isort pug-mode plantuml-mode phpunit phpcbf php-auto-yasnippets pdf-tools tablist ox-pandoc orgit org-present org-pomodoro alert log4e gntp ob-elixir multi-term markdown-toc magit-gitflow magit-gh-pulls livid-mode live-py-mode json-snatcher js2-refactor js-doc htmlize hlint-refactor hindent helm-pydoc helm-hoogle helm-gitignore helm-css-scss haskell-snippets haml-mode gnuplot glsl-mode gitignore-mode github-search github-clone github-browse-file gitconfig-mode gitattributes-mode git-messenger gist gh marshal logito pcache ht gh-md flyspell-correct-helm flyspell-correct flycheck-rust pos-tip flycheck-mix flycheck-credo eshell-z eshell-prompt-extras esh-help drupal-mode disaster cython-mode dash-functional tern company-ghci company-ghc ghc color-identifiers-mode cmm-mode clang-format cargo auto-dictionary alchemist modern-cpp-font-lock yasnippet-snippets x86-lookup web-mode srefactor racer pyvenv pip-requirements pandoc-mode org-projectile org-category-capture org-mime org-download nasm-mode json-reformat intero imenu-list hy-mode git-timemachine git-link geiser flycheck-pos-tip flycheck-haskell evil-magit emmet-mode cmake-mode anaconda-mode rust-mode elixir-mode flycheck haskell-mode multiple-cursors skewer-mode simple-httpd markdown-mode magit magit-popup git-commit ghub with-editor pythonic emms gmail-message-mode ham-mode html-to-markdown flymd edit-server image-dired+ go-guru go-eldoc company-go go-mode unfill mwim company-web web-completion-data company-tern company-cabal company-c-headers company-auctex company-anaconda elcord xresources-theme sql-indent rainbow-mode php-extras php-mode mmm-mode json-mode js2-mode csv-mode coffee-mode auctex helm-company helm-c-yasnippet fuzzy company-statistics company auto-yasnippet yasnippet ac-ispell auto-complete ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))) + (org-sidebar dap-mode bui tree-mode xkcd vmd-mode visual-fill-column typit mmt sudoku restclient-helm pony-mode pacmacs ox-reveal outorg ob-restclient ob-http meson-mode ibuffer-projectile lv helm-w3m w3m graphviz-dot-mode flycheck-gometalinter transient ess-smart-equals ess-R-data-view ctable ess julia-mode eshell-git-prompt emoji-cheat-sheet-plus edit-indirect dockerfile-mode docker docker-tramp company-restclient restclient know-your-http-well company-quickhelp company-emoji company-emacs-eclim eclim atomic-chrome websocket 2048-game ox-gfm slime-company slime common-lisp-snippets erlang insert-shebang fish-mode company-shell faceup racket-mode treepy graphql yapfify yaml-mode xterm-color web-beautify twittering-mode toml-mode tagedit stickyfunc-enhance smeargle slim-mode shell-pop selectric-mode scss-mode sass-mode ranger rainbow-identifiers pytest pyenv-mode py-isort pug-mode plantuml-mode phpunit phpcbf php-auto-yasnippets pdf-tools tablist ox-pandoc orgit org-present org-pomodoro alert log4e gntp ob-elixir multi-term markdown-toc magit-gitflow magit-gh-pulls livid-mode live-py-mode json-snatcher js2-refactor js-doc htmlize hlint-refactor hindent helm-pydoc helm-hoogle helm-gitignore helm-css-scss haskell-snippets haml-mode gnuplot glsl-mode gitignore-mode github-search github-clone github-browse-file gitconfig-mode gitattributes-mode git-messenger gist gh marshal logito pcache ht gh-md flyspell-correct-helm flyspell-correct flycheck-rust pos-tip flycheck-mix flycheck-credo eshell-z eshell-prompt-extras esh-help drupal-mode disaster cython-mode dash-functional tern company-ghci company-ghc ghc color-identifiers-mode cmm-mode clang-format cargo auto-dictionary alchemist modern-cpp-font-lock yasnippet-snippets x86-lookup web-mode srefactor racer pyvenv pip-requirements pandoc-mode org-projectile org-category-capture org-mime org-download nasm-mode json-reformat intero imenu-list hy-mode git-timemachine git-link geiser flycheck-pos-tip flycheck-haskell evil-magit emmet-mode cmake-mode anaconda-mode rust-mode elixir-mode flycheck haskell-mode multiple-cursors skewer-mode simple-httpd markdown-mode magit magit-popup git-commit ghub with-editor pythonic emms gmail-message-mode ham-mode html-to-markdown flymd edit-server image-dired+ go-guru go-eldoc company-go go-mode unfill mwim company-web web-completion-data company-tern company-cabal company-c-headers company-auctex company-anaconda elcord xresources-theme sql-indent rainbow-mode php-extras php-mode mmm-mode json-mode js2-mode csv-mode coffee-mode auctex helm-company helm-c-yasnippet fuzzy company-statistics company auto-yasnippet yasnippet ac-ispell auto-complete ws-butler winum which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))) '(pdf-view-midnight-colors (quote ("#655370" . "#fbf8ef"))) '(safe-local-variable-values (quote @@ -1226,9 +1225,6 @@ This function is called at the very end of Spacemacs initialization." (javascript-backend . lsp) (go-backend . go-mode) (go-backend . lsp)))) - '(send-mail-function (quote smtpmail-send-it)) - '(smtpmail-smtp-server "smtp.ionos.fr" t) - '(smtpmail-smtp-service 587 t) '(solaire-mode-auto-swap-bg t) '(vc-annotate-background "#282c34") '(vc-annotate-color-map diff --git a/README.org b/README.org index bd43139..b89f05a 100644 --- a/README.org +++ b/README.org @@ -19,9 +19,9 @@ # ### HTML ##################################################################### #+HTML_DOCTYPE: html5 -#+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: -#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: +#+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: @@ -31,7 +31,7 @@ #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: -#+INFOJS_OPT: view:info toc:1 home:https://phundrak.com/ toc:t +#+INFOJS_OPT: view:info toc:1 home:https://phundrak.com/config toc:t #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: #+HTML_HEAD_EXTRA: @@ -47,10 +47,11 @@ - [[#custom-scripts-in-path][Custom scripts in =PATH=]] - [[#email-signature][Email signature]] - [[#fish-configuration-with-useful-abbreviations][Fish configuration with useful abbreviations]] + - [[#i3-configuration][i3 configuration]] + - [[#global-gitignore][Global gitignore]] - [[#nano][Nano]] - [[#configuration][Configuration]] - [[#included-configuration-file][Included configuration file]] - - [[#global-gitignore][Global gitignore]] - [[#rustfmt][Rustfmt]] - [[#tmux-configuration][Tmux configuration]] - [[#xresources][Xresources]] @@ -144,10 +145,10 @@ Most of the org files you will find in this repos are the actual source code of much of my config files. For instance, the [[#h-c13d132f-9e69-4bb0-838b-29c7c5611f11][Execute bootstrap]] subpart of - this file exports almost all of its code snippets to [[file:.yadm/bootstrap][.yadm/bootstrap]] thanks to - =M-x org-babel-tangle= from within Emacs. Below I will also present and - comment some of my short config files which do not deserve to have a full org - file dedicated to them. + this file exports almost all of its code snippets to [[file:.config/yadm/bootstrap][.config/yadm/bootstrap]] + thanks to =M-x org-babel-tangle= from within Emacs. Below I will also present + and comment some of my short config files which do not deserve to have a full + org file dedicated to them. ** Custom scripts in =PATH= :PROPERTIES: @@ -180,8 +181,32 @@ :CUSTOM_ID: h-f35ed9a3-c9fc-458c-8a62-693f679f6992 :END: You can also find in [[file:.config/fish][.config/fish]] my Fish shell configuration, which contains - my usual abbreviations. Most of its configuration is made with fisher though, - and this is shown below in [[#install-fisher][Install =fisher=]].j + my usual abbreviations. + +** i3 configuration + :PROPERTIES: + :CUSTOM_ID: h-c918e370-d867-412c-8b0e-078e4e3772e0 + :END: + The i3 configuration is detailed in its corresponding README which you can + find at [[file:.config/i3/README.org][.config/i3/README.org]]. + +** Global gitignore + :PROPERTIES: + :CUSTOM_ID: h-4f92eb29-7cfa-48ec-b39d-39037ace3682 + :HEADER-ARGS: :tangle ~/.gitignore_global + :END: + Sometimes, there are some lines that always reappear in gitignores. So, + instead of always adding them, let git now that some elements are to be + ignored by default, hence the [[file:.gitignore_global][~/.gitignore_global]] file. First, we don’t want + nano’s backup files. + #+BEGIN_SRC text + ~* + #+END_SRC + + And output binaries generated by =gcc= and the likes aren’t welcome either. + #+BEGIN_SRC text + ,*.out + #+END_SRC ** Nano :PROPERTIES: @@ -297,24 +322,6 @@ include ~/.config/nanorc/*.nanorc #+END_SRC -** Global gitignore - :PROPERTIES: - :CUSTOM_ID: h-4f92eb29-7cfa-48ec-b39d-39037ace3682 - :HEADER-ARGS: :tangle ~/.gitignore_global - :END: - Sometimes, there are some lines that always reappear in gitignores. So, - instead of always adding them, let git now that some elements are to be - ignored by default, hence the [[file:.gitignore_global][~/.gitignore_global]] file. First, we don’t want - nano’s backup files. - #+BEGIN_SRC text - ~* - #+END_SRC - - And output binaries generated by =gcc= and the likes aren’t welcome either. - #+BEGIN_SRC text - ,*.out - #+END_SRC - ** Rustfmt :PROPERTIES: :CUSTOM_ID: h-0ae9005c-76a6-49f6-947c-0c8464616e10 @@ -504,9 +511,8 @@ When you boot into the live ISO, execute the following command: #+BEGIN_SRC sh :exports code pacman -Sy reflector - reflector --country France --country Germany --latest 200 \ - --protocol http --protocol https --sort rate \ - --save /etc/pacman.d/mirrorlist + reflector -c France -c Germany -l 200 -p http -p https --sort rate \ + --save /etc/pacman.d/mirrorlist --verbose #+END_SRC This will update the packages from your live ISO, and you will get the best mirrors for your installation. Of course, change the countries accordingly