diff --git a/flake.nix b/flake.nix index 0c05d5e..af46a5e 100644 --- a/flake.nix +++ b/flake.nix @@ -167,36 +167,18 @@ [ ]; fileList = dir: map (file: ./. + "/${dir}/${file}") (ls dir); - config = { repos = [ - { - repo = "https://gitlab.com/vojko.pribudic/pre-commit-update"; - rev = "2d784f3bebf8a39417b70e77062135e3282f1181"; - hooks = [ - { - id = "pre-commit-update"; - args = [ "--dry-run" ]; - } - ]; - } { repo = "local"; hooks = [ - # { - # id = "nixfmt check"; - # entry = "${nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style}/bin/nixfmt"; - # args = [ "--check" ]; - # language = "system"; - # files = "\\.nix"; - # } - # { - # id = "check"; - # entry = "nix eval"; - # language = "system"; - # files = "\\.nix"; - # pass_filenames = false; - # } + { + id = "nix fmt check"; + entry = "${outputs.formatter.x86_64-linux}/bin/nixfmt"; + args = [ "--check" ]; + language = "system"; + files = "\\.nix"; + } ]; } ]; diff --git a/users/alice/home/zsh.nix b/users/alice/home/zsh.nix index fcb67b5..f89c4ee 100644 --- a/users/alice/home/zsh.nix +++ b/users/alice/home/zsh.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkg, ... }: { programs.zsh = { @@ -20,6 +20,18 @@ #"fzf" ]; }; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkg.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.8.0"; + sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7"; + }; + } + ]; initExtra = '' # functions function mount-data {