diff --git a/scripts/_diffr b/scripts/_diffr deleted file mode 100755 index f387dd7..0000000 --- a/scripts/_diffr +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -exec diffr \ - --colors 'refine-added:foreground:green:underline' \ - --colors 'refine-added:background:none' \ - --colors 'refine-removed:foreground:red:underline' \ - --colors 'refine-removed:background:none' \ - --colors 'added:foreground:green' \ - --colors 'added:background:none' \ - --colors 'removed:foreground:red' \ - --colors 'removed:background:none' \ - "$@" diff --git a/scripts/_gpg-unlock.nix b/scripts/_gpg-unlock.nix deleted file mode 100644 index e9196ab..0000000 --- a/scripts/_gpg-unlock.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, ... }: -pkgs.writeShellScriptBin "_gpg-unlock" '' - ${pkgs.gnupg}/bin/gpg-connect-agent reloadagent /bye - - set -e - - test -f "$HOME/.config/.preset-password" || { - ${pkgs.libnotify}/bin/notify-send "No preset password found" - exit 0; - } - - get_keygrip() { - ${pkgs.gnupg}/bin/gpg --list-secret-keys --with-keygrip | - ${pkgs.gawk}/bin/awk ' - /^ssb/ { - ssb=1 - } - /Keygrip/{ - if (ssb) print $3 - }' - } - - keygrip=$(get_keygrip) - - test -n "$keygrip" || exit 0 - - ${pkgs.coreutils}/bin/cat "$HOME/.config/.preset-password" | - ${pkgs.coreutils}/bin/base64 -d | - ${pkgs.gnupg}/libexec/gpg-preset-passphrase --preset "$keygrip" -'' diff --git a/scripts/_sway_idle_toggle b/scripts/_sway_idle_toggle deleted file mode 100755 index e77952c..0000000 --- a/scripts/_sway_idle_toggle +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -swayidlectl() { - systemctl --user $1 swayidle.service -} - -if swayidlectl status > /dev/null; then - swayidlectl stop -else - swayidlectl start -fi diff --git a/scripts/_thunar-terminal b/scripts/_thunar-terminal deleted file mode 100755 index 64971b8..0000000 --- a/scripts/_thunar-terminal +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -for path -do - test -f "$path" && - path=$(dirname "$path") - - cd "$path" - terminal -done diff --git a/scripts/bmenu b/scripts/bmenu deleted file mode 100755 index c793269..0000000 --- a/scripts/bmenu +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env fish - -# wrapper around bemenu -# bmenu * - use as dmenu, -p for custom prompt (man bemenu) -# bmenu run - select from .desktop files and run it -# bmenu start - internal option - -if test "$argv[1]" = "run" - test -n "$argv[2]" && set t "$argv[2]" || set t "terminal" - - test -n "$i3SOCK" && set wrapper 'i3-msg exec --' - test -n "$SWAYSOCK" && set wrapper 'swaymsg exec --' - - exec j4-dmenu-desktop \ - --dmenu="bmenu start -p Iniciar:" \ - --term "$t" \ - --wrapper="$wrapper" \ - --no-generic -end - -if test -n "$SWAYSOCK" - swaymsg -t get_outputs | - jq -r 'map(.focused)|reverse|index(true)' | - read focused_output - - test -n "$focused_output" - and set focused_output "-m $focused_output" -end - -set -l config "$HOME/.config/bmenu.conf" -if test -f $config - source $config -end - -exec dhist wrap -- bemenu \ - $focused_output\ - --ignorecase\ - --border 2\ - --center\ - --width-factor 0.5\ - --no-overlap\ - --list 30\ - --prefix '>'\ - --bdr "$bdr"\ - --fn "$fn"\ - --tb "$tb" --tf "$tf" \ - --fb "$fb" --ff "$ff" \ - --nb "$nb" --nf "$nf" \ - --ab "$ab" --af "$af" \ - --hb "$hb" --hf "$hf" \ - $argv - -# vim: ft=fish diff --git a/scripts/br b/scripts/br deleted file mode 100755 index 06a0dea..0000000 --- a/scripts/br +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -set -e -u - -end(){ - rm -r -- "$(dirname -- "$namebase")" - [ $# -ne 0 ] && echo $@ >&2 - exit $# -} - -if [ $# -ne 0 ] ; then - for i in "$@" ; do - printf "%s\n" "$i" - done | "$0" - exit $? -fi - -namebase="$(mktemp -d)/blkrn" -echo '# Modify filenames without removing any line, quitting aborts' \ - > "$namebase.2" -tee -- "$namebase.1" >> "$namebase.2" -exec /dev/tty || - end 'Interactive terminal needed' - -"$EDITOR" -- "$namebase.2" -sed -i -- '1d' "$namebase.2" - -! diff -- "$namebase.1" "$namebase.2" &> /dev/null || end "no changes" -[ `wc -l < "$namebase.1"` -eq `wc -l < "$namebase.2"` ] || end "Wrong number of lines" - -{ - echo '# Please review/modify this script or empty it to do nothing' - echo 'run(){' - echo ' mkdir -p "$(dirname "$2")"' - echo ' mv -T -- "$1" "$2"' - echo '}' - while read -r l1 <&3 && read -r l2 <&4; do - [ "$l1" = "$l2" ] || printf "%s\n%s\n" "$l1" "$l2" - done 3<"$namebase.1" 4<"$namebase.2" | - sed 's/\([\\"$`]\)/\\\1/g;s/^.*$/"&"/' | - xargs -d"\n" -L2 echo 'run' -} > "$namebase.sh" - -"$EDITOR" -- "$namebase.sh" -sh -e -- "$namebase.sh" - -end # exit normaly diff --git a/scripts/color_picker b/scripts/color_picker deleted file mode 100755 index e0ac75f..0000000 --- a/scripts/color_picker +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -xe - -grim -g "$(slurp -b aabbcc00 -p)" - | - convert - txt:- | - grep -oE '#[0-9A-Fa-f]{6}' | - wl-copy -n - -notify-send "$(wl-paste)" "Copied to clipboard" diff --git a/scripts/default.nix b/scripts/default.nix index c10d601..ff25367 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -18,107 +18,13 @@ --suffix PATH : ${lib.makeBinPath runtimeInputs} ''; createScripts = lib.mapAttrs (name: deps: wrapScript name ./${name} deps); - - myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]); in with final; createScripts { - br = [ ]; - bmenu = [ - bemenu - dhist - fish - j4-dmenu-desktop - jq - sway - ]; - down_meme = [ - wl-clipboard - yt-dlp - libnotify - ]; wl-copy-file = [ wl-clipboard fish ]; - _diffr = [ diffr ]; - _thunar-terminal = [ terminal ]; - _sway_idle_toggle = [ swayidle ]; - helix-pager = [ - fish - _diffr - ]; - helix-man-pager = [ helix-pager ]; - musmenu = [ - mpc-cli - wdmenu - trash-cli - xdg-user-dirs - libnotify - sd - wl-clipboard - ]; - showkeys = [ ]; # This will not work unless programs.wshowkeys is enabled systemwide - terminal = [ alacritty ]; - playerctl-status = [ playerctl ]; - pass-export = [ - pass2csv - gnupg - sd - ]; - wpass = [ - wdmenu - fd - myPass - sd - wl-clipboard - wtype - ]; - screenshotsh = [ - capitaine-cursors - grim - slurp - jq - sway - wl-clipboard - xdg-user-dirs - ]; - volumesh = [ - pulseaudio - libnotify - ]; - pulse_sink = [ - pulseaudio - pamixer - wdmenu - ]; - color_picker = [ - grim - slurp - wl-clipboard - libnotify - imagemagick - ]; - dzadd = [ - procps - libnotify - wdmenu - jq - mpv - pqiv - python3Packages.deemix - mpc-cli - mpdDup - ]; - mpdDup = [ - mpc-cli - perl - ]; - readQrCode = [ - grim - zbar - wl-clipboard - ]; auto_connect_gamepad = [ bluez coreutils @@ -130,9 +36,4 @@ libratbag ]; } - // lib.mapAttrs importScript { - wdmenu = ./wdmenu.nix; - wlauncher = ./wlauncher.nix; - _gpg-unlock = ./_gpg-unlock.nix; - } ) diff --git a/scripts/down_meme b/scripts/down_meme deleted file mode 100755 index 133fe33..0000000 --- a/scripts/down_meme +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -DIR=$(mktemp -d) - -cd "$DIR" - -yt-dlp --merge-output-format mp4 "$(wl-paste)" - -FILENAME="$(ls | head -n1)" - -mkdir -p "$HOME/Downloads/Memes" - -cp "$FILENAME" "$HOME/Downloads/Memes/$FILENAME" - -wl-copy-file "$HOME/Downloads/Memes/$FILENAME" - -notify-send "Meme downloaded" "$FILENAME" - -rm -rf "$DIR" diff --git a/scripts/dzadd b/scripts/dzadd deleted file mode 100755 index 585275f..0000000 --- a/scripts/dzadd +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/sh - -set -ex - -tmpf=$(mktemp /tmp/dzadd.XXXXXX) - -clean() { - test "$?" -eq "0" || - notify-send "Exiting with error" - - set +e - kill "$mpvPid" - rm -f "$tmpf" -} - -trap clean EXIT - -main() { - sType=$(printf "Track\nAlbum\nArtist" | wdmenu | tr '[:upper:]' '[:lower:]') - test -n "$sType" || exit 1 - - query=$(echo -n | wdmenu | sed 's/[^ a-z0-9]//g;s/ /+/g') - test -n "$query" || exit 1 - - case "$sType" in - track) - deezer_category="track" - jqFilter='.data[]| "\(.title) - \(.album.title) - \(.artist.name) |\(.id)"' - ;; - album) - deezer_category="album" - jqFilter='.data[]| "\(.nb_tracks) - \(.title) - \(.artist.name) |\(.id)"' - ;; - artist) - deezer_category="artist" - jqFilter='.data[]| "\(.nb_fan) - \(.name) |\(.id)"' - ;; - top50) - deezer_category="artist" - jqFilter='.data[]| "\(.nb_fan) - \(.name) |\(.id)"' - ;; - *) - exit 1 - ;; - esac - - curl -m30 -s "api.deezer.com/search/${deezer_category}?q=${query}" | - sed 's/|//g' | - jq -r "$jqFilter" >"$tmpf" - - pick_song -} - -pick_song() { - choice=$(cat "$tmpf" | cut -d\| -f1 | wdmenu) - choice=$(grep "$choice" "$tmpf" | head -n 1) - choiceId=$(printf "%s" "$choice" | cut -d\| -f2) - - case "$sType" in - top50) - choiceUrl="http://deezer.com/${deezer_category}/${choiceId}/top?=limit=50" - ;; - *) - choiceUrl="http://deezer.com/${deezer_category}/${choiceId}" - ;; - esac - - - pick_action "$choiceUrl" -} - -pick_action() { - - choiceUrl="$1" - - COMMON_CHOISES="View Image\nDownload\nCopy URL\nAnother" - choice=$(printf "Preview\n${COMMON_CHOISES}" | wdmenu) - - case "$choice" in - - "Preview") - common_preview - ;; - - "View Image") - common_art - ;; - - "Download") - common_download - ;; - - "Copy URL") - wl-copy - ;; - - "Another") - pick_song - ;; - - *) - exit 1 - ;; - - esac - -} - -common_preview() { - - case "$sType" in - track) - ;; - album) - preview_suffix=tracks - ;; - artist) - preview_suffix=top - ;; - top50) - preview_suffix=top - ;; - *) - exit 1 - ;; - esac - - choicePreview=$( - curl -m30 -s "http://api.deezer.com/${deezer_category}/${choiceId}/${preview_suffix}" | - jq -r '.preview, .data[0].preview | select(. != null)' - ) - - mpv --quiet --volume=50 --no-resume-playback "$choicePreview" & - mpvPid="$!" - choice=$(printf "$COMMON_CHOISES" | wdmenu -p 'Download?') - kill "$mpvPid" || true -} - -common_art() { - - case "$sType" in - track) - image_filter='.album.cover_big' - ;; - album) - image_filter='.cover_big' - ;; - artist) - image_filter='.picture_big' - ;; - top50) - image_filter='.picture_big' - ;; - *) - exit 1 - ;; - esac - - curl -m30 -s "api.deezer.com/${deezer_category}/${choiceId}" | - jq -r "$image_filter" | - xargs curl -m30 -s | - pqiv - - - pick_action -} - -common_download() { - notify-send "Starting Download" - deemix "$choiceUrl" "$LOGFILE" 2>&1 diff --git a/scripts/screenshotsh b/scripts/screenshotsh deleted file mode 100755 index 98aa17e..0000000 --- a/scripts/screenshotsh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -export XCURSOR_SIZE=40 -export XCURSOR_THEME='capitaine-cursors-light' - -screenshot="grim" -copy="wl-copy -t image/png" - -if which xdg-user-dir >/dev/null 2>&1; then - DESTFOLDER="$(xdg-user-dir PICTURES)" -else - for i in Images Imagens Pictures Fotos ""; do - DESTFOLDER="$HOME/$i" - test -d "$DESTFOLDER" && - break - done -fi - -DESTFOLDER="$DESTFOLDER/Screenshots" -mkdir -p "$DESTFOLDER" -DESTFILE="$DESTFOLDER/$(date +'%Y-%m-%d-%H%M%S_screenshot.png')" - -case $1 in - def) - # Screenshot to file - $screenshot "$DESTFILE" - echo "$DESTFILE" - ;; - - area) - # Screen area to file - $screenshot -g "$(slurp -d -b 30303088)" "$DESTFILE" - echo "$DESTFILE" - ;; - area-clip) - # Screen area to clipboard - $screenshot -g "$(slurp -d -b 30303088)" - | $copy - ;; - - clip) - # Focused monitor to clipboard - cur_output=$(swaymsg -t get_outputs | - jq -r '.[] | select(.focused) | .name') - - test -n "$cur_output" && - $screenshot -o "$cur_output" - | $copy || - $screenshot - | $copy - ;; -esac diff --git a/scripts/showkeys b/scripts/showkeys deleted file mode 100755 index 30629b8..0000000 --- a/scripts/showkeys +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -pidof wshowkeys && pkill wshowkeys || -exec wshowkeys \ - -a bottom -a right \ - -F 'Inter 20' \ - -b 202020AA \ - -s DD5050 \ - -t 1 \ - -m 100 diff --git a/scripts/terminal b/scripts/terminal deleted file mode 100755 index b363f01..0000000 --- a/scripts/terminal +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -CLASS="terminal" - -while test $# -gt 0;do - case $1 in - -c|--class) - shift - CLASS=$1 - shift - ;; - *) - break - ;; - esac -done - -exec alacritty --class "$CLASS" "$@" diff --git a/scripts/volumesh b/scripts/volumesh deleted file mode 100755 index 010cbc9..0000000 --- a/scripts/volumesh +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/sh - -set -xe - -# depends on: awk, pactl, pacmd, notify-send - -MAX_VOL=150 -STEP=10 - -notify() { - volume=$(get_vol_$TARGET) - - if is_muted_$TARGET; then - s="Muted" - else - s="Volume" - fi - - s=$(echo "${TARGET} ${s}" | sed 's/^\(.\)/\U\1/') - - notify-send "${s}" "${volume}%" \ - --app-name=volumesh \ - --hint=int:value:"$volume" - -} - -round() { - awk '{ - print int($1/'$STEP')*'$STEP'; - }' -} - -round_vol() { - rounded=$(get_vol_$TARGET | round) - newvol=$(min $MAX_VOL $rounded) -} - -min() { - printf '%i\n' ${@} | sort -n | head -n1 -} - -# Pulse{{{ -get_vol_system() { - pamixer --get-volume -} - -is_muted_system() { - test "$(pamixer --get-mute)" = "true" >/dev/null -} - -change_vol_system() { - pamixer "-$1" "$(min 120 $2)" - round_vol - pamixer --set-volume "${newvol}" - if - test -n "$VOLUME_CHANGE_SOUND" - then - paplay "$VOLUME_CHANGE_SOUND" - fi -} - -toggle_mute_system() { - pactl set-sink-mute @DEFAULT_SINK@ toggle -} -#}}} -# Mpd {{{ - -get_vol_mpd() { - env LC_ALL=C mpc vol | - sed -e 's/^.*://g' -e 's/%.*$//g' -e 's/ //g' -} - -is_muted_mpd() { - env LC_ALL=C mpc status | grep '\[paused\]' 1>/dev/null -} -change_vol_mpd() { - case $1 in - d) - op="-";; - i) - op="+";; - esac - mpc vol "${op}${2}" &>/dev/null - round_vol - mpc vol "${newvol}" &>/dev/null -} - -toggle_mute_mpd() { - mpc toggle -} -#}}} -usage() { - local CNAME=$(basename $0) - echo "${CNAME} [-m][-di ]" - echo "${CNAME} [-m][-t]" - echo "" - echo "Options:" - echo " -m --mpd Target mpd instead of PulseAudio" - echo " -i --increase of volume to increase" - echo " -d --decrease of volume to decrease" - echo " -t --toggle Mute/Unmute target" - echo " -h --help Show This help message" - - exit "$1" -} -TARGET=system - -while [ $# -gt 0 ]; do - case $1 in - -m | --mpd) - TARGET=mpd - shift - ;; - -i | --increase) - shift - change_vol_$TARGET i $1 - shift - ;; - -d | --decrease) - shift - change_vol_$TARGET d $1 - shift - ;; - -t | --toggle) - toggle_mute_$TARGET - shift - ;; - -h | --help) - usage 0 - ;; - *) - usage 1 - ;; - esac -done - -notify - -# vim: fdm=marker diff --git a/scripts/wdmenu.nix b/scripts/wdmenu.nix deleted file mode 100644 index 3505781..0000000 --- a/scripts/wdmenu.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -pkgs.writeShellScriptBin "wdmenu" '' - exec bmenu "$@" -'' diff --git a/scripts/wfile-picker.nix b/scripts/wfile-picker.nix deleted file mode 100644 index d8ced8a..0000000 --- a/scripts/wfile-picker.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -let - inherit (config.my) dmenu; - available_menus = { - bmenu = "bmenu run"; - rofi = "rofi -show drun -sort"; - }; - menu_cmd = available_menus.${dmenu}; -in -pkgs.writeShellScriptBin "wlauncher" '' - exec ${menu_cmd} "$@" -'' diff --git a/scripts/wlauncher.nix b/scripts/wlauncher.nix deleted file mode 100644 index d2c2dec..0000000 --- a/scripts/wlauncher.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -pkgs.writeShellScriptBin "wlauncher" '' - exec bmenu run "$@" -'' diff --git a/system/media-packages.nix b/system/media-packages.nix index 2fdbfb6..491cb11 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -13,7 +13,6 @@ in }; config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ - down_meme yt-dlp ffmpeg obs-studio diff --git a/user/home.nix b/user/home.nix index 3840077..089ecce 100644 --- a/user/home.nix +++ b/user/home.nix @@ -41,9 +41,6 @@ home.packages = with pkgs; [ # home-manager - terminal # see flake.nix - - pulse_sink pulseaudio ## CLI @@ -56,8 +53,6 @@ p7zip tealdeer micro - _diffr - br # bulk rename comma diff --git a/user/vscode/settings.json b/user/vscode/settings.json index d6c516d..899d453 100644 --- a/user/vscode/settings.json +++ b/user/vscode/settings.json @@ -25,7 +25,6 @@ "intelephense.format.braces": "k&r", "continue.enableTabAutocomplete": true, "intelephense.completion.fullyQualifyGlobalConstantsAndFunctions": true, - "diffEditor.renderSideBySide": false, "diffEditor.hideUnchangedRegions.enabled": true, "nix.formatterPath": "nixfmt", "explorer.confirmDelete": false,