Update from firestar

This commit is contained in:
asonix 2023-02-10 20:32:33 -06:00
parent 7ed6b1abb5
commit d0922b6335
3 changed files with 53 additions and 54 deletions

View file

@ -44,6 +44,7 @@ in
vlc
neovim
picocom
];
home.stateVersion = "22.05";

View file

@ -41,7 +41,6 @@ in
port = 3128;
proxyJump = false;
};
"mc1" = server { hostname = "192.168.20.100"; };
"build2" = server { hostname = "192.168.20.99"; };
"bluestar" = server { hostname = "192.168.20.36"; };
"nextcloud" = server { hostname = "192.168.20.21"; };
@ -50,10 +49,7 @@ in
"redtail" = server { hostname = "192.168.20.23"; };
"redtail2" = server { hostname = "192.168.20.24"; };
"whitestorm" = server { hostname = "192.168.20.11"; };
"whitestorm2" = server { hostname = "192.168.20.26"; };
"gluster2" = server { hostname = "192.168.20.19"; user = "kube"; };
"gluster3" = server { hostname = "192.168.20.25"; };
"gluster4" = server { hostname = "192.168.20.33"; };
"whitestorm2" = server { hostname = "192.168.20.27"; };
"k3s1" = server { hostname = "192.168.20.120"; };
"k3s2" = server { hostname = "192.168.20.121"; };
"k3s3" = server { hostname = "192.168.20.122"; };

100
zsh.nix
View file

@ -6,28 +6,30 @@
dotDir = ".config/zsh";
enableAutosuggestions = true;
shellAliases = {
ls = "exa";
cat = "bat";
l = "exa -l";
la = "exa -la";
cat = "bat";
ls = "exa";
};
initExtra = ''
bindkey -v
export EDITOR=vi
if [ "$IN_NIX_SHELL" = "impure" ]; then
alias b='cargo build'
alias c='cargo check'
alias r='cargo run'
alias t='cargo test'
alias v=lvim
alias vi=lvim
alias vim=lvim
alias b='cargo build'
alias r='cargo run'
alias c='cargo check'
alias t='cargo test'
alias vi=lvim
alias vim=lvim
else
alias v=nvim
alias vi=nvim
alias vim=nvim
alias dev="nix-shell $HOME/Development/default.nix"
alias dev="nix-shell $HOME/Development/default.nix"
fi
eval "$(starship init zsh)"
@ -35,54 +37,54 @@
plugins = with pkgs; [
{
name = "zsh-syntax-highlighting";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-syntax-highlighting";
rev = "0.7.1";
sha256 = "gOG0NLlaJfotJfs+SUhGgLTNOnGLjoqnUp54V9aFJg8=";
name = "base16-shell";
src = fetchFromGitHub {
owner = "chriskempson";
repo = "base16-shell";
rev = "ae84047d378700bfdbabf0886c1fb5bb1033620f";
sha256 = "0qy+huAbPypEMkMumDtzcJdQQx5MVgsvgYu4Em/FGpQ=";
};
file = "zsh-syntax-highlighting.zsh";
file = "base16-shell.plugin.zsh";
}
{
name = "zsh-completions";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-completions";
rev = "0.34.0";
sha256 = "qSobM4PRXjfsvoXY6ENqJGI9NEAaFFzlij6MPeTfT0o=";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-completions";
rev = "0.34.0";
sha256 = "qSobM4PRXjfsvoXY6ENqJGI9NEAaFFzlij6MPeTfT0o=";
};
file = "zsh-completions.plugin.zsh";
}
{
name = "base16-shell";
src = fetchFromGitHub {
owner = "chriskempson";
repo = "base16-shell";
rev = "ae84047d378700bfdbabf0886c1fb5bb1033620f";
sha256 = "0qy+huAbPypEMkMumDtzcJdQQx5MVgsvgYu4Em/FGpQ=";
};
file = "base16-shell.plugin.zsh";
}
{
name = "zsh-z";
src = fetchFromGitHub {
owner = "agkozak";
repo = "zsh-z";
rev = "aaafebcd97424c570ee247e2aeb3da30444299cd";
sha256 = "9Wr4uZLk2CvINJilg4o72x0NEAl043lP30D3YnHk+ZA=";
};
file = "zsh-z.plugin.zsh";
file = "zsh-completions.plugin.zsh";
}
{
name = "zsh-nix-shell";
src = fetchFromGitHub {
owner = "chisui";
repo = "zsh-nix-shell";
rev = "v0.5.0";
sha256 = "0za4aiwwrlawnia4f29msk822rj9bgcygw6a8a6iikiwzjjz0g91";
};
file = "nix-shell.plugin.zsh";
src = fetchFromGitHub {
owner = "chisui";
repo = "zsh-nix-shell";
rev = "v0.5.0";
sha256 = "IT3wpfw8zhiNQsrw59lbSWYh0NQ1CUdUtFzRzHlURH0=";
};
file = "nix-shell.plugin.zsh";
}
{
name = "zsh-syntax-highlighting";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-syntax-highlighting";
rev = "0.7.1";
sha256 = "gOG0NLlaJfotJfs+SUhGgLTNOnGLjoqnUp54V9aFJg8=";
};
file = "zsh-syntax-highlighting.zsh";
}
{
name = "zsh-z";
src = fetchFromGitHub {
owner = "agkozak";
repo = "zsh-z";
rev = "aaafebcd97424c570ee247e2aeb3da30444299cd";
sha256 = "9Wr4uZLk2CvINJilg4o72x0NEAl043lP30D3YnHk+ZA=";
};
file = "zsh-z.plugin.zsh";
}
];
};