From 6db2d5c1068650805d1049ba0d618f7cb4bb6c9d Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Thu, 24 Oct 2019 13:33:42 +0200 Subject: [PATCH] Changed backlight utility, fixed some file permissions Changed the revelant lines in bootstrap source code as well as the shortcuts dedicated to backlight management in i3 --- .config/clight.conf | 195 ------------------------------------- .config/i3/config##yadm.j2 | 10 +- .gitignore_global | 0 .rustfmt.toml | 0 .signature | 0 .yadm/bootstrap | 20 ++-- README.org | 31 ++++-- 7 files changed, 35 insertions(+), 221 deletions(-) delete mode 100644 .config/clight.conf mode change 100755 => 100644 .gitignore_global mode change 100755 => 100644 .rustfmt.toml mode change 100755 => 100644 .signature diff --git a/.config/clight.conf b/.config/clight.conf deleted file mode 100644 index bba63b9..0000000 --- a/.config/clight.conf +++ /dev/null @@ -1,195 +0,0 @@ -#################### -# Clight conf file # -#################### - -############# -# BACKLIGHT # -############# - -## Uncomment to disable brightness tool -# no_backlight = true; - -## Uncomment to disable backlight smooth transitions -# no_smooth_backlight_transition = true; - -## Backlight transition step in percentage -backlight_trans_step = 0.05; - -## Backlight transition timeout in ms -# backlight_trans_timeout = 30; - -## Timeouts between captures during day/night/event on AC -# ac_capture_timeouts = [ 600, 2700, 300 ]; - -## Timeouts between captures during day/night/event on BATT -# batt_capture_timeouts = [ 1200, 5400, 600 ]; - -## Y points used to compute ambient_brightness while ON AC -> screen backlight curve best-fit parameters -## through polynomial regression. X values are simply array's indexes (from 0 to 10 included). -# ac_backlight_regression_points = [ 0.0, 0.15, 0.29, 0.45, 0.61, 0.74, 0.81, 0.88, 0.93, 0.97, 1.0 ]; - -## Y points used to compute ambient_brightness while ON BATTERY -> screen backlight curve best-fit parameters -## through polynomial regression. X values are simply array's indexes (from 0 to 10 included). -# batt_backlight_regression_points = [ 0.0, 0.15, 0.23, 0.36, 0.52, 0.59, 0.65, 0.71, 0.75, 0.78, 0.80 ]; - -## Number of frames or ALS device pollings to be captured -captures = 5; - -## Sensor device to be used (Webcam or ALS device) -sensor_devname = "video0"; - -## Sensor settings to be used. You should set values taken from , -## as "A=b,C=d" string, where A and C are v4l2 operations, and b and d are their requested values. -## Example string below does read as "V4L2_CID_EXPOSURE_AUTO=V4L2_EXPOSURE_MANUAL,V4L2_CID_EXPOSURE_ABSOLUTE=166". -## This is only useful for webcam sensors right now. Leave empty/commented to use webcam default values. -# sensor_settings = "10094849=1,10094850=166"; - -## Screen syspath to be use -screen_sysname = "intel_backlight"; - -## Uncomment to disable keyboard backlight automatic calibration. -no_kdb_backlight = true; - -## Set a threshold: if detected ambient brightness is below this threshold, -## capture will be discarded and no backlight change will be made. -# shutter_threshold = 0.10; - -## Disables automatic calibration for screen backlight. -## It must be manually triggered by bus api after setting this. -# no_auto_calibration = true; - -## Uncomment to let BACKLIGHT module inhibit automatic calibration -## when Screensaver inhibition is enabled. -# inhibit_autocalib = true; - -######### -# GAMMA # -######### - -## Uncomment to disable gamma tool -# no_gamma = true; - -## Uncomment to disable gamma smooth transitions -# no_smooth_gamma_transition = true; - -## Gamma transition step -# gamma_trans_step = 50; - -## Gamma transition timeout in ms -# gamma_trans_timeout = 300; - -## Gamma temperature during day and night -gamma_temp = [ 6500, 3200 ]; - -## Your desired latitude for gamma support (surise/sunset in this location) -latitude = 48.5; - -## Your desired longitude for gamma support (surise/sunset in this location) -longitude = 2.2; - -## Force set a sunrise time -sunrise = "7:00"; - -## Force set a sunset time -sunset = "19:00"; - -## Duration of an "event". Clight will enter "event" mode (more frequent screen recalibrations) -## from event_duration seconds before a sunrise/sunset, until event_duration seconds after. -event_duration = 1800; - -## Enable to let GAMMA smooth transitions last (2 * event_duration), -## in a redshift-like way. -## When enabling this, transition steps and timeouts are automatically computed -## given DAY-NIGHT temperature difference and (2 * event_duration) duration. -## -## Note that if clight is started outside of an event, correct gamma temperature -## will be immediately setted using normal parameters: -## no_smooth_gamma_transition, gamma_trans_step, gamma_trans_timeout -# gamma_long_transition = true; - -## Let screen temperature match ambient brightness, like monitor backlight. -## When enabled, screen temperature won't be changed time-based. -## Note that it uses same curve points as backlight. -## Note also that LOCATION is still needed to let BACKLIGHT module know current time of day. -## Finally, it requires BACKLIGHT module to be enabled, otherwise it gets disabled. -ambient_gamma = true; - -########## -# DIMMER # -########## - -## Uncomment to disable dimmer tool -no_dimmer = true; - -## Uncomment to disable dimmer smooth transitions -## when entering/leaving dimmed state -# no_smooth_dimmer_transition [ true, true ]; - -## Dimmer transition step in percentage. -## Entering dimmed state fade, and leaving fade -# dimmer_trans_steps = [ 0.05, 0.05 ]; - -## Dimmer transition timeout in ms. -## Entering dimmed state fade, and leaving fade -# dimmer_trans_timeouts = [ 30, 30 ]; - -## Dimmer timeouts on AC/on BATT. -## Set any of these to <= 0 to disable dimmer -## in the corresponding AC state. -# dimmer_timeouts = [ 45, 20 ]; - -## Change dimmer backlight level, in percentage -# dimmer_pct = 0.2; - -######## -# DPMS # -######## - -## Uncomment to disable dpms tool -# no_dpms = true; - -## Dpms timeouts on AC/on BATT. -## Set any of these to <= 0 to disable dpms -## in the corresponding AC state. -# dpms_timeouts = [ 900, 300 ]; - -########## -# SCREEN # -############################################################################################################## -## Use this feature to provide screen-emitted brightness compensation to Clight. # -## The idea here is: # -## dark ambient -> higher monitor light contribution impact # -## bright ambient -> lower monitor light contribution impact # -## But, at the same time, obviously (as that is clight main feature): # -## dark ambient -> lower monitor backlight level -> lower monitor light contribution impact # -## high ambient -> high monitor backlight level -> higher monitor light contribution impact # -## We can assume these 2 contributions to zero each other, letting us just compute screen-emitted brightness # -## and linearly multiplying it for our guessed ambient-brightness screen contribution value. # -############################################################################################################## - -## Uncomment to disable screen-emitted brightness compensation support -# no_screen = true; - -## Screen timeouts on AC/on BATT. -## Set any of these to <= 0 to disable screen-emitted brightness compensation -## in the corresponding AC state. -## Disabled by default on BATT because it is quite an heavy operation, -## as it has to take a snapshot of your X desktop and compute its brightness. -# screen_timeouts = [ 30, -1 ]; - -## How much does your screen-emitted brightness affect -## ambient brightness, in your setup, in percentage. -# screen_contrib = 0.1; - -## How many samples should be used to compute average -## screen-emitted brightness. -# screen_samples = 10; - -########### -# GENERIC # -########### - -## Verbose mode, useful in case of bugs: -## run clight in verbose mode, -## then open issue on github attaching log -# verbose = true; \ No newline at end of file diff --git a/.config/i3/config##yadm.j2 b/.config/i3/config##yadm.j2 index b791299..e3d08f3 100644 --- a/.config/i3/config##yadm.j2 +++ b/.config/i3/config##yadm.j2 @@ -187,10 +187,10 @@ bindsym $mod+Shift+l exec dmenu-lpass bindsym $mod+Shift+p exec polybar-launch # Brightness keyboard shortcuts -bindsym XF86MonBrightnessUp exec "light -A 5" -bindsym XF86MonBrightnessDown exec "light -U 5" -bindsym $mod+$alt+Next exec "light -A 5" -bindsym $mod+$alt+Prev exec "light -U 5" +bindsym XF86MonBrightnessUp exec xbacklight -inc 5 +bindsym $mod+$alt+Next exec xbacklight -inc 5 +bindsym XF86MonBrightnessDown exec xbacklight -dec 5 +bindsym $mod+$alt+Prev exec xbacklight -dec 5 # Wal bindsym $mod+Ctrl+w exec "wal -i ~/Pictures/Wallpapers -o wal-set" @@ -269,8 +269,6 @@ exec --no-startup-id /usr/lib/mate-polkit/polkit-mate-authenticatio exec_always --no-startup-id enable_touch exec_always --no-startup-id polybar-launch exec --no-startup-id xss-lock -- i3lock -fol -exec --no-startup-id xfce4-power-manager -exec --no-startup-id clight exec --no-startup-id mpd exec --no-startup-id mpc stop exec --no-startup-id mpd_discord_richpresence --no-idle --fork diff --git a/.gitignore_global b/.gitignore_global old mode 100755 new mode 100644 diff --git a/.rustfmt.toml b/.rustfmt.toml old mode 100755 new mode 100644 diff --git a/.signature b/.signature old mode 100755 new mode 100644 diff --git a/.yadm/bootstrap b/.yadm/bootstrap index e5ef618..8ecee4b 100755 --- a/.yadm/bootstrap +++ b/.yadm/bootstrap @@ -100,10 +100,10 @@ if test $nanoroot = 'y' || test $nanoroot = "Y" || test $nanoroot = '' end set PACKAGES \ -asar ascii aspell-en aspell-fr assimp awesome-terminal-fonts base-devel bat \ -biber bleachbit bluez-firmware bluez-utils bookworm boost bzip2 chromium clisp \ -clight compton cppcheck cppreference cppreference-devhelp cpupower cronie \ -cryptsetup device-mapper diffutils discord-canary discount ditaa dmenu \ +acpilight asar ascii aspell-en aspell-fr assimp awesome-terminal-fonts \ +base-devel bat biber bleachbit bluez-firmware bluez-utils bookworm boost bzip2 \ +chromium clisp compton cppcheck cppreference cppreference-devhelp cpupower \ +cronie cryptsetup device-mapper diffutils discord-canary discount ditaa dmenu \ dmenu-lpass docker docker-compose doxygen dunst dwarffortress emacs \ exfat-utils ffmpegthumbnailer findutils firefox flake8 font-mathematica \ fontforge freeglut fzf gcc-libs gdb gimp glibc gnome-disk-utility \ @@ -117,12 +117,10 @@ ntfs-3g numlockx openssh p7zip pacman-contrib pandoc-bin pavucontrol pciutils \ pcurses pdfpc polybar pulseaudio-bluetooth python-envtpl-git python-pip \ python-pywal qemu r raw-thumbnailer reflector rofi rofi-wifi-menu-git rsync \ rtv rustup s-nail samba scrot sent shadow siji-git simplescreenrecorder \ -speedcrunch sshfs st-luke-git swi-prolog texlive-bibtexextra texlive-bin \ -texlive-core texlive-fontsextra texlive-formatsextra texlive-games \ -texlive-humanities texlive-langchinese texlive-langcyrillic texlive-langextra \ -texlive-langgreek texlive-langjapanese texlive-langkorean texlive-latexextra \ -texlive-localmanager-git texlive-music texlive-pictures texlive-pstricks \ -texlive-publishers texlive-science tmux tree ttf-arphic-uming ttf-baekmuk \ +speedcrunch sshfs st-luke-git swi-prolog texlive-most texlive-bin \ +texlive-langchinese texlive-langcyrillic texlive-langgreek \ +texlive-langjapanese texlive-langkorean texlive-latexextra \ +texlive-localmanager-git tmux tree ttf-arphic-uming ttf-baekmuk \ ttf-bitstream-vera ttf-dejavu ttf-google-fonts-opinionated-git ttf-joypixels \ ttf-liberation ttf-material-design-icons-git ttf-ms-fonts ttf-symbola \ ttf-tibetan-machine ttf-twemoji-color ttf-unifont unicode unicode-emoji unrar \ @@ -155,6 +153,8 @@ end sudo systemctl enable --now ly sudo systemctl disable getty@tty2 +sudo usermod -aG video $USER + printf "\n# Installing fisher ###########################################################\n\n" curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish diff --git a/README.org b/README.org index 2c01935..9d9e6a5 100644 --- a/README.org +++ b/README.org @@ -74,6 +74,7 @@ - [[#emacs][Emacs]] - [[#ssh-server][SSH server]] - [[#ly][Ly]] + - [[#acpilight][Acpilight]] - [[#set-up-our-fish-shell][Set up our fish shell]] - [[#install-fisher][Install =fisher=]] - [[#install-our-extensions][Install our extensions]] @@ -643,10 +644,10 @@ Let’s set in a custom varible what packages we’ll be needing. #+BEGIN_SRC fish set PACKAGES \ - asar ascii aspell-en aspell-fr assimp awesome-terminal-fonts base-devel bat \ - biber bleachbit bluez-firmware bluez-utils bookworm boost bzip2 chromium clisp \ - clight compton cppcheck cppreference cppreference-devhelp cpupower cronie \ - cryptsetup device-mapper diffutils discord-canary discount ditaa dmenu \ + acpilight asar ascii aspell-en aspell-fr assimp awesome-terminal-fonts \ + base-devel bat biber bleachbit bluez-firmware bluez-utils bookworm boost bzip2 \ + chromium clisp compton cppcheck cppreference cppreference-devhelp cpupower \ + cronie cryptsetup device-mapper diffutils discord-canary discount ditaa dmenu \ dmenu-lpass docker docker-compose doxygen dunst dwarffortress emacs \ exfat-utils ffmpegthumbnailer findutils firefox flake8 font-mathematica \ fontforge freeglut fzf gcc-libs gdb gimp glibc gnome-disk-utility \ @@ -660,12 +661,10 @@ pcurses pdfpc polybar pulseaudio-bluetooth python-envtpl-git python-pip \ python-pywal qemu r raw-thumbnailer reflector rofi rofi-wifi-menu-git rsync \ rtv rustup s-nail samba scrot sent shadow siji-git simplescreenrecorder \ - speedcrunch sshfs st-luke-git swi-prolog texlive-bibtexextra texlive-bin \ - texlive-core texlive-fontsextra texlive-formatsextra texlive-games \ - texlive-humanities texlive-langchinese texlive-langcyrillic texlive-langextra \ - texlive-langgreek texlive-langjapanese texlive-langkorean texlive-latexextra \ - texlive-localmanager-git texlive-music texlive-pictures texlive-pstricks \ - texlive-publishers texlive-science tmux tree ttf-arphic-uming ttf-baekmuk \ + speedcrunch sshfs st-luke-git swi-prolog texlive-most texlive-bin \ + texlive-langchinese texlive-langcyrillic texlive-langgreek \ + texlive-langjapanese texlive-langkorean texlive-latexextra \ + texlive-localmanager-git tmux tree ttf-arphic-uming ttf-baekmuk \ ttf-bitstream-vera ttf-dejavu ttf-google-fonts-opinionated-git ttf-joypixels \ ttf-liberation ttf-material-design-icons-git ttf-ms-fonts ttf-symbola \ ttf-tibetan-machine ttf-twemoji-color ttf-unifont unicode unicode-emoji unrar \ @@ -754,6 +753,18 @@ sudo systemctl disable getty@tty2 #+END_SRC +**** Acpilight + :PROPERTIES: + :CUSTOM_ID: h-5423e2a7-d2ce-4bc3-9d5d-85677c18181e + :END: + =acpilight= is our utility managing the brightness of our screen. There is + actually no service to enable here, but we must ensure the user is part of + the =video= group so we can modify the brightness of our screen without + using =sudo=. + #+BEGIN_SRC fish + sudo usermod -aG video $USER + #+END_SRC + *** Set up our fish shell :PROPERTIES: :CUSTOM_ID: h-f6f4df67-b0de-40bf-95fb-888d42169088