diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 695c91d..2179162 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -22,6 +22,11 @@ eval $(gpg-agent --daemon) export PATH="$PATH:~/.local/share/cargo/bin/" export PATH="$PATH:$JAVA_HOME/bin/" +if [ ! -z "$(grep nixos /etc/os-release)" ]; then + # NixOS does not explicitly link usr local bin + # Yes I know I'm circumventing immutability. + export PATH=/usr/local/bin:$PATH +fi export PATH=~/.local/bin/overrides:$PATH # Overriding /usr/bin/* export PATH=~/.local/bin:$PATH # Highest precedence to local bin diff --git a/.local/bin/dlkiller b/.local/bin/dlkiller index bc5147a..423131f 100755 --- a/.local/bin/dlkiller +++ b/.local/bin/dlkiller @@ -1,4 +1,4 @@ -#!/usr/bin/sh +#!/usr/bin/env sh # For the programs that create a ~/Downloads folder on startup (ie: spotify, zoom) # Look in the program settings to redirect the Downloads folder before trying this solution # Usage: 'dlkiller $my-program' diff --git a/.local/bin/menu-layout b/.local/bin/menu-layout index 0045532..d5ee6c7 100755 --- a/.local/bin/menu-layout +++ b/.local/bin/menu-layout @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh layout=`autorandr | rofi -dmenu -i -p "Select layout" | awk '{print $1}'` autorandr $layout feh --bg-scale --no-fehbg "$HOME/.config/wallpaper" diff --git a/.local/bin/menu-run b/.local/bin/menu-run index 175f062..6d9b981 100755 --- a/.local/bin/menu-run +++ b/.local/bin/menu-run @@ -1,8 +1,8 @@ -#!/usr/bin/sh +#!/usr/bin/env sh # Script to have rofi show and run aliases rofi -run-list-command "alias | awk -F= \"{print \\\$1}\"" \ - -run-command "/usr/bin/zsh -i -c '{cmd}'" \ + -run-command "/usr/bin/env zsh -i -c '{cmd}'" \ -rnow -show-icons -matching "prefix" \ -display-combi "Start" \ -show combi -combi-modes "drun,run" diff --git a/.local/bin/menu-sink b/.local/bin/menu-sink index 1cced71..7707cf7 100755 --- a/.local/bin/menu-sink +++ b/.local/bin/menu-sink @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh # Simple dmenu script for changing default audio sink sinks_and_numbers=`wpctl status | diff --git a/.local/bin/menu-unicode b/.local/bin/menu-unicode index 42babd1..83edbf1 100755 --- a/.local/bin/menu-unicode +++ b/.local/bin/menu-unicode @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh # The famous "get a menu of emojis to copy" script. diff --git a/.local/bin/pinentry-wrapper b/.local/bin/pinentry-wrapper index 0aae9f9..2add1f0 100755 --- a/.local/bin/pinentry-wrapper +++ b/.local/bin/pinentry-wrapper @@ -5,13 +5,13 @@ case "$PINENTRY_USER_DATA" in dmenu) - exec /usr/bin/pinentry-dmenu "$@" + exec pinentry-dmenu "$@" ;; rofi) - exec /usr/bin/pinentry-rofi "$@" + exec pinentry-rofi "$@" ;; *) - exec /usr/bin/pinentry-curses "$@" + exec pinentry-curses "$@" ;; esac diff --git a/.local/bin/rotdir b/.local/bin/rotdir index d8909d9..3b32d6d 100755 --- a/.local/bin/rotdir +++ b/.local/bin/rotdir @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh # When I open an image from the file manager in nsxiv (the image viewer), I want # to be able to press the next/previous keys to key through the rest of the diff --git a/.local/share/gnupg/gpg-agent.conf b/.local/share/gnupg/gpg-agent.conf index 25be380..09fb200 100644 --- a/.local/share/gnupg/gpg-agent.conf +++ b/.local/share/gnupg/gpg-agent.conf @@ -1,3 +1,3 @@ enable-ssh-support -pinentry-program /usr/bin/pinentry-wrapper +pinentry-program /usr/local/bin/pinentry-wrapper