diff --git a/.gitignore b/.gitignore index 5af261b..3d59cf5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ !/etc/acpi/actions !/etc/acpi/actions/* +!/etc/crypttab* + !/etc/apt !/etc/apt/* !/etc/apt/sources.list.d diff --git a/DotFiles/.profile b/DotFiles/.profile index 7561801..b8fe9fa 100755 --- a/DotFiles/.profile +++ b/DotFiles/.profile @@ -87,8 +87,8 @@ export PATH="${PATH}:${ANDROID_HOME}/platform-tools" export ANDROID_STUDIO_HOME="${HOME}/bin/thirdparty/android-studio" export PATH="${PATH}:${ANDROID_STUDIO_HOME}/bin" -export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +export NVM_DIR="$HOME/.config/nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm export PATH="/snap/bin:$PATH" diff --git a/README.md b/README.md index f4a5526..012e949 100644 --- a/README.md +++ b/README.md @@ -1970,7 +1970,7 @@ but in both cases we check if it exists in the sway tree, and, if not, set it it notify-send -t 3000 "${@}" || true - + ### ~/bin/sway/sway-screen @@ -2016,7 +2016,7 @@ See + ### Examples: diff --git a/etc/crypttab.t14s b/etc/crypttab.t14s new file mode 100644 index 0000000..a0c7407 --- /dev/null +++ b/etc/crypttab.t14s @@ -0,0 +1 @@ +home UUID=f52a08b3-7fee-44f7-adbd-175629b8ea79 /home.key:UUID=82cde4c8-aa2c-4564-b03a-2e866ad29ff3 luks,discard,keyscript=/lib/cryptsetup/scripts/passdev,keyfile-timeout=10 diff --git a/etc/crypttab.x1c6 b/etc/crypttab.x1c6 new file mode 100644 index 0000000..6f7e88d --- /dev/null +++ b/etc/crypttab.x1c6 @@ -0,0 +1 @@ +home UUID=4bfb4d7c-9faf-4797-938e-937ae859502b /home.key:UUID=82cde4c8-aa2c-4564-b03a-2e866ad29ff3 luks,discard,keyscript=/lib/cryptsetup/scripts/passdev,keyfile-timeout=10 diff --git a/linux-config.org b/linux-config.org index d828f13..d100389 100644 --- a/linux-config.org +++ b/linux-config.org @@ -3439,8 +3439,8 @@ https://hasil-sharma.github.io/2017-05-13-python-ipdb/ [[https://github.com/nvm-sh/nvm#installing-and-updating][nvm]] allows you to quickly install and use different versions of node via the command line. #+begin_src bash :tangle "DotFiles/.profile" -export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + export NVM_DIR="$HOME/.config/nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm #+end_src *** snap #+begin_src bash :tangle "DotFiles/.profile"