From 37d59ca78e198ecac190002432397fdc545fa538 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 31 Aug 2025 14:46:06 +0200 Subject: [PATCH] Use our own asdcontrol-git package now --- install.sh | 2 +- install/config/sudoless-asdcontrol.sh | 5 +++++ install/packages.sh | 1 + install/packaging/asdcontrol.sh | 15 --------------- 4 files changed, 7 insertions(+), 16 deletions(-) create mode 100755 install/config/sudoless-asdcontrol.sh delete mode 100755 install/packaging/asdcontrol.sh diff --git a/install.sh b/install.sh index 321c5d6..e3afaf3 100755 --- a/install.sh +++ b/install.sh @@ -18,7 +18,6 @@ source $OMARCHY_INSTALL/preflight/first-run-mode.sh # Packaging source $OMARCHY_INSTALL/packages.sh -source $OMARCHY_INSTALL/packaging/asdcontrol.sh source $OMARCHY_INSTALL/packaging/fonts.sh source $OMARCHY_INSTALL/packaging/lazyvim.sh source $OMARCHY_INSTALL/packaging/webapps.sh @@ -40,6 +39,7 @@ source $OMARCHY_INSTALL/config/mise-ruby.sh source $OMARCHY_INSTALL/config/docker.sh source $OMARCHY_INSTALL/config/mimetypes.sh source $OMARCHY_INSTALL/config/localdb.sh +source $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh source $OMARCHY_INSTALL/config/hardware/network.sh source $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh source $OMARCHY_INSTALL/config/hardware/bluetooth.sh diff --git a/install/config/sudoless-asdcontrol.sh b/install/config/sudoless-asdcontrol.sh new file mode 100755 index 0000000..7c678f7 --- /dev/null +++ b/install/config/sudoless-asdcontrol.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Setup sudo-less controls for controlling brightness on Apple Displays +echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol +sudo chmod 440 /etc/sudoers.d/asdcontrol diff --git a/install/packages.sh b/install/packages.sh index 4a2b014..409073a 100644 --- a/install/packages.sh +++ b/install/packages.sh @@ -1,6 +1,7 @@ sudo pacman -S --noconfirm --needed \ 1password-beta \ 1password-cli \ + asdcontrol-git \ alacritty \ avahi \ bash-completion \ diff --git a/install/packaging/asdcontrol.sh b/install/packaging/asdcontrol.sh deleted file mode 100755 index ff950c6..0000000 --- a/install/packaging/asdcontrol.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# Install asdcontrol for controlling brightness on Apple Displays -if ! command -v asdcontrol &>/dev/null; then - git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol - cd /tmp/asdcontrol - make - sudo make install - cd - - rm -rf /tmp/asdcontrol - - # Setup sudo-less controls - echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol - sudo chmod 440 /etc/sudoers.d/asdcontrol -fi