Update for FreeBSD on AMD Framework laptop.
This commit is contained in:
parent
32eca75f4e
commit
a7fe423583
@ -16,6 +16,7 @@ users:
|
|||||||
- backup_fido
|
- backup_fido
|
||||||
- homeassistant
|
- homeassistant
|
||||||
gitconfig: "gitconfig_home"
|
gitconfig: "gitconfig_home"
|
||||||
|
periodic_scrub_pools: [zroot]
|
||||||
zfs_snapshot_datasets:
|
zfs_snapshot_datasets:
|
||||||
# - zroot/linux/archmain/home
|
# - zroot/linux/archmain/home
|
||||||
- path: zroot/linux/archmain/be
|
- path: zroot/linux/archmain/be
|
||||||
|
@ -17,6 +17,7 @@ users:
|
|||||||
- main_fido
|
- main_fido
|
||||||
- backup_fido
|
- backup_fido
|
||||||
gitconfig: "gitconfig_work"
|
gitconfig: "gitconfig_work"
|
||||||
|
periodic_scrub_pools: [zroot]
|
||||||
zfs_snapshot_datasets:
|
zfs_snapshot_datasets:
|
||||||
- path: zroot/linux/archwork/be
|
- path: zroot/linux/archwork/be
|
||||||
install_graphics: true
|
install_graphics: true
|
||||||
|
1
ansible/roles/base/files/cleartmp_rc.conf
Normal file
1
ansible/roles/base/files/cleartmp_rc.conf
Normal file
@ -0,0 +1 @@
|
|||||||
|
clear_tmp_enable="YES"
|
@ -1,13 +1,6 @@
|
|||||||
clear_tmp_enable="YES"
|
|
||||||
syslogd_flags="-ss"
|
syslogd_flags="-ss"
|
||||||
sendmail_enable="NONE"
|
sendmail_enable="NONE"
|
||||||
hostname="odo"
|
hostname="odo"
|
||||||
wlans_iwlwifi0="wlan0"
|
|
||||||
ifconfig_wlan0="WPA DHCP"
|
|
||||||
ifconfig_wlan0_ipv6="inet6 accept_rtadv"
|
|
||||||
sshd_enable="YES"
|
|
||||||
ntpd_enable="YES"
|
|
||||||
powerd_enable="YES"
|
|
||||||
# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable
|
# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable
|
||||||
dumpdev="NO"
|
dumpdev="NO"
|
||||||
zfs_enable="YES"
|
zfs_enable="YES"
|
||||||
|
@ -7,6 +7,16 @@
|
|||||||
- rust-coreutils
|
- rust-coreutils
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
|
- name: Install service configuration
|
||||||
|
copy:
|
||||||
|
src: "files/{{ item }}_rc.conf"
|
||||||
|
dest: "/etc/rc.conf.d/{{ item }}"
|
||||||
|
mode: 0644
|
||||||
|
owner: root
|
||||||
|
group: wheel
|
||||||
|
loop:
|
||||||
|
- cleartmp
|
||||||
|
|
||||||
- name: Install login.conf
|
- name: Install login.conf
|
||||||
copy:
|
copy:
|
||||||
src: login.conf
|
src: login.conf
|
||||||
|
@ -27,3 +27,14 @@
|
|||||||
group: wheel
|
group: wheel
|
||||||
loop:
|
loop:
|
||||||
- aesni
|
- aesni
|
||||||
|
|
||||||
|
- name: Install loader.conf
|
||||||
|
when: hwpstate is defined and hwpstate
|
||||||
|
copy:
|
||||||
|
src: "files/{{ item }}_loader.conf"
|
||||||
|
dest: "/boot/loader.conf.d/{{ item }}.conf"
|
||||||
|
mode: 0644
|
||||||
|
owner: root
|
||||||
|
group: wheel
|
||||||
|
loop:
|
||||||
|
- per_core_hwpstate
|
||||||
|
@ -78,4 +78,4 @@
|
|||||||
owner: root
|
owner: root
|
||||||
group: wheel
|
group: wheel
|
||||||
loop:
|
loop:
|
||||||
- percorespeedshift
|
- per_core_hwpstate
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
wlans_ath0="wlan0"
|
wlans_iwlwifi0="wlan0"
|
||||||
ifconfig_wlan0="WPA DHCP"
|
ifconfig_wlan0="WPA DHCP"
|
||||||
ifconfig_wlan0_ipv6="inet6 accept_rtadv"
|
ifconfig_wlan0_ipv6="inet6 accept_rtadv"
|
||||||
|
@ -1,36 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
#
|
|
||||||
# Read volume status in FreeBSD
|
|
||||||
set -euo pipefail
|
|
||||||
IFS=$'\n\t'
|
|
||||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
|
||||||
|
|
||||||
SLEEP_INTERVAL=${SLEEP_INTERVAL:-30}
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
current_vol_mixer=$(mixer -S vol)
|
|
||||||
vol_left=$(cut -d ':' -f 2 <<<"$current_vol_mixer")
|
|
||||||
vol_right=$(cut -d ':' -f 3 <<<"$current_vol_mixer")
|
|
||||||
avg_vol=$(((vol_left + vol_right) / 2))
|
|
||||||
tooltip="<tt>$(mixer)</tt>"
|
|
||||||
class=""
|
|
||||||
icon=""
|
|
||||||
|
|
||||||
if [ $avg_vol -eq 0 ]; then
|
|
||||||
icon="🔇"
|
|
||||||
elif [ $avg_vol -le 50 ]; then
|
|
||||||
icon="🔉"
|
|
||||||
else
|
|
||||||
icon="🔊"
|
|
||||||
fi
|
|
||||||
|
|
||||||
jq --unbuffered --compact-output <<EOF
|
|
||||||
{
|
|
||||||
"text":"${avg_vol}% ${icon}",
|
|
||||||
"tooltip":"${tooltip//$'\n'/\\n}",
|
|
||||||
"percentage":${avg_vol},
|
|
||||||
"class":"${class}"
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
sleep $SLEEP_INTERVAL
|
|
||||||
done
|
|
@ -0,0 +1,41 @@
|
|||||||
|
#!/usr/bin/env zsh
|
||||||
|
#
|
||||||
|
# Read volume status in FreeBSD
|
||||||
|
set -euo pipefail
|
||||||
|
IFS=$'\n\t'
|
||||||
|
|
||||||
|
SLEEP_INTERVAL=${SLEEP_INTERVAL:-30}
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
(
|
||||||
|
# current_vol_mixer=$(mixer -S vol)
|
||||||
|
# vol_left=$(cut -d ':' -f 2 <<<"$current_vol_mixer")
|
||||||
|
# vol_right=$(cut -d ':' -f 3 <<<"$current_vol_mixer")
|
||||||
|
current_vol_mixer=$(mixer -o)
|
||||||
|
vol_left=$(grep -E 'vol.volume=' <<<"$current_vol_mixer" | cut -d = -f 2 | cut -d ':' -f 1)
|
||||||
|
vol_right=$(grep -E 'vol.volume=' <<<"$current_vol_mixer" | cut -d = -f 2 | cut -d ':' -f 2)
|
||||||
|
avg_vol=$((100 * (vol_left + vol_right) / 2))
|
||||||
|
avg_vol=$(echo "$avg_vol" | cut -d '.' -f 1)
|
||||||
|
tooltip="<tt>$(mixer)</tt>"
|
||||||
|
class=""
|
||||||
|
icon=""
|
||||||
|
|
||||||
|
if [ $avg_vol -eq 0 ]; then
|
||||||
|
icon="🔇"
|
||||||
|
elif [ $avg_vol -le 50 ]; then
|
||||||
|
icon="🔉"
|
||||||
|
else
|
||||||
|
icon="🔊"
|
||||||
|
fi
|
||||||
|
|
||||||
|
jq --unbuffered --compact-output <<EOF
|
||||||
|
{
|
||||||
|
"text":"${avg_vol}% ${icon}",
|
||||||
|
"tooltip":"${tooltip//$'\n'/\\n}",
|
||||||
|
"percentage":${avg_vol},
|
||||||
|
"class":"${class}"
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
sleep $SLEEP_INTERVAL
|
||||||
|
)
|
||||||
|
done
|
@ -5,13 +5,11 @@ set -euo pipefail
|
|||||||
IFS=$'\n\t'
|
IFS=$'\n\t'
|
||||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
# TODO: Maybe I should be reading hw.acpi.thermal.tz0.temperature
|
|
||||||
# TODO: I could get the number of cores with kern.smp.cpus
|
|
||||||
|
|
||||||
SLEEP_INTERVAL=${SLEEP_INTERVAL:-30}
|
SLEEP_INTERVAL=${SLEEP_INTERVAL:-30}
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
current_cpu_temps=$(sysctl 'dev.cpu' | grep -E 'dev\.cpu\.[0-9]+\.temperature' | sort)
|
current_cpu_temps=$(sysctl 'hw.acpi.thermal' | grep -E 'hw\.acpi\.thermal\.tz[0-9]+\.temperature' | sort)
|
||||||
|
#current_cpu_temps=$(sysctl 'dev.cpu' | grep -E 'dev\.cpu\.[0-9]+\.temperature' | sort)
|
||||||
sum_temperature=0
|
sum_temperature=0
|
||||||
num_temperature=0
|
num_temperature=0
|
||||||
max_temperature=0
|
max_temperature=0
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
package:
|
package:
|
||||||
name:
|
name:
|
||||||
- waybar
|
- waybar
|
||||||
|
- python
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: Install scripts
|
- name: Install scripts
|
||||||
@ -16,7 +17,7 @@
|
|||||||
dest: /usr/local/bin/waybar_custom_battery
|
dest: /usr/local/bin/waybar_custom_battery
|
||||||
- src: waybar_available_memory_freebsd.bash
|
- src: waybar_available_memory_freebsd.bash
|
||||||
dest: /usr/local/bin/waybar_custom_available_memory
|
dest: /usr/local/bin/waybar_custom_available_memory
|
||||||
- src: waybar_sound_freebsd.bash
|
- src: waybar_sound_freebsd.zsh
|
||||||
dest: /usr/local/bin/waybar_custom_sound
|
dest: /usr/local/bin/waybar_custom_sound
|
||||||
- src: waybar_temperature_freebsd.bash
|
- src: waybar_temperature_freebsd.bash
|
||||||
dest: /usr/local/bin/waybar_custom_temperature
|
dest: /usr/local/bin/waybar_custom_temperature
|
||||||
|
@ -53,3 +53,11 @@
|
|||||||
- zfs-mount.service
|
- zfs-mount.service
|
||||||
- zfs.target
|
- zfs.target
|
||||||
- zfs-import.target
|
- zfs-import.target
|
||||||
|
|
||||||
|
- name: Enable periodic scrub
|
||||||
|
when: periodic_scrub_pools is defined
|
||||||
|
systemd:
|
||||||
|
enabled: yes
|
||||||
|
name: "zfs-scrub-weekly@{{ item }}.timer"
|
||||||
|
daemon_reload: yes
|
||||||
|
loop: "{{ periodic_scrub_pools }}"
|
||||||
|
Loading…
Reference in New Issue
Block a user