commit 4f0e64a38ecbd7fbaa35b65a3e37eba7eda36e34
parent 45b5dcce31ecba86adc16b30111702f70fcf6546
Author: William Casarin <jb55@jb55.com>
Date: Sat, 27 Mar 2021 09:00:09 -0700
Merge branch 'laptop'
Diffstat:
19 files changed, 64 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+bin/cmdtree
+bin/viscal
+bin/gmni
+bin/lagrange
+bin/resources.lgr
diff --git a/bin/btc b/bin/btc
@@ -3,4 +3,8 @@
cmd=${1:-price}
shift
+if [ $HOSTNAME != "monad" ]; then
+ exec ssh monad env PATH=/home/jb55/bin:\$PATH btc-$cmd "$@"
+fi
+
exec btc-$cmd "$@"
diff --git a/bin/edit-gui b/bin/edit-gui
@@ -1,2 +1,2 @@
#!/usr/bin/env sh
-urxvtc -e nvim "$@"
+urxvt -e nvim "$@"
diff --git a/bin/fuzz-funcs b/bin/fuzz-funcs
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eou pipefail
+file=$(rg --files | fuzzer "$@")
+fuzz-search-file "$file" " func "
diff --git a/bin/gemini b/bin/gemini
@@ -1,2 +1,8 @@
#!/usr/bin/env sh
-exec $GEMINICLIENT "$@"
+if [[ "$1" =~ ^gemini: ]] || [[ "$1" =~ ^gopher: ]]; then
+ $GEMINICLIENT "$@"
+else
+ $GEMINICLIENT "gemini://$1"
+fi
+
+
diff --git a/bin/lessr b/bin/lessr
@@ -15,4 +15,4 @@ then
fi
# export LESS="-cix8JRM --save-marks"
-exec less -J --save-marks "$@"
+exec less --save-marks "$@"
diff --git a/bin/notmuch-am b/bin/notmuch-am
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-mbox=$(mktemp)
-notmuch show --format=mbox "$1" > "$mbox"
-msgid=$(grep -i ^message-id "$mbox" | cut -d" " -f2 | head -n1)
-b4 am "$msgid" -m "$mbox"
-rm -f "$mbox"
diff --git a/bin/viscal b/bin/viscal
Binary files differ.
diff --git a/bin/x11-rename b/bin/x11-rename
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-xdotool selectwindow set_window --name "$1"
diff --git a/dotfiles/.config/mimi/mime.conf b/dotfiles/.config/mimi/mime.conf
@@ -21,5 +21,6 @@ zoommtg: zoom-us
mailto: /home/jb55/bin/notmuch-emacs-mua --client --hello
spotify: /home/jb55/bin/spotify-open
ps: zathura
+epub: zathura
http: zoom-link-opener
https: zoom-link-opener
diff --git a/dotfiles/.config/neomutt/neomuttrc b/dotfiles/.config/neomutt/neomuttrc
@@ -7,6 +7,7 @@ set wait_key=no
set from="jb55@jb55.com"
set pipe_decode=yes
unset markers
+set text_flowed
set sort = threads
set sort_aux = reverse-last-date-received
diff --git a/dotfiles/.config/qutebrowser/quickmarks b/dotfiles/.config/qutebrowser/quickmarks
@@ -22,4 +22,4 @@ steamoji-burndown https://steamoji.atlassian.net/secure/RapidBoard.jspa?rapidVie
steamoji-issues https://steamoji.atlassian.net/browse/STEAM-825?jql=ORDER%20BY%20updated%20DESC
gpu-reset-bug https://forum.level1techs.com/t/linux-host-windows-guest-gpu-passthrough-reinitialization-fix/121097
rbc https://www.rbcroyalbank.com/personal.html
-books https://ca1lib.org/
+zlibrary https://ca1lib.org/
diff --git a/dotfiles/.config/zathura/zathurarc b/dotfiles/.config/zathura/zathurarc
@@ -11,7 +11,6 @@ set recolor-darkcolor "#afb6c3"
set recolor-keephue "false"
set scroll-page-aware "false"
-set scroll-full-overlap 0
set scroll-step 100
set smooth-scroll "true"
diff --git a/dotfiles/commands b/dotfiles/commands
@@ -21,6 +21,7 @@ cs compile show build echo cat .build-result
m make fuzz-make
sp search project fuzz-search-files
ss search project file fuzz-search-file
+sf search project file funcs fuzz-funcs
h run history fuzz-run-hist
tj tag jump fuzz-tag-jump
te todos edit echo edit ~/docs/todo/todo.txt
diff --git a/jb55pkgs/.gitignore b/jb55pkgs/.gitignore
@@ -0,0 +1 @@
+/result
diff --git a/jb55pkgs/default.nix b/jb55pkgs/default.nix
@@ -26,6 +26,7 @@ in rec {
define = callPackage ./pkgs/define { };
rsslink = callPackage ./pkgs/rsslink { };
+ x11-rename = callPackage ./pkgs/x11-rename { };
ratio = fetch-srht {
repo = "ratio";
@@ -35,8 +36,8 @@ in rec {
cmdtree = fetch-jb55 {
repo = "cmdtree";
- rev = "3c3927d2e62cd91c6bc7a4313f6ef6edcc3e9336"; # use my config
- sha256 = "0fy30v4d9c73az97g8sbnaca89zj6g984rgyjjbkj3ymb3cszmj4";
+ rev = "86d3680c934ef0cfa87103ec5e9e59e30bbaa5ca"; # use my config
+ sha256 = "1m6mgay9rc4vc8ib6zxvvz75flcaxdargpijqdh4zm45bghn34lp";
};
nixpkgs-ml-tools = fetch-jb55 {
diff --git a/jb55pkgs/pkgs/x11-rename/default.nix b/jb55pkgs/pkgs/x11-rename/default.nix
@@ -0,0 +1,32 @@
+{ pkgs ? import <nixpkgs> {},
+ stdenv ? pkgs.stdenv,
+ fetchurl ? pkgs.fetchurl,
+ bash ? pkgs.bash,
+ xdotool ? pkgs.xdotool,
+ zenity ? pkgs.gnome3.zenity,
+ writeScript ? pkgs.writeScript
+}:
+let
+ x11-rename-zen = writeScript "x11-rename-zen" ''
+ #!${bash}/bin/bash
+ name="$(${zenity}/bin/zenity --entry --text=name:)"
+ ${xdotool}/bin/xdotool selectwindow set_window --name $name
+ '';
+in
+stdenv.mkDerivation rec {
+ pname = "x11-rename";
+ version = "0.1";
+
+ src = writeScript pname ''
+ #!${bash}/bin/bash
+ ${xdotool}/bin/xdotool selectwindow set_window --name "$1"
+ '';
+
+ phases = ["installPhase"];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp $src $out/bin/${pname}
+ cp ${x11-rename-zen} $out/bin/x11-rename-zen
+ '';
+}
diff --git a/nix-config/environment/desktop/default.nix b/nix-config/environment/desktop/default.nix
@@ -19,6 +19,7 @@ let gtk2rc = pkgs.writeText "gtk2rc" ''
snap
cmdtree
zoom-link-opener
+ x11-rename
viscal
];
diff --git a/nix-config/machines/quiver/default.nix b/nix-config/machines/quiver/default.nix
@@ -9,7 +9,7 @@ extra:
(import ./timers extra)
];
- environment.systemPackages = with pkgs; [ acpi xorg.xbacklight ];
+ environment.systemPackages = with pkgs; [ acpi xorg.xbacklight sshuttle ];
virtualisation.docker.enable = true;
virtualisation.virtualbox.host.enable = false;
