tritonshell: init and adjust paths to source scripts in zshrc

This commit is contained in:
teutat3s 2022-03-04 15:11:19 +01:00
parent c889aa96dc
commit 2d68f026ef
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 10 additions and 6 deletions

View file

@ -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

View file

@ -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;

View file

@ -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