diff --git a/home-manager/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix index 5f0ebc97..ac40d82f 100644 --- a/home-manager/opdavies/PW05CH3L.nix +++ b/home-manager/opdavies/PW05CH3L.nix @@ -8,7 +8,7 @@ tag-release time-until update-all-git-repos - vix + vic zet-new ]; diff --git a/home-manager/opdavies/nixedo.nix b/home-manager/opdavies/nixedo.nix index 92ca6c6d..902a9bfc 100644 --- a/home-manager/opdavies/nixedo.nix +++ b/home-manager/opdavies/nixedo.nix @@ -7,7 +7,7 @@ home.packages = with pkgs; [ import-to-jellyfin - vix + vic yt-dlp ]; } diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix index 0c848ade..b57169e1 100644 --- a/home-manager/opdavies/t480.nix +++ b/home-manager/opdavies/t480.nix @@ -30,7 +30,7 @@ todos-edit unmounter update-all-git-repos - vix + vic zet-new ]; diff --git a/overlays/default.nix b/overlays/default.nix index 7c05e28e..17308ce2 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,7 +4,7 @@ additions = final: prev: import ../packages { - inherit prev; + inherit inputs prev; pkgs = final; }; diff --git a/packages/default.nix b/packages/default.nix index ec591e8e..3a41c194 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,4 +1,9 @@ -{ pkgs, prev, ... }: +{ + inputs, + pkgs, + prev, + ... +}: let inherit (pkgs) callPackage; @@ -30,7 +35,7 @@ in todos-edit = callPackage ./todos-edit.nix { }; unmounter = callPackage ./unmounter.nix { }; update-all-git-repos = callPackage ./update-all-git-repos.nix { }; - vix = callPackage ./vix.nix { }; + vic = callPackage ./vic.nix { inherit inputs; }; zet-new = callPackage ./zet-new.nix { }; vimPlugins = prev.vimPlugins // vimPlugins; diff --git a/packages/vic.nix b/packages/vic.nix new file mode 100755 index 00000000..312f8467 --- /dev/null +++ b/packages/vic.nix @@ -0,0 +1,9 @@ +{ inputs, pkgs }: + +pkgs.writeShellApplication rec { + name = "vic"; + + runtimeInputs = with pkgs; [ neovim tmux ]; + + text = builtins.readFile "${inputs.rwxrob-dot}/scripts/${name}"; +} diff --git a/packages/vix.nix b/packages/vix.nix deleted file mode 100755 index 667882d2..00000000 --- a/packages/vix.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs }: - -pkgs.writeShellApplication { - name = "vix"; - - runtimeInputs = with pkgs; [ neovim ]; - - text = '' - cmd=$(command -v "$1") - test -n "$cmd" && exec "$EDITOR" "$cmd" - ''; -}