From b1b1eaf7f642b942844a02179f01398c3196c7a8 Mon Sep 17 00:00:00 2001 From: Sebastian 'gonX' Jensen Date: Fri, 26 Jan 2024 14:14:55 +0100 Subject: [PATCH 1/3] Split Arch install steps into include, add EndeavourOS install instructions This reduces the amount of duplicated text in the repository, and allows us to easier support variants of Arch Linux --- site/_includes/wiki/arch-install-steps.md | 10 +++++ site/_includes/wiki/arch-makepkg-steps.txt | 7 ++++ site/_includes/wiki/arch-regen-commands.txt | 5 +++ site/_wiki/Install/Linux.md | 41 ++++++++++----------- 4 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 site/_includes/wiki/arch-install-steps.md create mode 100644 site/_includes/wiki/arch-makepkg-steps.txt create mode 100644 site/_includes/wiki/arch-regen-commands.txt diff --git a/site/_includes/wiki/arch-install-steps.md b/site/_includes/wiki/arch-install-steps.md new file mode 100644 index 0000000..1b539f1 --- /dev/null +++ b/site/_includes/wiki/arch-install-steps.md @@ -0,0 +1,10 @@ +{% assign ramdiskUpdateCommand = include.ramdisk_update_command | default: "mkinitcpio -P" %} +{% assign elevateCommand = include.elevate_command | default: "sudo" %} +{% assign includeMakepkgSteps = include.makepkg | default: false %} + + ```sh + {% if includeMakepkgSteps -%} + {% include wiki/arch-makepkg-steps.txt %} + {%- endif -%} + {% include wiki/arch-regen-commands.txt -%} + ``` diff --git a/site/_includes/wiki/arch-makepkg-steps.txt b/site/_includes/wiki/arch-makepkg-steps.txt new file mode 100644 index 0000000..362f950 --- /dev/null +++ b/site/_includes/wiki/arch-makepkg-steps.txt @@ -0,0 +1,7 @@ +# Downloads the pkgbuild from the AUR. + git clone https://aur.archlinux.org/opentabletdriver.git + # Changes into the correct directory, pulls needed dependencies, then installs OpenTabletDriver + cd opentabletdriver && makepkg -si + # Clean up leftovers + cd .. + rm -rf opentabletdriver diff --git a/site/_includes/wiki/arch-regen-commands.txt b/site/_includes/wiki/arch-regen-commands.txt new file mode 100644 index 0000000..492877e --- /dev/null +++ b/site/_includes/wiki/arch-regen-commands.txt @@ -0,0 +1,5 @@ + # Regenerate initramfs + {{ elevateCommand }} {{ ramdiskUpdateCommand }} + # Unload kernel modules + {{ elevateCommand }} rmmod wacom + {{ elevateCommand }} rmmod hid_uclogic diff --git a/site/_wiki/Install/Linux.md b/site/_wiki/Install/Linux.md index e5ff079..fa1e43f 100644 --- a/site/_wiki/Install/Linux.md +++ b/site/_wiki/Install/Linux.md @@ -60,6 +60,24 @@ If you're experiencing `libhostfxr` issues, please see the solutions from Micros 4. Refer to [this section]({% link _wiki/FAQ/Linux.md %}#autostart) for instructions on how to auto-start OpenTabletDriver on boot. +## EndeavoursOS {#endeavouros} + +While EndeavourOS is based on Arch Linux, it uses a different initramfs +generator compared to standard Arch Linux, which means the post-install setup is different. + +1. Install the `opentabletdriver` AUR package with either the GUI package utility, Pamac, + or the command-line utility, `yay` + + ```sh + yay -S opentabletdriver + ``` + +2. Then, run the following commands in a terminal + +{% include wiki/arch-install-steps.md ramdisk_update_command="dracut-rebuild" %} + +Then refer to [this section]({% link _wiki/FAQ/Linux.md %}#autostart) for instructions on how to auto-start OpenTabletDriver on boot. + ## Arch Linux {#arch} You can install OpenTabletDriver from the AUR. There are two ways to do this. @@ -78,32 +96,13 @@ Then refer to [this section]({% link _wiki/FAQ/Linux.md %}#autostart) for instru 1. Use an [AUR helper](https://wiki.archlinux.org/title/AUR_helpers) to install the `opentabletdriver` AUR package. 2. Run the following commands in a terminal - ```sh - # Regenerate initramfs - sudo mkinitcpio -P - # Unload kernel modules - sudo rmmod wacom - sudo rmmod hid_uclogic - ``` +{% include wiki/arch-install-steps.md %} ### `makepkg` method {#manual-makepkg-method} 1. Run the following commands in a terminal - ```sh - # Downloads the pkgbuild from the AUR. - git clone https://aur.archlinux.org/opentabletdriver.git - # Changes into the correct directory, pulls needed dependencies, then installs OpenTabletDriver - cd opentabletdriver && makepkg -si - # Clean up leftovers - cd .. - rm -rf opentabletdriver - # Regenerate initramfs - sudo mkinitcpio -P - # Unload kernel modules - sudo rmmod wacom - sudo rmmod hid_uclogic - ``` +{% include wiki/arch-install-steps.md makepkg=true %} ## Gentoo {#gentoo} From 52bb7b03b203e44d2f853408ff59b5308b1cdc1a Mon Sep 17 00:00:00 2001 From: Sebastian 'gonX' Jensen Date: Fri, 26 Jan 2024 14:24:42 +0100 Subject: [PATCH 2/3] Install/Linux: Fix funny first-line indentation --- site/_includes/wiki/arch-install-steps.md | 8 ++++---- .../{arch-makepkg-steps.txt => arch-makepkg-commands.txt} | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename site/_includes/wiki/{arch-makepkg-steps.txt => arch-makepkg-commands.txt} (85%) diff --git a/site/_includes/wiki/arch-install-steps.md b/site/_includes/wiki/arch-install-steps.md index 1b539f1..7132031 100644 --- a/site/_includes/wiki/arch-install-steps.md +++ b/site/_includes/wiki/arch-install-steps.md @@ -3,8 +3,8 @@ {% assign includeMakepkgSteps = include.makepkg | default: false %} ```sh - {% if includeMakepkgSteps -%} - {% include wiki/arch-makepkg-steps.txt %} - {%- endif -%} - {% include wiki/arch-regen-commands.txt -%} + {% if includeMakepkgSteps -%} + {% include wiki/arch-makepkg-commands.txt %} + {%- endif -%} + {% include wiki/arch-regen-commands.txt -%} ``` diff --git a/site/_includes/wiki/arch-makepkg-steps.txt b/site/_includes/wiki/arch-makepkg-commands.txt similarity index 85% rename from site/_includes/wiki/arch-makepkg-steps.txt rename to site/_includes/wiki/arch-makepkg-commands.txt index 362f950..8dabea0 100644 --- a/site/_includes/wiki/arch-makepkg-steps.txt +++ b/site/_includes/wiki/arch-makepkg-commands.txt @@ -1,4 +1,4 @@ -# Downloads the pkgbuild from the AUR. + # Downloads the pkgbuild from the AUR. git clone https://aur.archlinux.org/opentabletdriver.git # Changes into the correct directory, pulls needed dependencies, then installs OpenTabletDriver cd opentabletdriver && makepkg -si From 689370c03a04d2f333efce11b43365a0c42dc903 Mon Sep 17 00:00:00 2001 From: Sebastian 'gonX' Jensen Date: Fri, 26 Jan 2024 14:29:04 +0100 Subject: [PATCH 3/3] editorconfigrc: Add new (intentionally bad) include files to excludes --- .ecrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.ecrc b/.ecrc index cbc49a2..fa988a0 100644 --- a/.ecrc +++ b/.ecrc @@ -1,3 +1,8 @@ { - "Exclude": ["\\.md$", "Gemfile.lock$", "assets/css/rougehl.css$"] + "Exclude": [ "\\.md$", + "Gemfile.lock$", + "assets/css/rougehl.css$", + "_includes/wiki/arch-makepkg-commands.txt", + "_includes/wiki/arch-regen-commands.txt" + ] }