From 631d23eaed7dc456862cc5ec8f6e046f155c517b Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Mon, 23 Aug 2021 05:55:54 -0500 Subject: [PATCH] restore lazygit-window from backup --- dotfiles/tmux/default.nix | 5 ++++- flake.nix | 2 ++ {backup/pkgs => pkgs}/lazygit-window/default.nix | 2 +- {backup/pkgs => pkgs}/lazygit-window/lazygit-window.sh | 0 4 files changed, 7 insertions(+), 2 deletions(-) rename {backup/pkgs => pkgs}/lazygit-window/default.nix (85%) rename {backup/pkgs => pkgs}/lazygit-window/lazygit-window.sh (100%) diff --git a/dotfiles/tmux/default.nix b/dotfiles/tmux/default.nix index 34be6d8..b46e475 100644 --- a/dotfiles/tmux/default.nix +++ b/dotfiles/tmux/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ pkgs, ... }: { programs.tmux = { enable = true; terminal = "tmux-256color"; @@ -15,6 +15,9 @@ bind-key -n C-k select-pane -U bind-key -n C-l select-pane -R + # quickly open CLI tools + bind h run-shell "${pkgs.lazygit-window}/bin/lazygit-window" + # get rid of the half-second escape time for kakoune's escape key set -sg escape-time 25 diff --git a/flake.nix b/flake.nix index b5675ce..48cc1e2 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,8 @@ # is this going to cause problems by not actually being a package? fzf-tab = inputs.fzf-tab; + + lazygit-window = final.callPackage ./pkgs/lazygit-window {}; }; nixosConfigurations.torch = inputs.nixpkgs.lib.nixosSystem { diff --git a/backup/pkgs/lazygit-window/default.nix b/pkgs/lazygit-window/default.nix similarity index 85% rename from backup/pkgs/lazygit-window/default.nix rename to pkgs/lazygit-window/default.nix index 0868f68..b2ad597 100644 --- a/backup/pkgs/lazygit-window/default.nix +++ b/pkgs/lazygit-window/default.nix @@ -1,4 +1,4 @@ -{ sources ? import ../../nix/sources.nix, pkgs ? import sources.nixpkgs { } }: +{ pkgs ? import { } }: pkgs.stdenv.mkDerivation { # inspired by one of Stöffel's keybindings at # https://github.com/stoeffel/.dots/blob/master/tmux/keybindings.conf diff --git a/backup/pkgs/lazygit-window/lazygit-window.sh b/pkgs/lazygit-window/lazygit-window.sh similarity index 100% rename from backup/pkgs/lazygit-window/lazygit-window.sh rename to pkgs/lazygit-window/lazygit-window.sh