diff options
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | machines/work.nix | 1 | ||||
| -rw-r--r-- | profiles/core/git.nix | 7 |
3 files changed, 10 insertions, 6 deletions
@@ -14,11 +14,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05"; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - - nix-darwin.url = "path:/Users/ivi/nix-darwin"; - nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; + nix-darwin = { + url = "path:/Users/ivi/nix-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs @ { diff --git a/machines/work.nix b/machines/work.nix index be8580a..231028a 100644 --- a/machines/work.nix +++ b/machines/work.nix @@ -37,6 +37,7 @@ pkgs.openssh pkgs.python311 pkgs.mpv + pkgs.kubelogin ]; hm.home.sessionPath = [ "/opt/homebrew/bin" diff --git a/profiles/core/git.nix b/profiles/core/git.nix index 70b4648..39cbf5c 100644 --- a/profiles/core/git.nix +++ b/profiles/core/git.nix @@ -1,13 +1,16 @@ -{lib, ...}: with lib; { +{config,lib, ...}: with lib; +{ hm = { programs.git = { enable = true; userName = ivi.realName; - userEmail = ivi.email; + userEmail = if config.networking.hostName == "work" then "mike@pionative.com" else ivi.email; extraConfig = { worktree.guessRemote = true; mergetool.fugitive.cmd = "vim -f -c \"Gdiff\" \"$MERGED\""; merge.tool = "fugitive"; + gpg.format = "ssh"; + user.signingKey = "${config.ivi.home}/.ssh/id_ed25519_sk.pub"; }; ignores = [ "/.direnv/" |