diff --git a/flake.nix b/flake.nix index da93357..055bd75 100644 --- a/flake.nix +++ b/flake.nix @@ -155,6 +155,7 @@ } ]; }; + magpie = nixpkgs.lib.nixosSystem rec { system = "aarch64-linux"; modules = [ diff --git a/home/zsh.nix b/home/zsh.nix index 64fb97b..cd315db 100644 --- a/home/zsh.nix +++ b/home/zsh.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { programs.z-lua = { enableAliases = true; @@ -11,13 +11,13 @@ defaultKeymap = "viins"; shellAliases = { - cfind = "cscope -C -R -L1"; + cfind = "${pkgs.cscope}/bin/cscope -C -R -L1"; chmod = "chmod -v"; chown = "chown -v"; cp = "cp -v"; rm = "rm -v"; ip = "ip --color=auto"; - f = "''$(pay-respects zsh)"; + f = "''$(${lib.getExe pkgs.pay-respects} zsh)"; }; history = { @@ -108,7 +108,7 @@ zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then - TMUX_EXE="${pkgs.tmux}/bin/tmux" + TMUX_EXE="${lib.getExe pkgs.tmux}" systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER fi