From 6dc56983ea4ff6230bfeab7c223d288a76801488 Mon Sep 17 00:00:00 2001 From: Tulili Date: Thu, 7 Mar 2024 00:56:06 -0300 Subject: [PATCH] fix: point scripts to the proper path! --- config/common/gnome/scripts.yml | 2 +- config/common/shared/amd/scripts.yml | 2 +- config/common/shared/bling.yml | 4 ++++ config/common/shared/nvidia/scripts.yml | 2 +- config/common/shared/packages.yml | 1 + config/common/shared/scripts.yml | 8 ++++---- modules/script-nu/nushell-launcher.nu | 4 ++-- modules/script-nu/script-nu.sh | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 config/common/shared/bling.yml diff --git a/config/common/gnome/scripts.yml b/config/common/gnome/scripts.yml index 21e3b55..0e405d3 100644 --- a/config/common/gnome/scripts.yml +++ b/config/common/gnome/scripts.yml @@ -1,3 +1,3 @@ type: script-nu scripts: - - gnome-vrr.sh + - gnome-vrr.nu diff --git a/config/common/shared/amd/scripts.yml b/config/common/shared/amd/scripts.yml index f9d2401..209e10f 100644 --- a/config/common/shared/amd/scripts.yml +++ b/config/common/shared/amd/scripts.yml @@ -1,3 +1,3 @@ type: script-nu scripts: - - zluda.sh + - zluda.nu diff --git a/config/common/shared/bling.yml b/config/common/shared/bling.yml new file mode 100644 index 0000000..8a8e697 --- /dev/null +++ b/config/common/shared/bling.yml @@ -0,0 +1,4 @@ +type: bling +install: + - ublue-update + - dconf-update-service diff --git a/config/common/shared/nvidia/scripts.yml b/config/common/shared/nvidia/scripts.yml index a81778e..6a911c9 100644 --- a/config/common/shared/nvidia/scripts.yml +++ b/config/common/shared/nvidia/scripts.yml @@ -1,3 +1,3 @@ type: script-nu scripts: - - nvidia-explicit-sync.sh + - nvidia-explicit-sync.nu diff --git a/config/common/shared/packages.yml b/config/common/shared/packages.yml index dd727c0..fb5261e 100644 --- a/config/common/shared/packages.yml +++ b/config/common/shared/packages.yml @@ -11,3 +11,4 @@ install: - qemu-audio-spice - ffmpeg - fish + - switcheroo-control diff --git a/config/common/shared/scripts.yml b/config/common/shared/scripts.yml index e70bf57..7e02efd 100644 --- a/config/common/shared/scripts.yml +++ b/config/common/shared/scripts.yml @@ -1,6 +1,6 @@ type: script-nu scripts: - - ptyxis.sh - - extra-packages.sh - - tuned.sh - #- rt-kernel.sh + - ptyxis.nu + - extra-packages.nu + - tuned.nu + #- rt-kernel.nu diff --git a/modules/script-nu/nushell-launcher.nu b/modules/script-nu/nushell-launcher.nu index d5e7ea5..803d6a4 100755 --- a/modules/script-nu/nushell-launcher.nu +++ b/modules/script-nu/nushell-launcher.nu @@ -2,7 +2,7 @@ def "main" [ yaml_file: string ] { - ($yaml_file | from yaml).scripts | par-each { - | script | do { run-external $"/tmp/config/scripts/($script)" | complete } + for $script in ($yaml_file | from yaml).scripts { + $"/tmp/config/scripts/($script)" } } diff --git a/modules/script-nu/script-nu.sh b/modules/script-nu/script-nu.sh index 5009ea5..0747365 100644 --- a/modules/script-nu/script-nu.sh +++ b/modules/script-nu/script-nu.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -NU_LOG_LEVEL=DEBUG nu --stdin /tmp/modules/script-nu/nushell-launcher.nu $@ +/usr/bin/env -S NU_LOG_LEVEL=DEBUG nu --stdin /tmp/modules/script-nu/nushell-launcher.nu $@