axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

tritonshell: init and adjust paths to source scripts in zshrc

Browse source
This commit is contained in:
teutat3s 2022-03-04 15:11:19 +01:00
parent c889aa96dc
commit 2d68f026ef
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -44,6 +44,9 @@
# PubSolarOS additions # PubSolarOS additions
nix-dram.url = "github:dramforever/nix-dram"; nix-dram.url = "github:dramforever/nix-dram";
nix-dram.inputs.nixpkgs.follows = "latest"; 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 = outputs =
@ -57,7 +60,7 @@
, agenix , agenix
, nvfetcher , nvfetcher
, deploy , deploy
, nix-dram , tritonshell
, ... , ...
} @ inputs: } @ inputs:
digga.lib.mkFlake digga.lib.mkFlake

5
users/teutat3s/home.nix
View file

@ -1,8 +1,9 @@
{ config, home-manager, lib, pkgs, ... }: { config, home-manager, inputs, lib, pkgs, ... }:
with lib; with lib;
let let
psCfg = config.pub-solar; psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg; xdg = config.home-manager.users."${psCfg.user.name}".xdg;
tritonshell = inputs.tritonshell;
in in
{ {
imports = [ imports = [
@ -71,7 +72,7 @@ in
}; };
programs.zsh = { 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; # xdg.configFile."wallpaper.jpg".source = ./assets/wallpaper.jpg;

6
users/teutat3s/zshrc.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, tritonshell, ... }:
'' ''
bindkey "^[[1;3D" backward-word bindkey "^[[1;3D" backward-word
bindkey "^[[1;3C" forward-word bindkey "^[[1;3C" forward-word
@ -60,9 +60,9 @@
source unset-env.sh source unset-env.sh
triton profile set "$2" triton profile set "$2"
fi 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 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 elif [[ "$1" == "env" ]]; then
env | grep "DOCKER\|MANTA\|SDC\|TRITON" | sort env | grep "DOCKER\|MANTA\|SDC\|TRITON" | sort
else else