diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-11-25T14·59-0500 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-11-25T15·06+0000 |
| commit | 29ea6b9408446f0c033726fd7bb07449ab37d1ee (patch) | |
| tree | 9a3ad6c1d6af2e1f42c914357991433547bfb0b8 /users/glittershark/system/home/platforms | |
| parent | c56f402383491ee2841ea64edf2022ba361d0b87 (diff) | |
feat(glittershark): Get everything working on Darwin r/1917
Update everything in home-manager to properly work on darwin (including adding dobharchu as a top-level attribute from //users/glittershark/home) and also fix font faces and sizes in emacs config Change-Id: Ica889dd212876030d5c2a916a71d8b614e6964f1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2147 Reviewed-by: glittershark <grfn@gws.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'users/glittershark/system/home/platforms')
| -rw-r--r-- | users/glittershark/system/home/platforms/darwin.nix | 32 | ||||
| -rw-r--r-- | users/glittershark/system/home/platforms/linux.nix | 9 |
2 files changed, 19 insertions, 22 deletions
diff --git a/users/glittershark/system/home/platforms/darwin.nix b/users/glittershark/system/home/platforms/darwin.nix index d6b33ba5625c..cf0375e94162 100644 --- a/users/glittershark/system/home/platforms/darwin.nix +++ b/users/glittershark/system/home/platforms/darwin.nix @@ -3,22 +3,24 @@ with lib; { - home.packages = with pkgs; [ - coreutils - gnupg - pinentry_mac - ]; + config = { + home.packages = with pkgs; [ + coreutils + gnupg + pinentry_mac + ]; - home.activation.linkApplications = lib.hm.dag.entryAfter ["writeBoundary"] '' - $DRY_RUN_CMD ln -sf $VERBOSE_ARG \ - ~/.nix-profile/Applications/* ~/Applications/ - ''; + home.activation.linkApplications = lib.hm.dag.entryAfter ["writeBoundary"] '' + $DRY_RUN_CMD ln -sf $VERBOSE_ARG \ + ~/.nix-profile/Applications/* ~/Applications/ + ''; - programs.zsh.initExtra = '' - export NIX_PATH=$HOME/.nix-defexpr/channels:$NIX_PATH + programs.zsh.initExtra = '' + export NIX_PATH=$HOME/.nix-defexpr/channels:$NIX_PATH - if [[ "$TERM" == "alacritty" ]]; then - export TERM="xterm-256color" - fi - ''; + if [[ "$TERM" == "alacritty" ]]; then + export TERM="xterm-256color" + fi + ''; + }; } diff --git a/users/glittershark/system/home/platforms/linux.nix b/users/glittershark/system/home/platforms/linux.nix index fd9bcf192433..b1e8cd19400f 100644 --- a/users/glittershark/system/home/platforms/linux.nix +++ b/users/glittershark/system/home/platforms/linux.nix @@ -59,6 +59,8 @@ in gnupg keybase openssl + yubikey-manager + yubikey-manager-qt # Spotify...etc spotify @@ -83,13 +85,6 @@ in ]; }; - # programs.tarsnap = { - # enable = true; - # keyfile = "/home/grfn/.private/tarsnap.key"; - # printStats = true; - # humanizeNumbers = true; - # }; - programs.zsh.initExtra = '' [[ ! $IN_NIX_SHELL ]] && alsi -l ''; |