From a3a9fd54144b0d53667157779e92c1000115bc4f Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 14 Mar 2023 14:29:20 +0100 Subject: [PATCH] teutat3s: fix git config and add HashiCorp CLIs' completions --- users/teutat3s/.config/git/config.nix | 46 +++++++++++++++------------ users/teutat3s/home.nix | 8 +++++ 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/users/teutat3s/.config/git/config.nix b/users/teutat3s/.config/git/config.nix index 75cfc783..c3abe3df 100644 --- a/users/teutat3s/.config/git/config.nix +++ b/users/teutat3s/.config/git/config.nix @@ -1,25 +1,29 @@ -{ config, pkgs, ... }: -let +{ + config, + pkgs, + ... +}: let in -pkgs.lib.mkAfter ''[sendemail] - smtpserver = smtp.mailbox.org - smtpuser = jhonas@mailbox.org - smtpencryption = tls - smtpserverport = 587 + pkgs.lib.mkAfter '' [sendemail] + smtpserver = smtp.mailbox.org + smtpuser = jhonas@mailbox.org + smtpencryption = tls + smtpserverport = 587 -[lfs] - repositoryformatversion = 0 -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true + [lfs] + repositoryformatversion = 0 + [filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true -[safe] - directory = /home/teutat3s/CodeRoom/git.b12f.io/pub-solar/os + [includeIf "gitdir:~/CodeRoom/greenbaum.cloud/"] + path = ~/.config/git/config_greenbaum.cloud -[includeIf "gitdir:~/CodeRoom/greenbaum.cloud/"] - path = ~/.config/git/config_greenbaum.cloud - -[includeIf "gitdir:~/CodeRoom/git.b12f.io/"] - path = ~/.config/git/config_git.b12f.io'' + [includeIf "gitdir:~/CodeRoom/git.b12f.io/"] + path = ~/.config/git/config_git.b12f.io + [includeIf "gitdir:~/CodeRoom/git.pub.solar/"] + path = ~/.config/git/config_git.b12f.io + [includeIf "gitdir:~/CodeRoom/codeberg.org/"] + path = ~/.config/git/config_git.b12f.io'' diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix index adbc90df..1e986e1d 100644 --- a/users/teutat3s/home.nix +++ b/users/teutat3s/home.nix @@ -70,6 +70,14 @@ in { age-plugin-yubikey nix-autobahn.packages.${pkgs.system}.default ]; + programs.bash.initExtra = '' + complete -C ${pkgs.consul}/bin/consul consul + complete -C ${pkgs.nomad_1_4}/bin/nomad nomad + complete -C ${pkgs.vault}/bin/vault vault + complete -C ${pkgs.terraform}/bin/terraform terraform + complete -C ${pkgs.waypoint}/bin/waypoint waypoint + complete -C '${pkgs.awscli2}/bin/aws_completer' ${pkgs.awscli2}/bin/aws + ''; # xdg.configFile."wallpaper.jpg".source = ./assets/wallpaper.jpg; };