mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(glittershark): Get everything working on Darwin

Browse source 
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
This commit is contained in:
Griffin Smith 2020-11-25 09:59:11 -05:00 committed by glittershark
parent c56f402383
commit 29ea6b9408
8 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
users/glittershark/emacs.d/config.el
View file

@ -4,14 +4,17 @@
(setq x-super-keysym 'alt (setq x-super-keysym 'alt
x-alt-keysym 'meta) x-alt-keysym 'meta)
(setq user-mail-address "griffin@urbint.com" (setq user-mail-address "root@gws.fyi"
user-full-name "Griffin Smith") user-full-name "Griffin Smith")
(setq doom-font (font-spec :family "Meslo LGSDZ Nerd Font" :size 14) (let ((font-family (pcase system-type
doom-big-font (font-spec :family "Meslo LGSDZ Nerd Font" :size 24) ('darwin "MesloLGSDZ NF")
doom-big-font-increment 5 ('gnu/linux "Meslo LGSDZ Nerd Font"))))
doom-variable-pitch-font (font-spec :family "DejaVu Sans") (setq doom-font (font-spec :family font-family :size 14)
doom-unicode-font (font-spec :family "Meslo LGSDZ Nerd Font")) 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) (require 's)
@ -57,8 +60,6 @@
(flycheck-mode)) (flycheck-mode))
(setq exec-path (append exec-path '("/home/grfn/.cargo/bin")))
(after! cargo (after! cargo
(setq cargo-process--custom-path-to-bin "/home/grfn/.cargo/bin/cargo")) (setq cargo-process--custom-path-to-bin "/home/grfn/.cargo/bin/cargo"))

5
users/glittershark/emacs.d/packages.el
View file

@ -74,11 +74,6 @@
(package! racer :disable t) (package! racer :disable t)
(package! cargo) (package! cargo)
;; Elixir
(package! flycheck-credo)
(package! flycheck-mix)
(package! flycheck-dialyxir)
;; Lisp ;; Lisp
(package! paxedit) (package! paxedit)

4
users/glittershark/system/home/default.nix
View file

@ -21,5 +21,9 @@ rec {
chupacabraHome = chupacabra.activation-script; chupacabraHome = chupacabra.activation-script;
dobharchu = home ./machines/dobharchu.nix;
dobharchuHome = dobharchu.activation-script;
meta.targets = [ "chupacabraHome" ]; meta.targets = [ "chupacabraHome" ];
} }

10
users/glittershark/system/home/modules/common.nix
View file

@ -38,8 +38,6 @@
gnupg gnupg
keybase keybase
openssl openssl
yubikey-manager
yubikey-manager-qt
# Nix things # Nix things
nixfmt nixfmt
@ -78,4 +76,12 @@
}; };
}; };
}; };
services.lorri.enable = true;
programs.direnv = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
};
} }

9
users/glittershark/system/home/modules/development.nix
View file

@ -21,7 +21,7 @@ let
}; };
vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4"; vendorSha256 = "1a5fx6mrv30cl46kswicd8lf5i5shn1fykchvbnbhdpgxhbz6qi4";
deleteVendor = true; deleteVendor = pkgs.stdenv.isLinux;
}; };
in in
@ -52,8 +52,6 @@ with lib;
gdb gdb
lldb lldb
valgrind
rr
hyperfine hyperfine
clj2nix clj2nix
@ -63,7 +61,10 @@ with lib;
pg-dump-upsert pg-dump-upsert
config.lib.depot.third_party.clang-tools config.lib.depot.third_party.clang-tools
]; # ++ optional (stdenv.isLinux) julia; ] ++ optionals (stdenv.isLinux) [
valgrind
rr
];
programs.git = { programs.git = {
enable = true; enable = true;

2
users/glittershark/system/home/modules/games.nix
View file

@ -47,12 +47,12 @@ in mkMerge [
{ {
home.packages = [ home.packages = [
crawl crawl
multimc
]; ];
} }
(mkIf stdenv.isLinux { (mkIf stdenv.isLinux {
home.packages = [ home.packages = [
df df
multimc
]; ];
}) })
] ]

32
users/glittershark/system/home/platforms/darwin.nix
View file

@ -3,22 +3,24 @@
with lib; with lib;
{ {
home.packages = with pkgs; [ config = {
coreutils home.packages = with pkgs; [
gnupg coreutils
pinentry_mac gnupg
]; pinentry_mac
];
home.activation.linkApplications = lib.hm.dag.entryAfter ["writeBoundary"] '' home.activation.linkApplications = lib.hm.dag.entryAfter ["writeBoundary"] ''
$DRY_RUN_CMD ln -sf $VERBOSE_ARG \ $DRY_RUN_CMD ln -sf $VERBOSE_ARG \
~/.nix-profile/Applications/* ~/Applications/ ~/.nix-profile/Applications/* ~/Applications/
''; '';
programs.zsh.initExtra = '' programs.zsh.initExtra = ''
export NIX_PATH=$HOME/.nix-defexpr/channels:$NIX_PATH export NIX_PATH=$HOME/.nix-defexpr/channels:$NIX_PATH
if [[ "$TERM" == "alacritty" ]]; then if [[ "$TERM" == "alacritty" ]]; then
export TERM="xterm-256color" export TERM="xterm-256color"
fi fi
''; '';
};
} }

9
users/glittershark/system/home/platforms/linux.nix
View file

@ -59,6 +59,8 @@ in
gnupg gnupg
keybase keybase
openssl openssl
yubikey-manager
yubikey-manager-qt
# Spotify...etc # Spotify...etc
spotify spotify
@ -83,13 +85,6 @@ in
]; ];
}; };
# programs.tarsnap = {
# enable = true;
# keyfile = "/home/grfn/.private/tarsnap.key";
# printStats = true;
# humanizeNumbers = true;
# };
programs.zsh.initExtra = '' programs.zsh.initExtra = ''
[[ ! $IN_NIX_SHELL ]] && alsi -l [[ ! $IN_NIX_SHELL ]] && alsi -l
''; '';