diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 40585ed..74bbf4c 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -1,6 +1,8 @@
#!/usr/bin/fish
# -*- mode: fish -*-
+yadm decrypt
+
set keyboardconf \
'Section "InputClass"
Identifier "system-keyboard"
@@ -49,7 +51,7 @@ mkdir -p $HOME/.cache/nano/backups
printf "\n# Set fish as the default shell ###############################################\n\n"
chsh -s /usr/bin/fish
-if ! test which yay
+if ! test (which yay)
printf "\n# Installing yay ##############################################################\n\n"
cd
mkdir -p fromGIT
@@ -61,44 +63,6 @@ else
printf "\n# yay already installed #######################################################\n\n"
end
-printf "\n# Installing Spacemacs ########################################################\n\n"
-rm -rf ~/.emacs.d
-
-git clone --single-branch --branch develop https://github.com/syl20bnr/spacemacs ~/.emacs.d
-
-yadm checkout -- ~/.emacs.d/private/
-
-if ! test (echo "phundrak" | sed -e "s/^.*$USER//I")
-
-printf "\n# Update yadm’s remotes #######################################################\n\n"
-yadm remote set-url origin git@labs.phundrak.fr:phundrak/dotfiles.git
-yadm remote add github git@github.com:phundrak/dotfiles.git
-
-printf "\n# Decrypt encrypted dotfiles ##################################################\n\n"
-yadm decrypt
-
-end
-
-printf '\n# Install envtpl ##############################################################\n\n'
-yay -Syu python-envtpl-git
-
-printf "\n# Getting yadm susbmodules ####################################################\n\n"
-yadm submodule update --init --recursive
-
-printf "\n# Generating alt files ########################################################\n\n"
-yadm alt
-
-for f in (find ~/.etc -type f)
- set dest (echo $f | sed -n 's/^.*etc\(.*\)$/\/etc\1/p')
- sudo ln -s $f $dest
-end
-
-read --prompt "echo 'Symlink .nanorc to root’s .nanorc? (Y/n): ' " -l nanoroot
-if test $nanoroot = 'y' || test $nanoroot = "Y" || test $nanoroot = ''
- printf "\n# Symlinking .nanorc to root’s .nanorc ########################################\n\n"
- sudo ln -s $HOME/.nanorc /root/.nanorc
-end
-
set PACKAGES \
acpilight asar ascii aspell-en aspell-fr assimp awesome-terminal-fonts \
base-devel bat biber bleachbit bluez-firmware bluez-utils bookworm boost bzip2 \
@@ -129,11 +93,38 @@ ttf-liberation ttf-material-design-icons-git ttf-ms-fonts ttf-symbola \
ttf-tibetan-machine ttf-twemoji-color ttf-unifont typescript unicode \
unicode-emoji unrar usbutils valgrind vscode-css-languageserver-bin w3m wget \
x11-ssh-askpass xclip xdg-user-dirs-gtk xorg-drivers xorg-apps xfsprogs \
-xorg-server xorg-xinit xss-lock xvkbd yapf \
+xorg-server xorg-xinit xss-lock xvkbd yapf
printf "\n# Installing needed packages ##################################################\n\n"
yay -S --needed $PACKAGES
+printf "\n# Installing Spacemacs ########################################################\n\n"
+rm -rf ~/.emacs.d
+
+git clone --single-branch --branch develop https://github.com/syl20bnr/spacemacs ~/.emacs.d
+
+yadm checkout -- ~/.emacs.d/private/
+
+if ! test (echo "phundrak" | sed -e "s/^.*$USER//I")
+
+printf "\n# Update yadm’s remotes #######################################################\n\n"
+yadm remote set-url origin git@labs.phundrak.com:phundrak/dotfiles.git
+yadm remote add github git@github.com:phundrak/dotfiles.git
+
+printf "\n# Decrypt encrypted dotfiles ##################################################\n\n"
+yadm decrypt
+
+end
+
+printf '\n# Install envtpl ##############################################################\n\n'
+yay -Syu python-envtpl-git
+
+printf "\n# Getting yadm susbmodules ####################################################\n\n"
+yadm submodule update --init --recursive
+
+printf "\n# Generating alt files ########################################################\n\n"
+yadm alt
+
printf "\n# Installing tryone’s compton fork ############################################\n\n"
yay -S compton-tryone-git
@@ -159,6 +150,17 @@ sudo systemctl disable getty@tty2
sudo usermod -aG video $USER
+for f in (find ~/.etc -type f)
+ set dest (echo $f | sed -n 's/^.*etc\(.*\)$/\/etc\1/p')
+ sudo ln -s $f $dest
+end
+
+read --prompt "echo 'Symlink .nanorc to root’s .nanorc? (Y/n): ' " -l nanoroot
+if test $nanoroot = 'y' || test $nanoroot = "Y" || test $nanoroot = ''
+ printf "\n# Symlinking .nanorc to root’s .nanorc ########################################\n\n"
+ sudo ln -s $HOME/.nanorc /root/.nanorc
+end
+
printf "\n# Installing fisher ###########################################################\n\n"
curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish
diff --git a/.signature b/.signature
index b87fba9..fc37d75 100644
--- a/.signature
+++ b/.signature
@@ -1,6 +1,6 @@
Lucien “Phundrak” Cartier-Tilet
-https://phundrak.fr (Français)
-https://en.phundrak.fr (English)
+https://phundrak.com (Français)
+https://en.phundrak.com (English)
Pensez à notre planète, avez-vous vraiment besoin d’imprimer ce courriel ?
Please mind our planet, do you really need to print this email?
diff --git a/README.org b/README.org
index 6096447..e296be0 100644
--- a/README.org
+++ b/README.org
@@ -1,6 +1,6 @@
#+TITLE: Phundrak’s dotfiles
#+AUTHOR: Lucien "Phundrak” Cartier-Tilet
-#+EMAIL: phundrak@phundrak.fr
+#+EMAIL: phundrak@phundrak.com
#+OPTIONS: H:4 broken_links:mark email:t ^:{} auto-id:t
# ### LaTeX ####################################################################
@@ -24,18 +24,18 @@
#+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/ toc:t
+#+HTML_HEAD_EXTRA:
+#+HTML_HEAD_EXTRA:
+#+HTML_HEAD_EXTRA:
+#+HTML_HEAD_EXTRA:
* Table of Contents :TOC_4_gh:noexport:
:PROPERTIES:
@@ -74,7 +74,6 @@
- [[#get-envtpl][Get =envtpl=]]
- [[#update-our-submodules][Update our submodules]]
- [[#generate-our-alt-files][Generate our alt files]]
- - [[#symlink-some-system-config-files][Symlink some system config files]]
- [[#installing-tryones-compton-fork][Installing Tryone’s Compton fork]]
- [[#enable-some-of-our-services][Enable some of our services]]
- [[#docker][Docker]]
@@ -82,6 +81,7 @@
- [[#ssh-server][SSH server]]
- [[#ly][Ly]]
- [[#acpilight][Acpilight]]
+ - [[#symlink-some-system-config-files][Symlink some system config files]]
- [[#set-up-our-fish-shell][Set up our fish shell]]
- [[#install-fisher][Install =fisher=]]
- [[#install-our-extensions][Install our extensions]]
@@ -167,8 +167,8 @@
This file gets inserted automatically at the end of my emails.
#+BEGIN_SRC text
Lucien “Phundrak” Cartier-Tilet
- https://phundrak.fr (Français)
- https://en.phundrak.fr (English)
+ https://phundrak.com (Français)
+ https://en.phundrak.com (English)
Pensez à notre planète, avez-vous vraiment besoin d’imprimer ce courriel ?
Please mind our planet, do you really need to print this email?
@@ -448,7 +448,7 @@
a non-exhaustive list of software needed by these configuration files:
- [[https://www.gnu.org/software/emacs/][GNU/Emacs]] >= 26.2
- [[http://spacemacs.org][Spacemacs]] (develop branch)
- - My [[https://labs.phundrak.fr/phundrak/conlang-layer][conlanging layer]]
+ - My [[https://labs.phundrak.com/phundrak/conlang-layer][conlanging layer]]
- [[https://github.com/venmos/w3m-layer][Venmos]]’ [[https://github.com/venmos/w3m-layer][w3m layer]]
- The [[https://fishshell.com/][Fish shell]], using [[https://github.com/jorgebucaran/fisher][fisher]]
- [[https://lukesmith.xyz/][Luke Smith]]’s [[https://github.com/LukeSmithxyz/st][fork]] of [[https://st.suckless.org/][st]]
@@ -545,7 +545,7 @@
** Execute bootstrap
:PROPERTIES:
:CUSTOM_ID: h-c13d132f-9e69-4bb0-838b-29c7c5611f11
- :HEADER-ARGS: :tangle ~/.yadm/bootstrap :exports code
+ :HEADER-ARGS: :tangle ~/.config/yadm/bootstrap :exports code
:END:
=yadm= comes with a very handy feature: its bootstrap script. We can
execute it by running the following command:
@@ -774,7 +774,7 @@
dotfiles to be set to ssh remotes using my ssh keys.
#+BEGIN_SRC fish
printf "\n# Update yadm’s remotes #######################################################\n\n"
- yadm remote set-url origin git@labs.phundrak.fr:phundrak/dotfiles.git
+ yadm remote set-url origin git@labs.phundrak.com:phundrak/dotfiles.git
yadm remote add github git@github.com:phundrak/dotfiles.git
#+END_SRC
I will also want to decrypt my encrypted files, such as said ssh keys.
@@ -820,28 +820,6 @@
yadm alt
#+END_SRC
-**** Symlink some system config files
- :PROPERTIES:
- :CUSTOM_ID: h-b14d7d03-da49-4a7b-ba05-1c0848bd8e44
- :END:
- We have some files in [[file:ect/][etc/]] that are to be symlinked to =/etc=.
- #+BEGIN_SRC fish
- for f in (find ~/.etc -type f)
- set dest (echo $f | sed -n 's/^.*etc\(.*\)$/\/etc\1/p')
- sudo ln -s $f $dest
- end
- #+END_SRC
-
- We may also want to symlink our [[file:.nanorc][nanorc]] to the =/root= directory for when we
- use =nano= as =sudo=.
- #+BEGIN_SRC fish
- read --prompt "echo 'Symlink .nanorc to root’s .nanorc? (Y/n): ' " -l nanoroot
- if test $nanoroot = 'y' || test $nanoroot = "Y" || test $nanoroot = ''
- printf "\n# Symlinking .nanorc to root’s .nanorc ########################################\n\n"
- sudo ln -s $HOME/.nanorc /root/.nanorc
- end
- #+END_SRC
-
*** Installing Tryone’s Compton fork
:PROPERTIES:
:CUSTOM_ID: h-aecf9f01-268c-40cd-8fc3-622c6ce822e4
@@ -929,6 +907,28 @@
sudo usermod -aG video $USER
#+END_SRC
+*** Symlink some system config files
+ :PROPERTIES:
+ :CUSTOM_ID: h-b14d7d03-da49-4a7b-ba05-1c0848bd8e44
+ :END:
+ We have some files in [[file:ect/][etc/]] that are to be symlinked to =/etc=.
+ #+BEGIN_SRC fish
+ for f in (find ~/.etc -type f)
+ set dest (echo $f | sed -n 's/^.*etc\(.*\)$/\/etc\1/p')
+ sudo ln -s $f $dest
+ end
+ #+END_SRC
+
+ We may also want to symlink our [[file:.nanorc][nanorc]] to the =/root= directory for when we
+ use =nano= as =sudo=.
+ #+BEGIN_SRC fish
+ read --prompt "echo 'Symlink .nanorc to root’s .nanorc? (Y/n): ' " -l nanoroot
+ if test $nanoroot = 'y' || test $nanoroot = "Y" || test $nanoroot = ''
+ printf "\n# Symlinking .nanorc to root’s .nanorc ########################################\n\n"
+ sudo ln -s $HOME/.nanorc /root/.nanorc
+ end
+ #+END_SRC
+
*** Set up our fish shell
:PROPERTIES:
:CUSTOM_ID: h-f6f4df67-b0de-40bf-95fb-888d42169088