diff --git a/flake.nix b/flake.nix index 7ff23d3d..6687e57e 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,9 @@ # PubSolarOS additions nix-dram.url = "github:dramforever/nix-dram"; nix-dram.inputs.nixpkgs.follows = "latest"; + + tritonshell.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main&dir=template"; + tritonshell.inputs.nixpkgs.follows = "latest"; }; outputs = @@ -57,7 +60,7 @@ , agenix , nvfetcher , deploy - , nix-dram + , tritonshell , ... } @ inputs: digga.lib.mkFlake diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix index e04f38c9..d135b63e 100644 --- a/users/teutat3s/home.nix +++ b/users/teutat3s/home.nix @@ -1,8 +1,9 @@ -{ config, home-manager, lib, pkgs, ... }: +{ config, home-manager, inputs, lib, pkgs, ... }: with lib; let psCfg = config.pub-solar; xdg = config.home-manager.users."${psCfg.user.name}".xdg; + tritonshell = inputs.tritonshell; in { imports = [ @@ -71,7 +72,7 @@ in }; programs.zsh = { - initExtra = import ./zshrc.nix { inherit config; inherit pkgs; }; + initExtra = import ./zshrc.nix { inherit config pkgs tritonshell; }; }; # xdg.configFile."wallpaper.jpg".source = ./assets/wallpaper.jpg; diff --git a/users/teutat3s/zshrc.nix b/users/teutat3s/zshrc.nix index f6723c14..33bc526d 100644 --- a/users/teutat3s/zshrc.nix +++ b/users/teutat3s/zshrc.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, tritonshell, ... }: '' bindkey "^[[1;3D" backward-word bindkey "^[[1;3C" forward-word @@ -60,9 +60,9 @@ source unset-env.sh triton profile set "$2" fi - source ~/CodeRoom/greenbaum.cloud/tritonshell/template/pkgs/utils/triton-docker.env.sh + source ${tritonshell.packages.${pkgs.system}.triton-docker-env}/bin/triton-docker-env.sh elif [[ "$1" == "unset" ]]; then - source ~/CodeRoom/greenbaum.cloud/tritonshell/template/pkgs/utils/unset-env.sh + source ${tritonshell.packages.${pkgs.system}.triton-utils}/bin/unset-env.sh elif [[ "$1" == "env" ]]; then env | grep "DOCKER\|MANTA\|SDC\|TRITON" | sort else