diff options
| author | Freya Murphy <fmurphy@redcom.com> | 2026-03-10 18:24:07 -0400 |
|---|---|---|
| committer | Freya Murphy <fmurphy@redcom.com> | 2026-03-10 18:24:07 -0400 |
| commit | 15a648192e29b096efdf4ef94ac846024fb51255 (patch) | |
| tree | 03d7e75a8a25991c3c08a0bef2d3d1b53493b949 | |
| parent | update commits (diff) | |
| download | dotfiles-nix-15a648192e29b096efdf4ef94ac846024fb51255.tar.gz dotfiles-nix-15a648192e29b096efdf4ef94ac846024fb51255.tar.bz2 dotfiles-nix-15a648192e29b096efdf4ef94ac846024fb51255.zip | |
update stuff for work
| -rw-r--r-- | home/git.nix | 12 | ||||
| -rw-r--r-- | hosts/work/default.nix | 11 | ||||
| -rw-r--r-- | options.nix | 1 |
3 files changed, 13 insertions, 11 deletions
diff --git a/home/git.nix b/home/git.nix index 777513a..0a75a4e 100644 --- a/home/git.nix +++ b/home/git.nix @@ -3,8 +3,16 @@ enable = true; settings = { - user.name = config.fullName; - user.email = config.email; + user = { + name = config.fullName; + email = config.email; + }; + diff = { + algorithm = "histogram"; + colorMoved = "plain"; + mnemonicPrefix = true; + renames = true; + }; init.defaultBranch = "main"; }; diff --git a/hosts/work/default.nix b/hosts/work/default.nix index 03ad03a..a626c7f 100644 --- a/hosts/work/default.nix +++ b/hosts/work/default.nix @@ -1,21 +1,14 @@ # Work # System configuration for work vm -{ - lib, - pkgs, - ... -}: { +{lib, ...}: { # options hostName = "work"; user = "fmurphy"; + email = "fmurphy@redcom.com"; minimal = true; # packages extraHome = { - home.packages = with pkgs; [ - arcanist - ]; - programs.git = { signing.signByDefault = lib.mkForce false; }; diff --git a/options.nix b/options.nix index 6021d69..e2e9067 100644 --- a/options.nix +++ b/options.nix @@ -309,6 +309,7 @@ in { primeBusIds = mkOption { type = types.attrs; description = "Set of nvidia prime gpu bus ids"; + default = {}; }; }; minimal = mkEnableOption { |