Compare commits
8 commits
7fc13776f6
...
7ffe208af9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ffe208af9 | ||
|
|
0f38e26d7f | ||
|
|
b765bb1a97 | ||
|
|
052854db38 | ||
|
|
a0a3e0f720 | ||
|
|
fdc7e241de | ||
|
|
4f529eb2f6 | ||
|
|
4cc18ec445 |
2 changed files with 30 additions and 11 deletions
|
|
@ -98,7 +98,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
NIXOS_OZONE_WL = "1";
|
|
||||||
BUILDKIT_PROGRESS = "plain";
|
BUILDKIT_PROGRESS = "plain";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -248,11 +247,11 @@
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userEmail = "chandler@chandlerswift.com";
|
|
||||||
userName = "Chandler Swift";
|
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
# TODO: delta or diff-so-fancy or difftastic
|
# TODO: delta or diff-so-fancy or difftastic
|
||||||
extraConfig = {
|
settings = {
|
||||||
|
user.name = "Chandler Swift;
|
||||||
|
user.email = "chandler@chandlerswift.com";
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
pull.ff = "only";
|
pull.ff = "only";
|
||||||
#init.templatedir = "~/.git-template"; # unsure what this was intended to do -- default hooks, maybe?
|
#init.templatedir = "~/.git-template"; # unsure what this was intended to do -- default hooks, maybe?
|
||||||
|
|
@ -287,7 +286,7 @@
|
||||||
|
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
addKeysToAgent = "yes";
|
matchBlocks."*".addKeysToAgent = "yes";
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
bert = {
|
bert = {
|
||||||
user = "root";
|
user = "root";
|
||||||
|
|
|
||||||
|
|
@ -93,13 +93,13 @@
|
||||||
(azure-cli.withExtensions [
|
(azure-cli.withExtensions [
|
||||||
# azure-cli.extensions.automation
|
# azure-cli.extensions.automation
|
||||||
azure-cli.extensions.azure-devops
|
azure-cli.extensions.azure-devops
|
||||||
# azure-cli.extensions.bastion
|
azure-cli.extensions.bastion
|
||||||
# azure-cli.extensions.fleet
|
# azure-cli.extensions.fleet
|
||||||
# azure-cli.extensions.interactive
|
# azure-cli.extensions.interactive
|
||||||
# azure-cli.extensions.log-analytics
|
# azure-cli.extensions.log-analytics
|
||||||
azure-cli.extensions.resource-graph
|
azure-cli.extensions.resource-graph
|
||||||
# azure-cli.extensions.serial-console
|
# azure-cli.extensions.serial-console
|
||||||
# azure-cli.extensions.ssh
|
azure-cli.extensions.ssh
|
||||||
])
|
])
|
||||||
iperf
|
iperf
|
||||||
units
|
units
|
||||||
|
|
@ -131,7 +131,6 @@
|
||||||
|
|
||||||
clang
|
clang
|
||||||
|
|
||||||
go
|
|
||||||
go-tools
|
go-tools
|
||||||
gopls
|
gopls
|
||||||
|
|
||||||
|
|
@ -140,6 +139,26 @@
|
||||||
programs.bash = {
|
programs.bash = {
|
||||||
enable = true;
|
enable = true;
|
||||||
historyControl = [ "ignoredups" "ignorespace" ];
|
historyControl = [ "ignoredups" "ignorespace" ];
|
||||||
|
initExtra = ''
|
||||||
|
# https://kubernetes.io/docs/reference/kubectl/quick-reference/#bash
|
||||||
|
source <(kubectl completion bash)
|
||||||
|
k() {
|
||||||
|
if [[ -t 1 ]]; then # stdout is a terminal
|
||||||
|
tput dim # Konsole's default theme requires some adjustment
|
||||||
|
printf "$ kubectl --context %q" "$(kubectl config current-context 2>/dev/null)"
|
||||||
|
printf " %q" "$@"
|
||||||
|
echo
|
||||||
|
tput sgr0
|
||||||
|
fi
|
||||||
|
kubectl "$@"
|
||||||
|
}
|
||||||
|
complete -o default -F __start_kubectl k
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.go = {
|
||||||
|
enable = true;
|
||||||
|
env.GOPATH = [ "/home/chandler/.local/share/go" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
|
|
@ -150,10 +169,10 @@
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "Chandler Swift";
|
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
# TODO: delta or diff-so-fancy or difftastic
|
# TODO: delta or diff-so-fancy or difftastic
|
||||||
extraConfig = {
|
settings = {
|
||||||
|
user.name = "Chandler Swift";
|
||||||
help.autoCorrect = "prompt";
|
help.autoCorrect = "prompt";
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
diff.wsErrorHighlight = "all";
|
diff.wsErrorHighlight = "all";
|
||||||
|
|
@ -202,7 +221,8 @@
|
||||||
|
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
addKeysToAgent = "yes";
|
matchBlocks."*".addKeysToAgent = "yes";
|
||||||
|
matchBlocks."ssh.dev.azure.com".extraOptions.WarnWeakCrypto = "no-pq-kex";
|
||||||
includes = [
|
includes = [
|
||||||
"config.d/*"
|
"config.d/*"
|
||||||
];
|
];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue