From 29ea6b9408446f0c033726fd7bb07449ab37d1ee Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Wed, 25 Nov 2020 09:59:11 -0500 Subject: [PATCH] feat(glittershark): Get everything working on Darwin 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 Tested-by: BuildkiteCI --- users/glittershark/emacs.d/config.el | 17 +++++----- users/glittershark/emacs.d/packages.el | 5 --- users/glittershark/system/home/default.nix | 4 +++ .../system/home/modules/common.nix | 10 ++++-- .../system/home/modules/development.nix | 9 +++--- .../system/home/modules/games.nix | 2 +- .../system/home/platforms/darwin.nix | 32 ++++++++++--------- .../system/home/platforms/linux.nix | 9 ++---- 8 files changed, 46 insertions(+), 42 deletions(-) diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el index e06f6a5d6..29d46e24e 100644 --- a/users/glittershark/emacs.d/config.el +++ b/users/glittershark/emacs.d/config.el @@ -4,14 +4,17 @@ (setq x-super-keysym 'alt x-alt-keysym 'meta) -(setq user-mail-address "griffin@urbint.com" +(setq user-mail-address "root@gws.fyi" user-full-name "Griffin Smith") -(setq doom-font (font-spec :family "Meslo LGSDZ Nerd Font" :size 14) - doom-big-font (font-spec :family "Meslo LGSDZ Nerd Font" :size 24) - doom-big-font-increment 5 - doom-variable-pitch-font (font-spec :family "DejaVu Sans") - doom-unicode-font (font-spec :family "Meslo LGSDZ Nerd Font")) +(let ((font-family (pcase system-type + ('darwin "MesloLGSDZ NF") + ('gnu/linux "Meslo LGSDZ Nerd Font")))) + (setq doom-font (font-spec :family font-family :size 14) + doom-big-font (font-spec :family font-family :size 24) + doom-big-font-increment 5 + doom-variable-pitch-font (font-spec :family "DejaVu Sans") + doom-unicode-font (font-spec :family font-family))) (require 's) @@ -57,8 +60,6 @@ (flycheck-mode)) -(setq exec-path (append exec-path '("/home/grfn/.cargo/bin"))) - (after! cargo (setq cargo-process--custom-path-to-bin "/home/grfn/.cargo/bin/cargo")) diff --git a/users/glittershark/emacs.d/packages.el b/users/glittershark/emacs.d/packages.el index ac6897170..011d8d41d 100644 --- a/users/glittershark/emacs.d/packages.el +++ b/users/glittershark/emacs.d/packages.el @@ -74,11 +74,6 @@ (package! racer :disable t) (package! cargo) -;; Elixir -(package! flycheck-credo) -(package! flycheck-mix) -(package! flycheck-dialyxir) - ;; Lisp (package! paxedit) diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix index 1e5ed9825..d19397192 100644 --- a/users/glittershark/system/home/default.nix +++ b/users/glittershark/system/home/default.nix @@ -21,5 +21,9 @@ rec { chupacabraHome = chupacabra.activation-script; + dobharchu = home ./machines/dobharchu.nix; + + dobharchuHome = dobharchu.activation-script; + meta.targets = [ "chupacabraHome" ]; } diff --git a/users/glittershark/system/home/modules/common.nix b/users/glittershark/system/home/modules/common.nix index 14ac4a8b0..69494cea4 100644 --- a/users/glittershark/system/home/modules/common.nix +++ b/users/glittershark/system/home/modules/common.nix @@ -38,8 +38,6 @@ gnupg keybase openssl - yubikey-manager - yubikey-manager-qt # Nix things nixfmt @@ -78,4 +76,12 @@ }; }; }; + + services.lorri.enable = true; + + programs.direnv = { + enable = true; + enableBashIntegration = true; + enableZshIntegration = true; + }; } diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index 1fe9381be..3056f8547 100644 --- a/users/glittershark/system/home/modules/development.nix +++ b/users/glittershark/system/home/modules/development.nix @@ -21,7 +21,7 @@ let }; vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4"; - deleteVendor = true; + deleteVendor = pkgs.stdenv.isLinux; }; in @@ -52,8 +52,6 @@ with lib; gdb lldb - valgrind - rr hyperfine clj2nix @@ -63,7 +61,10 @@ with lib; pg-dump-upsert config.lib.depot.third_party.clang-tools - ]; # ++ optional (stdenv.isLinux) julia; + ] ++ optionals (stdenv.isLinux) [ + valgrind + rr + ]; programs.git = { enable = true; diff --git a/users/glittershark/system/home/modules/games.nix b/users/glittershark/system/home/modules/games.nix index e508d7b3b..b3e07a83e 100644 --- a/users/glittershark/system/home/modules/games.nix +++ b/users/glittershark/system/home/modules/games.nix @@ -47,12 +47,12 @@ in mkMerge [ { home.packages = [ crawl - multimc ]; } (mkIf stdenv.isLinux { home.packages = [ df + multimc ]; }) ] diff --git a/users/glittershark/system/home/platforms/darwin.nix b/users/glittershark/system/home/platforms/darwin.nix index d6b33ba56..cf0375e94 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 fd9bcf192..b1e8cd194 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 '';