Misc small changes

- fix ncmpcpp playlist prefix
- fix vsliveshare
- fix indentation issue in emacs config
- add some command aliases to shellOptions
This commit is contained in:
Oystein Kristoffer Tveit 2022-06-11 20:15:22 +02:00
parent 6fe3a1ffbb
commit b3b9b5136d
4 changed files with 15 additions and 12 deletions

View File

@ -215,7 +215,7 @@
current_item_inactive_column_suffix = "$/r$(end)"; current_item_inactive_column_suffix = "$/r$(end)";
now_playing_prefix = "$b"; now_playing_prefix = "$b";
now_playing_suffix = "$/b"; now_playing_suffix = "$/b";
browser_playlist_prefix = "$2playlist$9 "; browser_playlist_prefix = "$2[P] $9";
selected_item_prefix = "$6"; selected_item_prefix = "$6";
selected_item_suffix = "$9"; selected_item_suffix = "$9";
modified_item_prefix = "$3> $9"; modified_item_prefix = "$3> $9";

View File

@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
mktplcRef = { mktplcRef = {
name = "vsliveshare"; name = "vsliveshare";
publisher = "ms-vsliveshare"; publisher = "ms-vsliveshare";
version = "1.0.5090"; version = "1.0.5449";
sha256 = "gQ4tChmGxYIt+/izw9NvLCLHD8ypNO7pcWuLw4umhF0="; sha256 = "QKRWfzEdjY7S3d3RPczBvXnhxmfpJZ2bwzcIDbaw+MQ=";
}; };
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
nativeBuildInputs = nativeBuildInputs ++ [ nativeBuildInputs = nativeBuildInputs ++ [
@ -71,13 +71,6 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
--replace "path + '.lock'" \ --replace "path + '.lock'" \
"__webpack_require__('path').join(__webpack_require__('os').tmpdir(), '$ext_unique_id-vsls-agent.lock')" "__webpack_require__('path').join(__webpack_require__('os').tmpdir(), '$ext_unique_id-vsls-agent.lock')"
# Hardcode executable paths # Hardcode executable paths
echo '#!/bin/sh' >node_modules/@vsliveshare/vscode-launcher-linux/check-reqs.sh
substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/install.sh \
--replace desktop-file-install ${desktop-file-utils}/bin/desktop-file-install
substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/uninstall.sh \
--replace update-desktop-database ${desktop-file-utils}/bin/update-desktop-database
substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/vsls-launcher \
--replace /bin/bash ${bash}/bin/bash
substituteInPlace out/prod/extension-prod.js \ substituteInPlace out/prod/extension-prod.js \
--replace xprop ${xprop}/bin/xprop \ --replace xprop ${xprop}/bin/xprop \
--replace "'xsel'" "'${xsel}/bin/xsel'" --replace "'xsel'" "'${xsel}/bin/xsel'"

View File

@ -1,4 +1,4 @@
{ pkgs, config, ... }: let { pkgs, config, machineVars, ... }: let
# FIXME: lib should be imported directly as a module argument. # FIXME: lib should be imported directly as a module argument.
inherit (pkgs) lib; inherit (pkgs) lib;
@ -233,6 +233,9 @@ in rec {
m = "${ncmpcpp}/bin/ncmpcpp"; m = "${ncmpcpp}/bin/ncmpcpp";
p = "${python39Packages.ipython}/bin/ipython"; p = "${python39Packages.ipython}/bin/ipython";
s = "${sxiv}/bin/sxiv";
v = "${mpv}/bin/mpv";
zt = "${zathura}/bin/zathura";
}; };
# ░█▄█░▀█▀░█▀▀░█▀▀ # ░█▄█░▀█▀░█▀▀░█▀▀
@ -259,6 +262,13 @@ in rec {
view-latex = "${texlive.combined.scheme-full}/bin/latexmk -pdf -pvc main.tex"; view-latex = "${texlive.combined.scheme-full}/bin/latexmk -pdf -pvc main.tex";
reload-tmux = "${tmux}/bin/tmux source $HOME/.config/tmux/tmux.conf"; reload-tmux = "${tmux}/bin/tmux source $HOME/.config/tmux/tmux.conf";
fixdisplay = let
commands = {
"kasei" = "xrandr --output DVI-I-1 --mode 1920x1080 --pos 1920x0 -r 60 --primary --output DP-3 --mode 1920x1080 --pos 0x0 -r 144";
};
in
if commands ? ${machineVars.hostname} then commands.${machineVars.hostname} else "echo \"fixdisplay not defined for this hostname\"";
}; };
# ░█▀▀░█▀▀░█▀█░█▀▀░█▀▄░█▀█░▀█▀░█▀▀░█▀▄ # ░█▀▀░█▀▀░█▀█░█▀▀░█▀▄░█▀█░▀█▀░█▀▀░█▀▄