diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rwxr-xr-x | config/lf/cleaner.sh | 3 | ||||
| -rw-r--r-- | config/lf/lfrc | 3 | ||||
| -rwxr-xr-x | config/lf/previewer.sh | 38 | ||||
| -rw-r--r-- | packages.nix | 7 | ||||
| -rw-r--r-- | packages/st/pkg.nix | 8 | ||||
| m--------- | packages/st/source | 0 |
7 files changed, 35 insertions, 30 deletions
diff --git a/.gitmodules b/.gitmodules index 08ace1f..95649a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "packages/dwm/source"] path = packages/dwm/source url = git@github.com:phenax/dwm.git -[submodule "packages/st/source"] - path = packages/st/source - url = git@github.com:phenax/st.git [submodule "packages/dmenu/source"] path = packages/dmenu/source url = git@github.com:phenax/dmenu.git @@ -31,3 +28,6 @@ [submodule "packages/xmonad/source"] path = packages/xmonad/source url = git@github.com:phenax/xmonad-config.git +[submodule "packages/st/source"] + path = packages/st/source + url = git@github.com:phenax/st-kitty-term.git diff --git a/config/lf/cleaner.sh b/config/lf/cleaner.sh new file mode 100755 index 0000000..01e9b6a --- /dev/null +++ b/config/lf/cleaner.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +exec kitten icat --clear --stdin no --transfer-mode file </dev/null >/dev/tty diff --git a/config/lf/lfrc b/config/lf/lfrc index 3ab9a08..0adfcfe 100644 --- a/config/lf/lfrc +++ b/config/lf/lfrc @@ -7,7 +7,8 @@ set ratios 2:3 set dirpreviews false set preview true -set previewer ~/.config/lf/previewer.sh +set previewer ~/nixos/config/lf/previewer.sh +set cleaner ~/nixos/config/lf/cleaner.sh set cursorpreviewfmt "\033[7m" cmd open_internal ${{ diff --git a/config/lf/previewer.sh b/config/lf/previewer.sh index 981ef55..429d7fe 100755 --- a/config/lf/previewer.sh +++ b/config/lf/previewer.sh @@ -1,22 +1,26 @@ #!/bin/sh -width=`echo "$(tput cols) / 2" | bc`; -height=`echo "$(tput lines) - 3" | bc`; +set -eo pipefail -x=$((width - 3)); -y=3; +file="$1"; +w="$2"; +h="$3"; +x="$4"; +y="$5"; -~/scripts/image.sh clear; +show_image() { + kitten icat --transfer-mode file --stdin no --place "${w}x${h}@${x}x${y}" "$file" < /dev/null > /dev/tty; +} case "$1" in # Archives - *.tgz|*.tar.gz) tar tzf "$1";; - *.tar.bz2|*.tbz2) tar tjf "$1";; - *.tar.txz|*.txz) xz --list "$1";; - *.tar) tar tf "$1";; - *.zip|*.jar|*.war|*.ear|*.oxt) unzip -l "$1";; - *.rar) unrar l "$1";; - *.7z) 7z l "$1";; + *.tgz|*.tar.gz) tar tzf "$1" ;; + *.tar.bz2|*.tbz2) tar tjf "$1" ;; + *.tar.txz|*.txz) xz --list "$1" ;; + *.tar) tar tf "$1" ;; + *.zip|*.jar|*.war|*.ear|*.oxt) unzip -l "$1" ;; + *.rar) unrar l "$1" ;; + *.7z) 7z l "$1" ;; *.o) nm "$1" | less ;; *.apk) mediainfo "$1" ;; @@ -29,15 +33,11 @@ case "$1" in *.[1-8]) man "$1" | col -b ;; # Images - *.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp) - catimg -w "$((width * 2 * 3))" "$1"; - echo "done" + *.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp|*.gif) + show_image 2>/dev/null || chafa -f symbols --size "$((w * 2 / 3))" "$file" || echo "cant display image"; + exit 1; ;; - #*.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp) - #~/scripts/image.sh draw "$1" "$x" "$y" "$width" "$height"; - #;; - # Audio *.wav|*.mp3|*.flac|*.m4a|*.wma|*.ape|*.ac3|*.og[agx]|*.spx|*.opus|*.as[fx]|*.flac) mediainfo "$1" diff --git a/packages.nix b/packages.nix index 09ab398..5cd605f 100644 --- a/packages.nix +++ b/packages.nix @@ -118,6 +118,8 @@ let libnotify xcwd unzip + p7zip + unrar curl jq wget @@ -127,13 +129,14 @@ let at bc bat - # catimg + chafa + kitty + figlet fd # sad mediainfo poppler_utils glow - # figlet wineWowPackages.stable pkgs.steam-run flatpak diff --git a/packages/st/pkg.nix b/packages/st/pkg.nix index cd95fa7..80f558b 100644 --- a/packages/st/pkg.nix +++ b/packages/st/pkg.nix @@ -1,15 +1,13 @@ -{ stdenv, pkgs, libX11, libXinerama, libXft, fontconfig, pkg-config, ncurses }: -with pkgs.lib; +{ stdenv, pkgs, libX11, libXft, fontconfig, pkg-config, ncurses, imlib2 }: stdenv.mkDerivation rec { name = "local-st-${version}"; - version = "0.8.4"; + version = "0.9.4"; src = ./source; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXft fontconfig ncurses ]; - + buildInputs = [ libX11 libXft fontconfig ncurses imlib2 ]; unpackPhase = ''cp -r $src/* .''; diff --git a/packages/st/source b/packages/st/source -Subproject 188f4b986038cc81ee6aad98c137c3a43534d5f +Subproject cd8c5ccf216c2db3b397e9ce674aa582c30a1e2 |