dave/nix-config
1
0
Fork 0
mirror of https://github.com/davegallant/nix-config synced 2026-03-03 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to bash

Browse Source
This commit is contained in:
Dave Gallant
2025-11-10 09:10:45 -05:00
parent 1f9a1a20dd
commit 75ca714850
4 changed files with 26 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
flake.lock generated
View File

@@ -227,11 +227,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760948891, "lastModified": 1762440070,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -496,11 +496,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1762471686, "lastModified": 1762733552,
"narHash": "sha256-yCVgOVyrcT4h5P9vfslK5gDNEyEwiPej9Ovksc6QI8U=", "narHash": "sha256-JHNA7NNhgyjtv9LlcBcgirdvRVpxBCRlvGYaksFS7I0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "735cf1f2a15de9b5db06c260cf0ea826ef67f108", "rev": "7a01a4b406de6db2c2c721e019d84b4157354b82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -528,11 +528,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1762111121, "lastModified": 1762596750,
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -588,11 +588,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1762233356, "lastModified": 1762498405,
"narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -660,11 +660,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1762083835, "lastModified": 1762722066,
"narHash": "sha256-O5cqRhOiKDCHBZze4VJBZqRjX4B+DttSkAJcTEhDv1k=", "narHash": "sha256-Kph9HBaDqN0dOvsb8fnhoyj4mpxF6RfoqzVqXxvpzVY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "87abad151f662238ce9946895850609c1ca42a68", "rev": "b36fcf1d64e782488fc6296eaa4f26d6cae4e090",
"type": "github" "type": "github"
}, },
"original": { "original": {

43
home.nix
View File

@@ -97,7 +97,7 @@ in
scrolling.history = 100000; scrolling.history = 100000;
general.live_config_reload = true; general.live_config_reload = true;
terminal.shell = { terminal.shell = {
program = "zsh"; program = "bash";
}; };
font = { font = {
size = lib.mkForce 14.0; size = lib.mkForce 14.0;
@@ -110,8 +110,6 @@ in
starship = { starship = {
enable = true; enable = true;
enableZshIntegration = true;
settings = { settings = {
add_newline = false; add_newline = false;
gcloud = { gcloud = {
@@ -123,22 +121,12 @@ in
}; };
}; };
zsh = { bash = {
enable = true; enable = true;
autosuggestion.enable = true; # autosuggestion.enable = true;
enableCompletion = true; historySize = 1000000;
syntaxHighlighting.enable = true;
history.size = 1000000;
localVariables = { initExtra = ''
CASE_SENSITIVE = "true";
DISABLE_UNTRACKED_FILES_DIRTY = "true";
RPROMPT = ""; # override because macOS defaults to filepath
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#838383,underline";
ZSH_DISABLE_COMPFIX = "true";
};
envExtra = ''
export PAGER=less export PAGER=less
export EDITOR=vim export EDITOR=vim
export DOCKER_CLI_HINTS=false export DOCKER_CLI_HINTS=false
@@ -156,28 +144,21 @@ in
export GOPATH=~/go export GOPATH=~/go
export GOBIN=$GOPATH/bin export GOBIN=$GOPATH/bin
export PATH=$PATH:$GOBIN export PATH=$PATH:$GOBIN
'';
initContent = '' source $HOME/.bash-work
setopt noincappendhistory
source $HOME/.zsh-work
if [[ "$OSTYPE" == "darwin"* ]]; if [[ "$OSTYPE" == "darwin"* ]];
then then
export PATH="$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH" export PATH="$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH"
alias xdg-open=open
fi fi
source <(helm completion zsh) source <(helm completion bash)
source <(kubectl completion zsh) source <(kubectl completion bash)
eval "$(atuin init zsh)" eval "$(atuin init bash)"
# kubecolor # kubecolor
source <(kubectl completion zsh) source <(kubectl completion bash)
alias kubectl=kubecolor alias kubectl=kubecolor
# make completion work with kubecolor
compdef kubecolor=kubectl
''; '';
shellAliases = { shellAliases = {
@@ -202,10 +183,6 @@ in
tree = "eza --tree"; tree = "eza --tree";
v = "nvim"; v = "nvim";
}; };
"oh-my-zsh" = {
enable = true;
};
}; };
go = { go = {

3
hosts/hephaestus.nix
View File

@@ -271,7 +271,7 @@
"libvirtd" "libvirtd"
"corectrl" "corectrl"
]; ];
shell = pkgs.zsh; shell = pkgs.bash;
}; };
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
@@ -304,7 +304,6 @@
enable = true; enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
}; };
zsh.enable = true;
}; };
services.avahi = { services.avahi = {

6
hosts/zelus.nix
View File

@@ -12,12 +12,6 @@
nix.enable = false; nix.enable = false;
programs.zsh = {
enable = true;
# https://github.com/nix-community/home-manager/issues/108#issuecomment-340397178
enableCompletion = false;
};
system.stateVersion = 4; system.stateVersion = 4;
users.users."dave.gallant".home = "/Users/dave.gallant"; users.users."dave.gallant".home = "/Users/dave.gallant";