From d6f13fbed8b499d79d6187555430c24257023f9f Mon Sep 17 00:00:00 2001 From: caandt Date: Mon, 23 Sep 2024 22:26:02 -0500 Subject: [PATCH] xdg compliance --- config/bash/aliases | 7 +++++++ config/git/config | 5 +++++ home.nix | 11 ++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 config/git/config diff --git a/config/bash/aliases b/config/bash/aliases index cace717..f5a42d7 100644 --- a/config/bash/aliases +++ b/config/bash/aliases @@ -22,6 +22,13 @@ alias ll='ls -la' alias la='ls -la' alias l='ls' +if [[ -e ~/.local/ssh/config ]]; then + alias ssh="ssh -F ~/.local/ssh/config" + alias sftp="sftp -F ~/.local/ssh/config" + alias scp="scp -F ~/.local/ssh/config" + alias rsync="rsync -e 'ssh -F $HOME/.local/ssh/config'" +fi + # replace cat with bat _exists bat && alias cat='bat' diff --git a/config/git/config b/config/git/config new file mode 100644 index 0000000..e77789e --- /dev/null +++ b/config/git/config @@ -0,0 +1,5 @@ +[user] + email = caandt@twoha.cc + name = caandt +[core] + sshCommand = ssh -F ~/.local/ssh/config diff --git a/home.nix b/home.nix index b9a00b8..7439072 100644 --- a/home.nix +++ b/home.nix @@ -10,7 +10,15 @@ in home.homeDirectory = homeDirectory; home.packages = with pkgs; [ - firefox + (pkgs.symlinkJoin { + name = "firefox"; + paths = [ pkgs.firefox ]; + buildInputs = [ pkgs.makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/firefox \ + --set HOME "${homeDirectory}/.local/share" + ''; + }) alacritty mpv nsxiv @@ -80,6 +88,7 @@ in xdg.configFile.bash.source = mkln "config/bash"; xdg.configFile.fcitx5.source = config/fcitx5; xdg.configFile.fontconfig.source = config/fontconfig; + xdg.configFile.git.source = config/git; xdg.configFile.lsd.source = config/lsd; xdg.configFile.picom.source = config/picom; xdg.configFile.python.source = config/python;