feat(fish): Use 1Password Shell Plugins from upstream flake

mrjones2014 · Mar 8, 2024 · 413c875 · 413c875
1 parent 6a02a81
commit 413c875
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 63 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,6 +12,7 @@
       url = "github:dwarfmaster/arkenfox-nixos";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    _1password-shell-plugins.url = "github:1Password/shell-plugins";
   };
 
   outputs = inputs@{ self, nixpkgs, home-manager, ... }: {

diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, inputs, ... }:
 let
   inherit (pkgs) stdenv;
   inherit (stdenv) isLinux;
@@ -29,8 +29,8 @@ in {
     [ thefuck tealdeer tokei cachix _1password btop ]
     ++ lib.lists.optionals isLinux [ xclip ];
 
-  imports = [ ./op-shell-plugins.nix ];
-  programs.op-shell-plugins = {
+  imports = [ inputs._1password-shell-plugins.hmModules.default ];
+  programs._1password-shell-plugins = {
     enable = true;
     plugins = with pkgs; [ gh ];
   };

diff --git a/home-manager/modules/op-shell-plugins.nix b/home-manager/modules/op-shell-plugins.nix