ltadeu6/Nixos-Config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix monitor primary and flake update

Browse source
This commit is contained in:
ltadeu6 2026-04-26 16:30:08 -03:00
parent 8894fa949c
commit 168ecf2743
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configs/hypr/hyprland.conf
View file

@ -26,7 +26,7 @@ monitor = $SIDE,1920x1080@60,-1400x-1080,1
# Autostart # Autostart
exec-once = waybar & hyprpaper & dbus-launch kdeconnect-indicator exec-once = waybar & hyprpaper & dbus-launch kdeconnect-indicator
exec-once = /run/current-system/sw/bin/antimicrox --tray --hidden --eventgen uinput --profile /etc/antimicrox/controller-mouse.amgp exec-once = /run/current-system/sw/bin/antimicrox --tray --hidden --eventgen uinput --profile /etc/antimicrox/controller-mouse.amgp
exec-once = sh -lc 'sleep 5; for _ in $(seq 1 10); do out="$(hyprctl monitors -j | jq -r ''.[] | select(.description == \"LG Electronics LG ULTRAWIDE 512AZWSDD473\") | .name'' | head -n1)"; [ -n "$out" ] && xrandr --output "$out" --primary --auto >/dev/null 2>&1 && exit 0; sleep 2; done' exec-once = sh -lc 'sleep 5; for _ in $(seq 1 10); do out="$(/run/current-system/sw/bin/hyprctl monitors | /run/current-system/sw/bin/awk ''/^Monitor / { name=$2 } /description: LG Electronics LG ULTRAWIDE 512AZWSDD473/ { print name; exit }'')"; [ -z "$out" ] && sleep 2 && continue; /run/current-system/sw/bin/xrandr --query | /run/current-system/sw/bin/grep -q "^$out connected primary " && exit 0; /run/current-system/sw/bin/xrandr --output "$out" --primary --auto >/dev/null 2>&1 && exit 0; sleep 2; done'
# Source a file (multi-file configs) # Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf # source = ~/.config/hypr/myColors.conf

21
hosts/Nixos/configuration.nix
View file

@ -6,6 +6,7 @@
let let
username = "ltadeu6"; username = "ltadeu6";
homeDir = "/home/${username}"; homeDir = "/home/${username}";
repoDir = "${homeDir}/Projetos/Sistemas/nixos-config";
codexStatusPath = "/var/lib/hass/codex_status.json"; codexStatusPath = "/var/lib/hass/codex_status.json";
zenExtension = shortId: guid: { zenExtension = shortId: guid: {
name = guid; name = guid;
@ -827,17 +828,15 @@ in {
systemd.services."nix-flake-update" = { systemd.services."nix-flake-update" = {
description = "Update flake.lock, commit, and rebuild"; description = "Update flake.lock, commit, and rebuild";
path = [ path = [
pkgs.findutils
pkgs.git pkgs.git
pkgs.gnugrep pkgs.gnugrep
pkgs.gnused
pkgs.nixos-rebuild pkgs.nixos-rebuild
pkgs.nix pkgs.nix
pkgs.coreutils pkgs.coreutils
pkgs.util-linux
]; ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
User = username;
Environment = [ Environment = [
"HOME=${homeDir}" "HOME=${homeDir}"
"GIT_AUTHOR_NAME=auto-upgrade" "GIT_AUTHOR_NAME=auto-upgrade"
@ -848,15 +847,19 @@ in {
}; };
script = '' script = ''
set -euo pipefail set -euo pipefail
export PATH="${pkgs.git}/bin:${pkgs.nix}/bin:/run/current-system/sw/bin" export PATH="${pkgs.git}/bin:${pkgs.nix}/bin:${pkgs.util-linux}/bin:/run/current-system/sw/bin"
repo_dir="$(${pkgs.findutils}/bin/find "$HOME" -path '*/hosts/Nixos/configuration.nix' -print -quit | ${pkgs.gnused}/bin/sed 's#/hosts/Nixos/configuration\.nix##')" run_as_user() {
if [ -z "$repo_dir" ]; then /run/current-system/sw/bin/runuser -u ${username} -- "$@"
echo "Skipping flake update: could not locate repo under $HOME" }
repo_dir="${repoDir}"
if [ ! -d "$repo_dir/.git" ] || [ ! -f "$repo_dir/hosts/Nixos/configuration.nix" ]; then
echo "Skipping flake update: repository not found at $repo_dir"
exit 0 exit 0
fi fi
repo_status="$(git -C "$repo_dir" status --porcelain=v1 --untracked-files=normal)" repo_status="$(run_as_user git -C "$repo_dir" status --porcelain=v1 --untracked-files=normal)"
relevant_status="$(printf '%s\n' "$repo_status" | ${pkgs.gnugrep}/bin/grep -vE '^[ MARCUD?!]{2} flake\.lock$' || true)" relevant_status="$(printf '%s\n' "$repo_status" | ${pkgs.gnugrep}/bin/grep -vE '^[ MARCUD?!]{2} flake\.lock$' || true)"
if [ -n "$relevant_status" ]; then if [ -n "$relevant_status" ]; then
echo "Skipping flake update: repository has local changes" echo "Skipping flake update: repository has local changes"
@ -877,7 +880,7 @@ in {
rm -f "$repo_dir/flake.lock" rm -f "$repo_dir/flake.lock"
fi fi
/run/current-system/sw/bin/nix flake update --commit-lock-file "$repo_dir" run_as_user /run/current-system/sw/bin/nix flake update --commit-lock-file "$repo_dir"
/run/current-system/sw/bin/nixos-rebuild switch --flake "$repo_dir#Nixos" /run/current-system/sw/bin/nixos-rebuild switch --flake "$repo_dir#Nixos"
if [ -n "$backup" ] && [ -f "$backup" ]; then if [ -n "$backup" ] && [ -f "$backup" ]; then