diff --git a/flake.lock b/flake.lock index ed068c7..bd18628 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1701066187, - "narHash": "sha256-WP2sUVcjM4uuCBnw2r++6Rnuqzd4iZ7oh/o7AarPjIM=", + "lastModified": 1702275809, + "narHash": "sha256-cd+IhiNJ9VYSheVxPzw6aLy91Q3+BUR35CtBqPCXfRE=", "owner": "nix-community", "repo": "fenix", - "rev": "bec77b7f219319a49dc1885490236714b023d19c", + "rev": "ab4ec60bcf513278aa1e26d71ca822161075bffc", "type": "github" }, "original": { @@ -115,12 +115,12 @@ ] }, "locked": { - "lastModified": 1699734777, - "narHash": "sha256-O0WcLEtbb5m3RA3LyWbD++fFt0Bk/pP16yhxRb+cGkM=", - "rev": "9ee4cc0ebb07d15ec31e3d66d943fbd450506abf", - "revCount": 390, + "lastModified": 1701704947, + "narHash": "sha256-G2bLYand61E/s652Q+5XSfXdM6XUWixiXRRMd3HvfM4=", + "rev": "b79c8fd3dc0aa174f0918dccfbca66efcd0e9e4e", + "revCount": 405, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.8/018bc01c-c990-72b1-b599-27e02ab475af/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.9/018c3585-e222-75a9-ac61-c5916f086445/source.tar.gz" }, "original": { "type": "tarball", @@ -148,11 +148,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1701071203, - "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", + "lastModified": 1702203126, + "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", "owner": "nix-community", "repo": "home-manager", - "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701040486, - "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=", + "lastModified": 1702206697, + "narHash": "sha256-vE9oEx3Y8TO5MnWwFlmopjHd1JoEBno+EhsfUCq5iR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45827faa2132b8eade424f6bdd48d8828754341a", + "rev": "29d6c96900b9b576c2fb89491452f283aa979819", "type": "github" }, "original": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1700882251, - "narHash": "sha256-AS24fx5urLtXjmKR/OY1x22KCOh9wWM8UNmmIaWp2js=", + "lastModified": 1701668522, + "narHash": "sha256-5pOkZfSR+bz3IpOvhdGL38qhlxXr1aXcQ6Nvxqqcfso=", "owner": "ryanccn", "repo": "nrr", - "rev": "7d1fe3ff8ee30ccf7fc252775bf0e8a8dfcb6f5a", + "rev": "c4a32f589b656f6cbf56bd9c4b3ee44cad33c5ed", "type": "github" }, "original": { @@ -296,6 +296,22 @@ "url": "https://flakehub.com/f/ryanccn/nyoom/0.%2A.tar.gz" } }, + "ohmyzsh": { + "flake": false, + "locked": { + "lastModified": 1701850926, + "narHash": "sha256-OZc6FxmfQoFfEd589g4f022F6CUHQyEWwV/Ka0HCGag=", + "owner": "ohmyzsh", + "repo": "ohmyzsh", + "rev": "48ccc7b36de8efb2bd7beb9bd6e0a6f6fe03b95d", + "type": "github" + }, + "original": { + "owner": "ohmyzsh", + "repo": "ohmyzsh", + "type": "github" + } + }, "root": { "inputs": { "am": "am", @@ -313,17 +329,19 @@ "nixpkgs": "nixpkgs", "nrr": "nrr", "nyoom": "nyoom", - "rust-overlay": "rust-overlay" + "ohmyzsh": "ohmyzsh", + "rust-overlay": "rust-overlay", + "vivid-zsh": "vivid-zsh" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1700997114, - "narHash": "sha256-pOz99NESIGosyt19tqNw7gfS6NQJtFY0kGF3rFV0bZ0=", + "lastModified": 1702247072, + "narHash": "sha256-JX+pWFPjckWD0Qa2oji1ZUbzL4kCIgeGsVcEb0Bnn+E=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "237712fa314237e428e7ef2ab83b979f928a43a1", + "rev": "457b966b171b09a7e57acb710fbca29a4b3526f0", "type": "github" }, "original": { @@ -343,11 +361,11 @@ ] }, "locked": { - "lastModified": 1701051362, - "narHash": "sha256-3dXjewnLylWGZKNshIV0eiabhIDjcUNXC5zRKcm0TxY=", + "lastModified": 1702261031, + "narHash": "sha256-FUsBGXDJapq88XH1+3xfeeZS6cwKnScPkhGMzHn0Dgo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "055d3d2ea161dfc6ca569f2f135a107f48cf483e", + "rev": "d3c43c05ef3cd66ddab4a5a82a7df71e40496aa5", "type": "github" }, "original": { @@ -370,6 +388,22 @@ "repo": "default", "type": "github" } + }, + "vivid-zsh": { + "flake": false, + "locked": { + "lastModified": 1690157517, + "narHash": "sha256-HL4QQY1QMhTw76u/xbBzodViDAMjKhRhmVXptO7qKqY=", + "owner": "ryanccn", + "repo": "vivid-zsh", + "rev": "c970eaaf90788c0e75e2a96159953f0f0c2a1b5a", + "type": "github" + }, + "original": { + "owner": "ryanccn", + "repo": "vivid-zsh", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d7b9995..70c0ea4 100644 --- a/flake.nix +++ b/flake.nix @@ -75,6 +75,16 @@ url = "github:ryanccn/nix-darwin-custom-icons"; }; + ohmyzsh = { + url = "github:ohmyzsh/ohmyzsh"; + flake = false; + }; + + vivid-zsh = { + url = "github:ryanccn/vivid-zsh"; + flake = false; + }; + flake-utils = { url = "github:numtide/flake-utils"; }; diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix index 8a19877..b0843f9 100644 --- a/home/programs/zsh.nix +++ b/home/programs/zsh.nix @@ -1,6 +1,6 @@ { - pkgs, config, + inputs, ... }: let shellAliases = builtins.mapAttrs (_: alias: alias.command) (import ./aliases.nix); @@ -26,22 +26,12 @@ in { plugins = [ { name = "ohmyzsh-macos"; - file = "plugins/macos.zsh"; - src = pkgs.fetchFromGitHub { - owner = "ohmyzsh"; - repo = "ohmyzsh"; - rev = "1c55a0fe5246487ec9f18e03b7f28862b76cb7ab"; - hash = "sha256-TPHdGOQI0hAsduu2UPHZy0lBf1G8+5PCbpE8R5PQglM="; - }; + file = "plugins/macos/macos.plugin.zsh"; + src = inputs.ohmyzsh; } { name = "vivid-zsh"; - src = pkgs.fetchFromGitHub { - owner = "ryanccn"; - repo = "vivid-zsh"; - rev = "c970eaaf90788c0e75e2a96159953f0f0c2a1b5a"; - hash = "sha256-HL4QQY1QMhTw76u/xbBzodViDAMjKhRhmVXptO7qKqY="; - }; + src = inputs.vivid-zsh; } ]; };