diff --git a/home-manager/home-wsl.nix b/home-manager/home-wsl.nix index 0ffc302..7541a31 100644 --- a/home-manager/home-wsl.nix +++ b/home-manager/home-wsl.nix @@ -34,13 +34,17 @@ in { }; ".gitconfig" = { text = '' + [core] + sshCommand = ssh.exe [user] email = arielherself@duck.com name = arielherself [gpg "ssh"] - program = ${pkgs._1password-gui}/bin/op-ssh-sign + program = "/mnt/c/Users/user/AppData/Local/1Password/app/8/op-ssh-sign.exe" [safe] directory = /mnt/fdos_server/OS-24Fall-FDU + [credential] + helper = libsecret ''; }; # "Documents" = { @@ -334,7 +338,7 @@ in { commit.gpgsign = true; gpg.format = "ssh"; # This may not apply. Also try `git config --global gpg.ssh.program "/home/user/.nix-profile/bin/op-ssh-sign"` - gpg."ssh".program = "${unstable._1password-gui}/bin/op-ssh-sign"; + # gpg."ssh".program = "${unstable._1password-gui}/bin/op-ssh-sign"; push.autoSetupRemote = true; core.editor = "nvim"; }; @@ -352,11 +356,13 @@ in { shell = "${pkgs.zsh}/bin/zsh"; extraConfig = '' # Fix font variants and undercurl but optional. - # set -ga terminal-overrides ",xterm-256color:Tc" + set -ga terminal-overrides ",xterm-256color:Tc" # set-option -sa terminal-features ',xterm-256color:RGB' + # Fix Windows Terminal set-option -g default-terminal "tmux-256color" - # Fix Windows Terminal colors set-option -sa terminal-overrides ",xterm-256color:RGB" + set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' + set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # set-option -ga terminal-features ",xterm-256color:usstyle" # set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' @@ -414,4 +420,3 @@ in { enable = true; }; } -