diff --git a/common/gui.nix b/common/gui.nix index 34f3e05a..df402eb7 100644 --- a/common/gui.nix +++ b/common/gui.nix @@ -2,6 +2,7 @@ pkgs, device, lib, + inputs, ... }: lib.attrsets.optionalAttrs device.hasGui { @@ -10,6 +11,8 @@ lib.attrsets.optionalAttrs device.hasGui { # neovide ] ++ lib.optionals device.isLinux [ + _1password + _1password-gui bitwarden discord bottles @@ -36,5 +39,17 @@ lib.attrsets.optionalAttrs device.hasGui { webcord-vencord spotify wl-clipboard + ]; + # import the home-manager module + imports = [inputs._1password-shell-plugins.hmModules.default]; + programs = { + _1password-shell-plugins = { + # enable 1Password shell plugins for bash, zsh, and fish shell + enable = true; + # the specified packages as well as 1Password CLI will be + # automatically installed and configured to use shell plugins + plugins = with pkgs; [gh awscli2 cachix]; + }; + }; } diff --git a/flake.lock b/flake.lock index a5770d91..ba6504e1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "_1password-shell-plugins": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1716464653, + "narHash": "sha256-7ABtcvZf8P2axZNVV3m9LiKy1VW0lumu60sSuUOYG0o=", + "owner": "1Password", + "repo": "shell-plugins", + "rev": "d36189bf486ff2c4d9275c9ce29ec1aa92eaa4a7", + "type": "github" + }, + "original": { + "owner": "1Password", + "repo": "shell-plugins", + "type": "github" + } + }, "advisory-db": { "flake": false, "locked": { @@ -105,7 +124,7 @@ "advisory-db": "advisory-db", "crane": "crane", "fenix": "fenix", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -158,7 +177,7 @@ "home-manager" ], "nixos-anywhere": "nixos-anywhere", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1716236735, @@ -240,7 +259,7 @@ "crane_4": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs": [ "music-player", "nixpkgs" @@ -337,7 +356,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "nixpkgs": [ "neovim", "nixvim", @@ -360,7 +379,7 @@ }, "devshell_2": { "inputs": { - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_14", "nixpkgs": [ "nixvim", "nixpkgs" @@ -793,24 +812,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_10": { - "inputs": { - "systems": "systems_12" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -825,13 +826,34 @@ "type": "github" } }, - "flake-utils_11": { + "flake-utils_10": { + "inputs": { + "systems": "systems_12" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "inputs": { + "systems": "systems_13" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -856,8 +878,23 @@ } }, "flake-utils_13": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_14": { "inputs": { - "systems": "systems_14" + "systems": "systems_15" }, "locked": { "lastModified": 1701680307, @@ -873,9 +910,9 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_15": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1705309234, @@ -891,24 +928,6 @@ "type": "github" } }, - "flake-utils_15": { - "inputs": { - "systems": "systems_16" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_16": { "inputs": { "systems": "systems_17" @@ -927,9 +946,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_17": { "inputs": { - "systems": "systems_2" + "systems": "systems_18" }, "locked": { "lastModified": 1710146030, @@ -945,9 +964,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1705309234, @@ -963,10 +982,46 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_4": { "inputs": { "systems": "systems_4" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -980,9 +1035,9 @@ "type": "indirect" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1705309234, @@ -998,9 +1053,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -1016,24 +1071,6 @@ "type": "github" } }, - "flake-utils_7": { - "inputs": { - "systems": "systems_9" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_8": { "inputs": { "systems": "systems_10" @@ -1057,11 +1094,11 @@ "systems": "systems_11" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -1340,7 +1377,7 @@ "hyprlock", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1713121246, @@ -1362,7 +1399,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1716987277, @@ -1406,7 +1443,7 @@ "crane": "crane_3", "flake-compat": "flake-compat", "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ], @@ -1432,7 +1469,7 @@ "advisory-db": "advisory-db_2", "crane": "crane_4", "fenix": "fenix_2", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_9", "nixpkgs": [ "nixpkgs" ] @@ -1453,7 +1490,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1717067539, @@ -1585,7 +1622,7 @@ "nvim-devdocs": "nvim-devdocs", "pets": "pets", "rest-nvim": "rest-nvim", - "systems": "systems_13", + "systems": "systems_14", "tree-sitter-d2": "tree-sitter-d2", "tree-sitter-just": "tree-sitter-just" }, @@ -1681,7 +1718,7 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1717297675, @@ -1771,11 +1808,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "lastModified": 1716358718, + "narHash": "sha256-NQbegJb2ZZnAqp2EJhWwTf6DrZXSpA6xZCEq+RGV1r0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "rev": "3f316d2a50699a78afe5e77ca486ad553169061e", "type": "github" }, "original": { @@ -1836,6 +1873,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1713995372, "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", @@ -1848,7 +1901,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1717112898, "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", @@ -1862,22 +1915,6 @@ "type": "indirect" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_6": { "locked": { "lastModified": 1644486793, @@ -1895,6 +1932,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1716948383, "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", @@ -1910,7 +1963,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -2010,7 +2063,7 @@ }, "nno": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_11", "neorg": "neorg_2", "neorg-telescope": "neorg-telescope_2", "nixpkgs": [ @@ -2037,8 +2090,8 @@ "norg": { "inputs": { "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_11", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1672582520, @@ -2058,8 +2111,8 @@ "norg-meta": { "inputs": { "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_12", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_13", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1713028366, @@ -2216,13 +2269,14 @@ }, "root": { "inputs": { + "_1password-shell-plugins": "_1password-shell-plugins", "anyrun": "anyrun", "anyrun-hyprwin": "anyrun-hyprwin", "anyrun-nixos-options": "anyrun-nixos-options", "anyrun-rbw": "anyrun-rbw", "anyrun-rink": "anyrun-rink", "cachix-deploy-flake": "cachix-deploy-flake", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "home-manager": "home-manager", "hyprlock": "hyprlock", "ironbar": "ironbar", @@ -2231,7 +2285,7 @@ "neovim": "neovim", "nix-darwin": "nix-darwin_2", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixvim": "nixvim_2", "nur": "nur", "openapi-tui": "openapi-tui", @@ -2242,8 +2296,8 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1716603336, @@ -2261,8 +2315,8 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1708135817, @@ -2280,7 +2334,7 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "ironbar", "nixpkgs" @@ -2354,7 +2408,7 @@ }, "rust-overlay_6": { "inputs": { - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_15", "nixpkgs": [ "nixpkgs" ] @@ -2401,7 +2455,7 @@ "subflakes": { "inputs": { "csshacks": "csshacks", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_16", "nixpkgs": [ "nixpkgs" ] @@ -2552,6 +2606,21 @@ "type": "github" } }, + "systems_18": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2599,16 +2668,16 @@ }, "systems_5": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2629,16 +2698,16 @@ }, "systems_7": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -2772,7 +2841,7 @@ "zjstatus": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_17", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index fdfb12a9..75f1f26d 100644 --- a/flake.nix +++ b/flake.nix @@ -79,6 +79,7 @@ url = "github:cachix/cachix-deploy-flake"; inputs.home-manager.follows = "home-manager"; }; + _1password-shell-plugins.url = "github:1Password/shell-plugins"; }; outputs = {