chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

writeScript* -> writeShellScript*

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-10-16 10:14:34 +02:00
parent 10d39faff4
commit 23b7c3f5a7
No known key found for this signature in database
GPG key ID: 019E764B7184435A
9 changed files with 12 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
configurations/mail.nix
View file

@ -1,13 +1,7 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
passwordScript = pkgs.writeScript "get_mail_password" '' passwordScript = pkgs.writeShellScript "get_mail_password" ''${pkgs.pass}/bin/pass show "$@" | head -n1 | tr -d "\n"'';
#!${pkgs.bash}/bin/bash notifyScript = name: pkgs.writeShellScript "notify_${name}_mail" ''
${pkgs.pass}/bin/pass show "$@" | head -n1 | tr -d "\n"
'';
notifyScript = name: pkgs.writeScript "notify_${name}_mail" ''
#!${pkgs.bash}/bin/bash
unseen_count=$(${pkgs.mblaze}/bin/mlist -N ~/mail/*/INBOX | wc -l) unseen_count=$(${pkgs.mblaze}/bin/mlist -N ~/mail/*/INBOX | wc -l)
if [ "$unseen_count" = "1" ] if [ "$unseen_count" = "1" ]

4
configurations/ssh.nix
View file

@ -13,9 +13,7 @@
name = "openssh"; name = "openssh";
paths = [ paths = [
( (
self.writeScriptBin "ssh" '' self.writeShellScriptBin "ssh" ''
#!${self.zsh}/bin/zsh
export TERM=xterm-256color export TERM=xterm-256color
${super.openssh}/bin/ssh $@ ${super.openssh}/bin/ssh $@
'' ''

4
configurations/sway/color-picker.nix
View file

@ -1,8 +1,6 @@
{ pkgs }: { pkgs }:
pkgs.writeScriptBin "color_picker" '' pkgs.writeShellScriptBin "color_picker" ''
#!${pkgs.zsh}/bin/zsh
color=$(${pkgs.grim}/bin/grim -t png -g "$(${pkgs.slurp}/bin/slurp -p)" - | ${pkgs.imagemagick}/bin/convert png:- -unique-colors txt:- | grep -o '#[A-F0-9]\+') color=$(${pkgs.grim}/bin/grim -t png -g "$(${pkgs.slurp}/bin/slurp -p)" - | ${pkgs.imagemagick}/bin/convert png:- -unique-colors txt:- | grep -o '#[A-F0-9]\+')
${pkgs.sway}/bin/swaymsg exec -- "echo -n '$color' | ${pkgs.wl-clipboard}/bin/wl-copy --foreground" ${pkgs.sway}/bin/swaymsg exec -- "echo -n '$color' | ${pkgs.wl-clipboard}/bin/wl-copy --foreground"

4
configurations/sway/screenshot.nix
View file

@ -1,8 +1,6 @@
{ pkgs }: { pkgs }:
pkgs.writeScriptBin "screenshot" '' pkgs.writeShellScriptBin "screenshot" ''
#!${pkgs.zsh}/bin/zsh
while getopts ":rd" opt while getopts ":rd" opt
do do
case "''${opt}" in case "''${opt}" in

8
configurations/sway/status-configuration.nix
View file

@ -1,8 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
let let
mic-status = pkgs.writeScript "mic-status" '' mic-status = pkgs.writeShellScript "mic-status" ''
#!${pkgs.zsh}/bin/zsh
if [ "$(${pkgs.pulseaudio}/bin/pactl list sources | grep -o 'Mute: yes')" = "Mute: yes" ] if [ "$(${pkgs.pulseaudio}/bin/pactl list sources | grep -o 'Mute: yes')" = "Mute: yes" ]
then then
echo -e '\uf131' echo -e '\uf131'
@ -10,9 +8,7 @@ let
echo -e '\uf130' echo -e '\uf130'
fi fi
''; '';
mail-status = pkgs.writeScript "mail-status" '' mail-status = pkgs.writeShellScript "mail-status" ''
#!${pkgs.zsh}/bin/zsh
mails=$(${pkgs.mblaze}/bin/mlist -N ~/mail/*/INBOX | wc -l) mails=$(${pkgs.mblaze}/bin/mlist -N ~/mail/*/INBOX | wc -l)
if [ "$mails" -gt 0 ] if [ "$mails" -gt 0 ]
then then

8
shells/accentor-android.nix
View file

@ -35,15 +35,11 @@ let
runScript = "bash -c '''''${run}'''"; runScript = "bash -c '''''${run}'''";
}).env }).env
''; '';
gradle-run-script = pkgs.writeScriptBin "gradle" '' gradle-run-script = pkgs.writeShellScriptBin "gradle" ''
#!${pkgs.bash}/bin/bash
REPO_ROOT="$(git rev-parse --show-toplevel)" REPO_ROOT="$(git rev-parse --show-toplevel)"
nix-shell --argstr run "\"$REPO_ROOT/gradlew $@\"" "${gradle-fhs-nix}" nix-shell --argstr run "\"$REPO_ROOT/gradlew $@\"" "${gradle-fhs-nix}"
''; '';
sign-release = pkgs.writeScriptBin "sign-release" '' sign-release = pkgs.writeShellScriptBin "sign-release" ''
#!${pkgs.bash}/bin/bash
BUILD_TOOLS_PATH="${composed.androidsdk}/libexec/android-sdk/build-tools/${buildToolsVersion}" BUILD_TOOLS_PATH="${composed.androidsdk}/libexec/android-sdk/build-tools/${buildToolsVersion}"
REPO_ROOT="$(git rev-parse --show-toplevel)" REPO_ROOT="$(git rev-parse --show-toplevel)"
APK_DIR="$REPO_ROOT/app/build/outputs/apk/release" APK_DIR="$REPO_ROOT/app/build/outputs/apk/release"

