samw
/
home
mirror of https://github.com/wlcx/home.git
1
Fork 0
Code Issues Projects Releases Wiki Activity

Remove mac-specific ssh agent, tweak aliases

This commit is contained in:
Sam W 2022-01-10 15:57:17 +00:00
parent efd9acc7bd
commit 1e5c9aec5c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
home.nix
View File

@ -3,21 +3,21 @@
let mypkgs = (import ./modules/pkgs.nix { inherit pkgs; }); let mypkgs = (import ./modules/pkgs.nix { inherit pkgs; });
in { in {
home.packages = mypkgs.all; home.packages = mypkgs.all;
home.sessionVariables = {
"EDITOR" = "nvim";
};
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
# Shell and env-y stuff # Shell and env-y stuff
zsh = { zsh = {
enable = true; enable = true;
envExtra = ''
export SSH_AUTH_SOCK=/Users/sam.willcocks/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
'';
shellAliases = { shellAliases = {
g = "git"; g = "git";
cat = "bat"; cat = "bat";
vim = "nvim"; vim = "nvim";
hmswitch = ''home-manager switch --flake ".#$(hostname -s)"''; hmswitch = ''home-manager switch --flake ".#$(hostname -s)"'';
nrswitch = "nixos-rebuild switch --flake '.#'"; nrswitch = "sudo nixos-rebuild switch --flake '.#'";
}; };
plugins = [{ plugins = [{
@ -68,8 +68,12 @@ in {
co = "checkout"; co = "checkout";
d = "diff"; d = "diff";
dc = "diff --cached"; dc = "diff --cached";
r = "rebase --autostash"; l = "log";
ri = "rebase --autostash --interactive"; lp = "log --patch";
r = "rebase";
rc = "rebase --continue";
ra = "rebase --autostash";
rai = "rebase --autostash --interactive";
st = "status"; st = "status";
gone = '' gone = ''