diff --git a/config/ssh-config b/config/ssh-config deleted file mode 100644 index 69a0328..0000000 --- a/config/ssh-config +++ /dev/null @@ -1,9 +0,0 @@ -Host * - IdentityAgent ~/.1password/agent.sock - -Host server - Port 22 - HostName 192.168.86.254 - User menno - ForwardAgent yes - diff --git a/home.nix b/home.nix index 60f6e53..7b3e618 100644 --- a/home.nix +++ b/home.nix @@ -15,6 +15,7 @@ zsh zsh-powerlevel10k fzf + rustup ]; }; @@ -41,7 +42,23 @@ hostname = "192.168.86.254"; user = "menno"; }; + "accept.prikklok" = { + port = 22; + hostname = "49.13.197.18"; + user = "menno"; + forwardAgent = true; + }; + "prod.prikklok" = { + port = 22; + hostname = "49.13.145.100"; + user = "menno"; + forwardAgent = true; + }; }; + extraConfig = '' + Host * + IdentityAgent ~/.1password/agent.sock + ''; }; zsh = { @@ -77,14 +94,26 @@ docker-compose = "docker compose"; gg = "git pull"; gl = "git log --stat"; + python = "python3"; }; initExtra = '' source ~/.dotfiles/config/p10k.zsh + # PHP using docker + export PATH=/home/menno/Projects/Sandwave/.data/scripts/php:$PATH + + # FVM + export PATH=/home/menno/fvm/default/bin:$PATH + if [ -f /home/menno/Projects/Sandwave/.zshrc ]; then source /home/menno/Projects/Sandwave/.zshrc fi + + # NVM + export NVM_DIR="$HOME/.nvm" + [ -s "/home/linuxbrew/.linuxbrew/opt/nvm/nvm.sh" ] && \. "/home/linuxbrew/.linuxbrew/opt/nvm/nvm.sh" # This loads nvm + [ -s "/home/linuxbrew/.linuxbrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/home/linuxbrew/.linuxbrew/opt/nvm/etc/bash_completion.d/nvm" ''; syntaxHighlighting = { diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..292fe49 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "stable"