4
shells/accentor-api.nix
View file

@ -9,9 +9,7 @@ pkgs.mkShell {
taglib taglib
zlib zlib
( (
pkgs.writeScriptBin "start-db" '' pkgs.writeShellScriptBin "start-db" ''
#!/${pkgs.bash}/bin/bash
trap "systemd-run --user --no-block docker stop accentor-db" 0 trap "systemd-run --user --no-block docker stop accentor-db" 0
docker run -d --name accentor-db -p 5432:5432 --rm -v accentor-db-data:/var/lib/postgresql/data -e POSTGRES_PASSWORD=accentor postgres:latest docker run -d --name accentor-db -p 5432:5432 --rm -v accentor-db-data:/var/lib/postgresql/data -e POSTGRES_PASSWORD=accentor postgres:latest

4
shells/dodona.nix
View file

@ -10,9 +10,7 @@ pkgs.mkShell {
yarn yarn
zlib zlib
( (
pkgs.writeScriptBin "start-dockers" '' pkgs.writeShellScriptBin "start-dockers" ''
#!${bash}/bin/bash
trap "systemd-run --user --no-block docker stop dodona-db dodona-cache" 0 trap "systemd-run --user --no-block docker stop dodona-db dodona-cache" 0
docker run -d --name dodona-db -p 3306:3306 --rm -v dodona-db-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest docker run -d --name dodona-db -p 3306:3306 --rm -v dodona-db-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest

4
shells/javafx.nix
View file

@ -5,9 +5,7 @@ in
pkgs.mkShell { pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
( (
pkgs.writeScriptBin "java" '' pkgs.writeShellScriptBin "java" ''
#!${pkgs.zsh}/bin/zsh
old_path="$(patchelf --print-rpath ${jdk11}/bin/java)" old_path="$(patchelf --print-rpath ${jdk11}/bin/java)"
LD_LIBRARY_PATH="$old_path:${extraRpath}" ${jdk11}/bin/java $@ LD_LIBRARY_PATH="$old_path:${extraRpath}" ${jdk11}/bin/java $@
'' ''