From 0a0058b1f683b39317b321182a9a4a710b9221fd Mon Sep 17 00:00:00 2001 From: sstent Date: Thu, 23 Feb 2023 12:00:21 -0500 Subject: [PATCH] sync --- modules/home-manager/sstent.nix | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/modules/home-manager/sstent.nix b/modules/home-manager/sstent.nix index fb91b4f..17bbfec 100644 --- a/modules/home-manager/sstent.nix +++ b/modules/home-manager/sstent.nix @@ -64,24 +64,19 @@ programs = { yt-dlp.enable = true; bash = { enable = true; - bashrcExtra = '' - export DOCKER_HOST="tcp://192.168.1.223:2375"; - export NOMAD_ADDR="http://192.168.1.250:4646"; - export TERM="xterm-256color"; - export ANSIBLE_HOST_KEY_CHECKING=False - - export HSTR_CONFIG=hicolor # get more colors - shopt -s histappend # append new history items to .bash_history - export HISTCONTROL=ignorespace # leading space hides commands from history - # ensure synchronization between bash memory and history file - export PROMPT_COMMAND="history -a;" - + historyControl = [ignorespace]; + shellOptions = [ "histappend" ]; + sessionVariables = { + DOCKER_HOST="tcp://192.168.1.223:2375"; + NOMAD_ADDR="http://192.168.1.250:4646"; + TERM="xterm-256color"; + ANSIBLE_HOST_KEY_CHECKING=False; + HSTR_CONFIG=hicolor; + PROMPT_COMMAND="history -a;"; # ensure synchronization between bash memory and history file + SSH_AUTH_SOCK=~/.ssh/wsl-ssh-agent.sock; + } + bashrcExtra = '' if [ -e /home/sstent/.nix-profile/etc/profile.d/nix.sh ]; then . /home/sstent/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer - - #keybase service & - - # wsl-ssh-agent-relay start - export SSH_AUTH_SOCK=~/.ssh/wsl-ssh-agent.sock ssh-add -l '';