From 7da7e9b4a73c805f1f4cefdeae28bd8b78c37ff6 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Sat, 26 Oct 2019 10:59:32 +0200 Subject: [PATCH] Merged README and nanorc, added reference to other configs, neovim Merged nanorc.org into README.org. Some new headers also reference other orgmode config files. Replaced vim with neovim. --- .yadm/bootstrap | 16 ++--- README.org | 162 +++++++++++++++++++++++++++++++++++++++++++++--- nanorc.org | 160 ----------------------------------------------- 3 files changed, 162 insertions(+), 176 deletions(-) delete mode 100644 nanorc.org diff --git a/.yadm/bootstrap b/.yadm/bootstrap index 8ecee4b..e9bf006 100755 --- a/.yadm/bootstrap +++ b/.yadm/bootstrap @@ -105,13 +105,13 @@ base-devel bat biber bleachbit bluez-firmware bluez-utils bookworm boost bzip2 \ chromium clisp compton cppcheck cppreference cppreference-devhelp cpupower \ cronie cryptsetup device-mapper diffutils discord-canary discount ditaa dmenu \ dmenu-lpass docker docker-compose doxygen dunst dwarffortress emacs \ -exfat-utils ffmpegthumbnailer findutils firefox flake8 font-mathematica \ -fontforge freeglut fzf gcc-libs gdb gimp glibc gnome-disk-utility \ -gnome-epub-thumbnailer gnu-free-fonts gnuplot go-tools graphviz htop i3-gaps \ -i3lock-blur i3status igdm-bin inetutils j4-dmenu-desktop jfsutils jmtpfs \ -lastpass-cli less linux-headers lldb logrotate lvm2 ly-git meson minted mpc \ -mpd mpd-rich-presence-discord-git mpv mupdf-tools nano ncdu ncmpcpp \ -nemo-fileroller nemo-preview neofetch netctl networkmanager \ +exfat-utils farbfel ffmpegthumbnailer findutils firefox flake8 \ +font-mathematica fontforge freeglut fzf gcc-libs gdb gimp glibc \ +gnome-disk-utility gnome-epub-thumbnailer gnu-free-fonts gnuplot go-tools \ +graphviz htop i3-gaps i3lock-blur i3status igdm-bin inetutils j4-dmenu-desktop \ +jfsutils jmtpfs lastpass-cli less linux-headers lldb logrotate lvm2 ly-git \ +meson minted mpc mpd mpd-rich-presence-discord-git mpv mupdf-tools nano ncdu \ +ncmpcpp nemo-fileroller nemo-preview neofetch neovim netctl networkmanager \ networkmanager-openvpn nm-connection-editor nnn nomacs noto-fonts-emoji npm \ ntfs-3g numlockx openssh p7zip pacman-contrib pandoc-bin pavucontrol pciutils \ pcurses pdfpc polybar pulseaudio-bluetooth python-envtpl-git python-pip \ @@ -124,7 +124,7 @@ texlive-localmanager-git tmux tree ttf-arphic-uming ttf-baekmuk \ ttf-bitstream-vera ttf-dejavu ttf-google-fonts-opinionated-git ttf-joypixels \ ttf-liberation ttf-material-design-icons-git ttf-ms-fonts ttf-symbola \ ttf-tibetan-machine ttf-twemoji-color ttf-unifont unicode unicode-emoji unrar \ -usbutils valgrind vim w3m wget x11-ssh-askpass xclip xdg-user-dirs-gtk \ +usbutils valgrind w3m wget x11-ssh-askpass xclip xdg-user-dirs-gtk \ xorg-drivers xorg-apps xfsprogs xorg-server xorg-xinit xss-lock yapf printf "\n# Installing needed packages ##################################################\n\n" diff --git a/README.org b/README.org index 9d9e6a5..b00b7ad 100644 --- a/README.org +++ b/README.org @@ -44,9 +44,15 @@ - [[#presentation][Presentation]] - [[#screenshots][Screenshots]] - [[#features][Features]] + - [[#custom-scripts-in-path][Custom scripts in =PATH=]] - [[#email-signature][Email signature]] + - [[#fish-configuration-with-useful-abbreviations][Fish configuration with useful abbreviations]] + - [[#nano][Nano]] + - [[#configuration][Configuration]] + - [[#included-configuration-file][Included configuration file]] - [[#global-gitignore][Global gitignore]] - [[#rustfmt][Rustfmt]] + - [[#tmux-configuration][Tmux configuration]] - [[#xresources][Xresources]] - [[#dependencies][Dependencies]] - [[#installation][Installation]] @@ -138,6 +144,17 @@ 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: + :CUSTOM_ID: h-d582e107-fa66-4f79-869e-2b49116ed1ec + :END: + I have written some scripts that help me daily accomplish some simple tasks, + like mounting and unmounting a drive or Android device, an emoji picker, a + utility to set up my Wacom tablet, and so on. You can find them stored in + [[file:.local/bin][.local/bin]] along with their detailed explanation in the [[file:.local/bin/README.org][README]] placed in the + same folder —which is actually their source code once the org-mode file gets + tangled. + ** Email signature :PROPERTIES: :CUSTOM_ID: h-f6c48286-a320-493f-b330-ee0a697e6d79 @@ -153,6 +170,128 @@ Please mind our planet, do you really need to print this email? #+END_SRC +** Fish configuration with useful abbreviations + :PROPERTIES: + :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 + +** Nano + :PROPERTIES: + :CUSTOM_ID: h-1724166b-55b7-4a64-9ff1-47c2a9e76f46 + :HEADER-ARGS: :tangle ~/.nanorc + :END: + Although it is a very simple piece of software, nano does offer some + customization. Here is mine. + +*** Configuration + :PROPERTIES: + :CUSTOM_ID: h-76aa0ff6-9e6a-4a35-974f-9132b08c8eb4 + :END: + When soft line wrapping is enabled, make it wrap lines at blank characters + (tabs and spaces) instead of always at the edge of the screen. + #+BEGIN_SRC conf + set atblanks + #+END_SRC + + Automatically indent a newly created line to the same number of tabs and/or + spaces as the previous line (or as the next line if the previous line is the + beginning of a paragraph). + #+BEGIN_SRC conf + set autoindent + #+END_SRC + + When saving a file, create a backup file by adding a tilde (=~=) to the + file's name. And make and keep not just one backup file, but make and keep a + uniquely numbered one every time a file is saved — when backups are enabled + with =set backup= or =--backup= or =-B=. The uniquely numbered files are + stored in the directory =~/.cache/nano/backups/=. + #+BEGIN_SRC conf + set backup + set backupdir /home/phundrak/.cache/nano/backups/ + #+END_SRC + + Use bold instead of reverse video for the title bar, status bar, key combos, + function tags, line numbers, and selected text. This can be overridden by + setting the options =titlecolor=, =statuscolor=, =keycolor=, + =functioncolor=, =numbercolor=, and =selectedcolor=. + #+BEGIN_SRC conf + set boldtext + #+END_SRC + + Do case-unsensitive searches by default. + #+BEGIN_SRC conf + unset casesensitive + #+END_SRC + + Constantly display the cursor position in the status bar. This overrides the + option =quickblank=. + #+BEGIN_SRC conf + set constantshow + #+END_SRC + + Display line numbers to the left of the text area. + #+BEGIN_SRC conf + set linenumbers + #+END_SRC + + Do regular-expression searches by default. Regular expressions in =nano= are + of the extended type (ERE). + #+BEGIN_SRC conf + set regexp + #+END_SRC + + Make the Home key smarter. When Home is pressed anywhere but at the very + beginning of non-whitespace characters on a line, the cursor will jump to + that beginning (either forwards or backwards). If the cursor is already at + that position, it will jump to the true beginning of the line. + #+BEGIN_SRC conf + set smarthome + #+END_SRC + + Enable soft line wrapping for easier viewing of very long lines. + #+BEGIN_SRC conf + set softwrap + #+END_SRC + + Use a tab size of a certain amount of columns. The value of number must be + greater than 0. The default value is 8. + #+BEGIN_SRC conf + set tabsize 2 + #+END_SRC + + Convert typed tabs to spaces. Sue me. + #+BEGIN_SRC conf + set tabstospaces + #+END_SRC + + Remove trailing whitespace from wrapped lines when automatic hard-wrapping + occurs or when text is justified. + #+BEGIN_SRC conf + set trimblanks + #+END_SRC + + Save a file by default in Unix format. This overrides nano's default + behavior of saving a file in the format that it had. (This option has no + effect when you also use =set noconvert=.) + #+BEGIN_SRC conf + set unix + #+END_SRC + +*** Included configuration file + :PROPERTIES: + :CUSTOM_ID: h-491cba80-5fa9-4b75-a9cb-2865ec39440a + :END: + Nano gives the opportunity to include some files located elsewhere. This is + why I added [[https://github.com/scopatz/nanorc][this repo]] as a submodule of my dotfiles so I can access a lot of + them at the same time. Since the submodule is cloned in =~/.config/nanorc=, + we can add only one line to include all of the =.nanorc= files. + #+BEGIN_SRC conf + include ~/.config/nanorc/*.nanorc + #+END_SRC + ** Global gitignore :PROPERTIES: :CUSTOM_ID: h-4f92eb29-7cfa-48ec-b39d-39037ace3682 @@ -271,6 +410,13 @@ wrap_comments = true #+END_SRC +** Tmux configuration + :PROPERTIES: + :CUSTOM_ID: h-4f48b912-b67b-4549-a671-802e76221f46 + :END: + You can find my tmux configuration in [[file:tmux.org][tmux.org]]. It depends on the submodule + [[https://github.com/gpakosz/.tmux.git][.tmux]] by [[https://pempek.net/][Gregory Pakosz]]. + ** Xresources :PROPERTIES: :CUSTOM_ID: h-e6f48975-3b86-4a75-a7e5-5cc9edbd9869 @@ -649,13 +795,13 @@ chromium clisp compton cppcheck cppreference cppreference-devhelp cpupower \ cronie cryptsetup device-mapper diffutils discord-canary discount ditaa dmenu \ dmenu-lpass docker docker-compose doxygen dunst dwarffortress emacs \ - exfat-utils ffmpegthumbnailer findutils firefox flake8 font-mathematica \ - fontforge freeglut fzf gcc-libs gdb gimp glibc gnome-disk-utility \ - gnome-epub-thumbnailer gnu-free-fonts gnuplot go-tools graphviz htop i3-gaps \ - i3lock-blur i3status igdm-bin inetutils j4-dmenu-desktop jfsutils jmtpfs \ - lastpass-cli less linux-headers lldb logrotate lvm2 ly-git meson minted mpc \ - mpd mpd-rich-presence-discord-git mpv mupdf-tools nano ncdu ncmpcpp \ - nemo-fileroller nemo-preview neofetch netctl networkmanager \ + exfat-utils farbfel ffmpegthumbnailer findutils firefox flake8 \ + font-mathematica fontforge freeglut fzf gcc-libs gdb gimp glibc \ + gnome-disk-utility gnome-epub-thumbnailer gnu-free-fonts gnuplot go-tools \ + graphviz htop i3-gaps i3lock-blur i3status igdm-bin inetutils j4-dmenu-desktop \ + jfsutils jmtpfs lastpass-cli less linux-headers lldb logrotate lvm2 ly-git \ + meson minted mpc mpd mpd-rich-presence-discord-git mpv mupdf-tools nano ncdu \ + ncmpcpp nemo-fileroller nemo-preview neofetch neovim netctl networkmanager \ networkmanager-openvpn nm-connection-editor nnn nomacs noto-fonts-emoji npm \ ntfs-3g numlockx openssh p7zip pacman-contrib pandoc-bin pavucontrol pciutils \ pcurses pdfpc polybar pulseaudio-bluetooth python-envtpl-git python-pip \ @@ -668,7 +814,7 @@ ttf-bitstream-vera ttf-dejavu ttf-google-fonts-opinionated-git ttf-joypixels \ ttf-liberation ttf-material-design-icons-git ttf-ms-fonts ttf-symbola \ ttf-tibetan-machine ttf-twemoji-color ttf-unifont unicode unicode-emoji unrar \ - usbutils valgrind vim w3m wget x11-ssh-askpass xclip xdg-user-dirs-gtk \ + usbutils valgrind w3m wget x11-ssh-askpass xclip xdg-user-dirs-gtk \ xorg-drivers xorg-apps xfsprogs xorg-server xorg-xinit xss-lock yapf #+END_SRC These are the minimum I would have in my own installation. You can edit it diff --git a/nanorc.org b/nanorc.org deleted file mode 100644 index f011714..0000000 --- a/nanorc.org +++ /dev/null @@ -1,160 +0,0 @@ -#+TITLE: Phundrak’s nano config -#+AUTHOR: Lucien "Phundrak” Cartier-Tilet -#+EMAIL: phundrak@phundrak.fr -#+OPTIONS: H:4 broken_links:mark email:t ^:{} auto-id:t - -# ### LaTeX #################################################################### -#+LATEX_CLASS: conlang -#+LaTeX_CLASS_OPTIONS: [a4paper,twoside] -#+LATEX_HEADER_EXTRA: \usepackage{tocloft} \setlength{\cftchapnumwidth}{3em} -#+LATEX_HEADER_EXTRA: \usepackage{xltxtra,fontspec,xunicode,svg} -#+LATEX_HEADER_EXTRA: \usepackage[total={17cm,24cm}]{geometry} -#+LATEX_HEADER_EXTRA: \setromanfont{Charis SIL} -#+LATEX_HEADER_EXTRA: \usepackage{xcolor} -#+LATEX_HEADER_EXTRA: \usepackage{hyperref} -#+LATEX_HEADER_EXTRA: \hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}} -#+LATEX_HEADER_EXTRA: \usepackage{multicol} -#+LATEX_HEADER_EXTRA: \usepackage{indentfirst} -#+LATEX_HEADER_EXTRA: \sloppy - -# ### 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: -#+INFOJS_OPT: view:info toc:1 home:https://phundrak.fr/ 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-193b6c50-9986-4e02-baee-5d9eb1e81773 - :END: -- [[#presentation][Presentation]] - - [[#configuration][Configuration]] - - [[#included-configuration-file][Included configuration file]] - -* Presentation - :PROPERTIES: - :CUSTOM_ID: h-1724166b-55b7-4a64-9ff1-47c2a9e76f46 - :HEADER-ARGS: :tangle ~/.nanorc - :END: - Although it is a very simple piece of software, nano does offer some - customization. Here is mine. - -** Configuration - :PROPERTIES: - :CUSTOM_ID: h-76aa0ff6-9e6a-4a35-974f-9132b08c8eb4 - :END: - When soft line wrapping is enabled, make it wrap lines at blank characters - (tabs and spaces) instead of always at the edge of the screen. - #+BEGIN_SRC conf - set atblanks - #+END_SRC - - Automatically indent a newly created line to the same number of tabs and/or - spaces as the previous line (or as the next line if the previous line is the - beginning of a paragraph). - #+BEGIN_SRC conf - set autoindent - #+END_SRC - - When saving a file, create a backup file by adding a tilde (=~=) to the - file's name. And make and keep not just one backup file, but make and keep a - uniquely numbered one every time a file is saved — when backups are enabled - with =set backup= or =--backup= or =-B=. The uniquely numbered files are - stored in the directory =~/.cache/nano/backups/=. - #+BEGIN_SRC conf - set backup - set backupdir /home/phundrak/.cache/nano/backups/ - #+END_SRC - - Use bold instead of reverse video for the title bar, status bar, key combos, - function tags, line numbers, and selected text. This can be overridden by - setting the options =titlecolor=, =statuscolor=, =keycolor=, =functioncolor=, - =numbercolor=, and =selectedcolor=. - #+BEGIN_SRC conf - set boldtext - #+END_SRC - - Do case-unsensitive searches by default. - #+BEGIN_SRC conf - unset casesensitive - #+END_SRC - - Constantly display the cursor position in the status bar. This overrides the - option =quickblank=. - #+BEGIN_SRC conf - set constantshow - #+END_SRC - - Display line numbers to the left of the text area. - #+BEGIN_SRC conf - set linenumbers - #+END_SRC - - Do regular-expression searches by default. Regular expressions in =nano= are - of the extended type (ERE). - #+BEGIN_SRC conf - set regexp - #+END_SRC - - Make the Home key smarter. When Home is pressed anywhere but at the very - beginning of non-whitespace characters on a line, the cursor will jump to - that beginning (either forwards or backwards). If the cursor is already at - that position, it will jump to the true beginning of the line. - #+BEGIN_SRC conf - set smarthome - #+END_SRC - - Enable soft line wrapping for easier viewing of very long lines. - #+BEGIN_SRC conf - set softwrap - #+END_SRC - - Use a tab size of a certain amount of columns. The value of number must be - greater than 0. The default value is 8. - #+BEGIN_SRC conf - set tabsize 2 - #+END_SRC - - Convert typed tabs to spaces. Sue me. - #+BEGIN_SRC conf - set tabstospaces - #+END_SRC - - Remove trailing whitespace from wrapped lines when automatic hard-wrapping - occurs or when text is justified. - #+BEGIN_SRC conf - set trimblanks - #+END_SRC - - Save a file by default in Unix format. This overrides nano's default behavior - of saving a file in the format that it had. (This option has no effect when - you also use =set noconvert=.) - #+BEGIN_SRC conf - set unix - #+END_SRC - -** Included configuration file - :PROPERTIES: - :CUSTOM_ID: h-491cba80-5fa9-4b75-a9cb-2865ec39440a - :END: - Nano gives the opportunity to include some files located elsewhere. This is - why I added [[https://github.com/scopatz/nanorc][this repo]] as a submodule of my dotfiles so I can access a lot of - them at the same time. Since the submodule is cloned in =~/.config/nanorc=, - we can add only one line to include all of the =.nanorc= files. - #+BEGIN_SRC conf - include ~/.config/nanorc/*.nanorc - #+END_SRC