diff --git a/configs/default.nix b/configs/default.nix index 03cdec2..59099d0 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -138,7 +138,7 @@ in { cdt = "source ${cdt}"; vit = "$EDITOR $(mktemp)"; tmux = "${pkgs.tmux}/bin/tmux -2"; - sxiv = swallow "${pkgs.sxiv}/bin/sxiv"; + sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv"; zathura = swallow "${pkgs.zathura}/bin/zathura"; us = "${pkgs.systemd}/bin/systemctl --user"; wcd = "source ${wcd}"; @@ -264,7 +264,7 @@ in { ./ssh.nix ./sshd.nix ./sudo.nix - ./sxiv.nix + ./nsxiv.nix ./themes.nix ./tmux.nix ./traadfri.nix diff --git a/configs/mime.nix b/configs/mime.nix index ac01fe2..d0f83c0 100644 --- a/configs/mime.nix +++ b/configs/mime.nix @@ -7,8 +7,8 @@ "application/pdf" = "org.pwmt.zathura.desktop"; "application/vnd.oasis.opendocument.text" = "writer.desktop"; "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "writer.desktop"; - "image/jpeg" = "sxiv.desktop"; - "image/png" = "sxiv.desktop"; + "image/jpeg" = "nsxiv.desktop"; + "image/png" = "nsxiv.desktop"; "image/vnd.djvu+multipage" = "org.pwmt.zathura.desktop"; "text/html" = "brave-browser.desktop"; "text/markdown" = "nvim.desktop"; diff --git a/configs/neomutt.nix b/configs/neomutt.nix index 3291dcd..3ef9b8d 100644 --- a/configs/neomutt.nix +++ b/configs/neomutt.nix @@ -25,7 +25,7 @@ in { pkgs.writeText "mailcap" '' text/plain; $EDITOR %s ; text/html; ${pkgs.lynx}/bin/lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput; - image/*; ${pkgs.sxiv}/bin/sxiv %s ; + image/*; ${pkgs.nsxiv}/bin/nsxiv %s ; video/*; ${pkgs.utillinux}/bin/setsid ${pkgs.mpv}/bin/mpv --quiet %s &; copiousoutput audio/*; ${pkgs.mpv}/bin/mpv %s ; application/pdf; ${pkgs.zathura}/bin/zathura %s ; diff --git a/configs/sxiv.nix b/configs/nsxiv.nix similarity index 93% rename from configs/sxiv.nix rename to configs/nsxiv.nix index cbc39c9..c9b68a7 100644 --- a/configs/sxiv.nix +++ b/configs/nsxiv.nix @@ -15,10 +15,10 @@ cf ''${XDG_CONFIG_HOME:-$HOME/.config} ''; in { - environment.systemPackages = [pkgs.sxiv]; + environment.systemPackages = [pkgs.nsxiv]; # TODO fix - home-manager.users.me.xdg.configFile."sxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" '' + home-manager.users.me.xdg.configFile."nsxiv/exec/key-handler".source = pkgs.writers.writeDash "key-handler" '' PATH=$PATH:${ lib.makeBinPath [ pkgs.gnused diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix index 56dfef2..024fab4 100644 --- a/packages/scripts/default.nix +++ b/packages/scripts/default.nix @@ -96,7 +96,7 @@ in rm "$file" } ${pkgs.qrencode}/bin/qrencode "$(${pkgs.xclip}/bin/xclip -selection clipboard -out)" -o "$file" - ${pkgs.sxiv}/bin/sxiv "$file" + ${pkgs.nsxiv}/bin/nsxiv "$file" ''; ttspaste = pkgs.writers.writeDashBin "ttspaste" '' @@ -123,7 +123,7 @@ in }; meteo = wrapScript { - packages = [pkgs.jq pkgs.curl pkgs.xdotool pkgs.sxiv pkgs.gnused]; + packages = [pkgs.jq pkgs.curl pkgs.xdotool pkgs.nsxiv pkgs.gnused]; script = ./meteo.sh; name = "meteo"; }; diff --git a/packages/scripts/meteo.sh b/packages/scripts/meteo.sh index ae10aaf..4483a48 100755 --- a/packages/scripts/meteo.sh +++ b/packages/scripts/meteo.sh @@ -69,8 +69,8 @@ curl -sSL \ "http://wetterstationen.meteomedia.de/messnetz/vorhersagegrafik/$station.png" \ -o "$cache" -if window_id=$(xdotool search --name "^sxiv - $cache$"); then +if window_id=$(xdotool search --name "^nsxiv - $cache$"); then xdotool key --window "$window_id" r else - sxiv "$cache" & + nsxiv "$cache" & fi