diff --git a/.Xresources b/.Xresources
index ba3a4bf..3a22b41 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,20 +1,3 @@
-URxvt.scrollBar: false
-URxvt.internalBorder: 0
-URxvt.externalBorder: 0
-URxvt.borderLess: true
-URxvt.transparent: true
-URxvt.shading: 40
-URxvt.fading: 2%
-URxvt.depth: 16
-URxvt.fadeColor: grey
-UXTerm*faceName: Source Code Pro for Powerline:style=book
-! UXTerm*faceName: Dejavu Sans Mono for Powerline:style=book
-UXTerm*faceNameDoublesize: IPAGothic:style=Regular
-UXTerm*faceSize: 9
-UXTerm*borderLess: true
-UXTerm*externalBorder: 0
-UXTerm*internalBorder: 0
-URxvt.font: xft:Source Code Pro for Powerline:pixelsize=9
-
st.font: Source Code Pro for Powerline:style=book
-st.shell: fish
\ No newline at end of file
+
+st.shell: /usr/bin/fish
diff --git a/.nanorc b/.nanorc
index 008da5d..12b0002 100644
--- a/.nanorc
+++ b/.nanorc
@@ -1,32 +1,30 @@
+set atblanks
+
set autoindent
+
set backup
+set backupdir /home/phundrak/.cache/nano/backups/
+
set boldtext
+
+unset casesensitive
+
set constantshow
+
set linenumbers
-set morespace
+
+set regexp
+
set smarthome
-set smooth
+
set softwrap
+
set tabsize 2
+
set tabstospaces
-include /usr/share/nano/nanorc.nanorc
-include /usr/share/nano/asm.nanorc
-include /usr/share/nano/autoconf.nanorc
-include /usr/share/nano/changelog.nanorc
-include /usr/share/nano/c.nanorc
-include /usr/share/nano/cmake.nanorc
-include /usr/share/nano/css.nanorc
-include /usr/share/nano/default.nanorc
-include /usr/share/nano/html.nanorc
-include /usr/share/nano/java.nanorc
-include /usr/share/nano/javascript.nanorc
-include /usr/share/nano/json.nanorc
-include /usr/share/nano/makefile.nanorc
-include /usr/share/nano/man.nanorc
-include /usr/share/nano/nanohelp.nanorc
-include /usr/share/nano/python.nanorc
-include /usr/share/nano/rust.nanorc
-include /usr/share/nano/sh.nanorc
-include /usr/share/nano/tex.nanorc
-include /usr/share/nano/xml.nanorc
-include /usr/share/nano/yaml.nanorc
+
+set trimblanks
+
+set unix
+
+include ~/.config/nanorc/*.nanorc
diff --git a/.yadm/bootstrap b/.yadm/bootstrap
index 9f7aec8..e5ef618 100644
--- a/.yadm/bootstrap
+++ b/.yadm/bootstrap
@@ -44,6 +44,8 @@ printf "\n# Create directories for mounting ####################################
sudo mkdir -p /mnt/{USB,CD,Android}
sudo chown $USER:(id -g $USER) /mnt/{USB,CD,Android}
+mkdir -p $HOME/.cache/nano/backups
+
printf "\n# Set fish as the default shell ###############################################\n\n"
chsh -s /usr/bin/fish
diff --git a/README.org b/README.org
index 4d48700..25249fd 100644
--- a/README.org
+++ b/README.org
@@ -43,6 +43,7 @@
:END:
- [[#presentation][Presentation]]
- [[#features][Features]]
+ - [[#xresources][Xresources]]
- [[#screenshots][Screenshots]]
- [[#dependencies][Dependencies]]
- [[#installation][Installation]]
@@ -109,6 +110,32 @@
- And enough information below to get basically the same distro install as I
have on my main computer and my travel laptop.
+ 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.
+
+** Xresources
+ :PROPERTIES:
+ :CUSTOM_ID: h-e6f48975-3b86-4a75-a7e5-5cc9edbd9869
+ :HEADER-ARGS: :tangle ~/.Xresources
+ :END:
+ My Xresources file is very short. Indeed, it only contains two lines which
+ are dedicated to my =st= terminal to set its font and shell. The font is set
+ as follows.
+ #+BEGIN_SRC conf
+ st.font: Source Code Pro for Powerline:style=book
+ #+END_SRC
+ And I will set my shell like this:
+ #+BEGIN_SRC conf
+ st.shell: /usr/bin/fish
+ #+END_SRC
+
+ I used to have lines dedicated to UXTerm and URxvt, but I cast them out of my
+ system.
+
* Screenshots
:PROPERTIES:
:CUSTOM_ID: h-ee37502b-09a4-4668-88e2-1d4406252bd2
@@ -328,6 +355,11 @@
sudo chown $USER:(id -g $USER) /mnt/{USB,CD,Android}
#+END_SRC
+ We also need the following folder for our nano backups.
+ #+BEGIN_SRC fish :exports code
+ mkdir -p $HOME/.cache/nano/backups
+ #+END_SRC
+
*** Set user’s shell to fish
:PROPERTIES:
:CUSTOM_ID: h-c1a78394-c156-4a03-ae82-e5e9d4090dab
diff --git a/nanorc.org b/nanorc.org
new file mode 100644
index 0000000..f011714
--- /dev/null
+++ b/nanorc.org
@@ -0,0 +1,160 @@
+#+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