refactor(*): migrate renamed HM/NixOS options
4 files changed, -19/+39
home/features/cli/git.nix
@@ -4,29 +4,31 @@ programs.git = { enable = true; - userName = "lostduk";- userEmail = "[email protected]";- ignores = [ "CLAUDE.md" ".claude/" "**/.claude/settings.local.json" ]; - aliases = {- l = "log --oneline";- lg = "log --oneline --decorate --graph";+ settings = {+ user = {+ name = "lostduk";+ email = "[email protected]"; - s = "status";+ signing.key = "0x024E39A2037D1BBC";+ }; - fuck = "reset --hard";- shit = "reset --soft";- };+ alias = {+ l = "log --oneline";+ lg = "log --oneline --decorate --graph"; - extraConfig = {- init.defaultBranch = "main";+ s = "status"; - user.signing.key = "0x024E39A2037D1BBC";+ fuck = "reset --hard";+ shit = "reset --soft";+ };++ init.defaultBranch = "main"; gpg.program = "${config.programs.gpg.package}/bin/gpg2";
home/features/cli/gpg.nix
@@ -5,7 +5,7 @@ enable = true; enableSshSupport = true; - pinentryPackage = pkgs.pinentry-curses;+ pinentry.package = pkgs.pinentry-curses; }; programs = {
home/features/cli/ssh.nix
@@ -1,11 +1,29 @@ { programs.ssh = { enable = true;- matchBlocks = {++ # Replaces the soon-to-be-removed legacy defaults; values mirror the+ # old programs.ssh.settings."*" block.+ enableDefaultConfig = false;++ settings = {+ "*" = {+ ForwardAgent = false;+ AddKeysToAgent = "no";+ Compression = false;+ ServerAliveInterval = 0;+ ServerAliveCountMax = 3;+ HashKnownHosts = false;+ UserKnownHostsFile = "~/.ssh/known_hosts";+ ControlMaster = "no";+ ControlPath = "~/.ssh/master-%r@%n:%p";+ ControlPersist = "no";+ };+ gh = {- hostname = "github.com";- user = "git";+ HostName = "github.com";+ User = "git"; };- }; + }; }; }
nixos/features/global.nix
@@ -79,7 +79,7 @@ }; auditd.enable = true;- pam.enableSSHAgentAuth = true;+ pam.sshAgentAuth.enable = true; }; users = {
greenhouse