diff --git a/home/dot_config/i3/config.tmpl b/home/dot_config/i3/config similarity index 98% rename from home/dot_config/i3/config.tmpl rename to home/dot_config/i3/config index c462a0b5..8a5a5eb5 100644 --- a/home/dot_config/i3/config.tmpl +++ b/home/dot_config/i3/config @@ -1,5 +1,3 @@ -{{- $i3:= include ".gen/i3.json" | mustFromJson -}} - # i3 config file (v4) # TODO: add scratchpads (terminal, password manager, discord, task) # Test a edit! @@ -8,10 +6,10 @@ #----- VARIABLES #------------------------------------------------------------------------------- -set $HOME {{ .chezmoi.homeDir }} +set $HOME /home/tstarr -set $DISP_PRI {{ $i3.disp_pri }} -set $DISP_SEC {{ $i3.disp_sec }} +set $DISP_PRI HDMI-0 +set $DISP_SEC DP-3 set $BOR_WIDTH 4 set $GAP_INNER 4 diff --git a/provision/debian/jumpstart.sh b/provision/debian/jumpstart.sh index b372a845..c417370a 100755 --- a/provision/debian/jumpstart.sh +++ b/provision/debian/jumpstart.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash -echo -e "Starting initial setup for Fedora..." +echo -e "Starting initial setup for Debian..." CHEZDIR="$HOME/.local/share/chezmoi" echo "Input email for bitwarden:" read bitemail # Install ansible python dependencies -sudo dnf update -y -sudo dnf install python3 python3-pip ansible cargo -y -pip install pexpect +sudo apt update -y +sudo apt install chezmoi python3 pipx ansible cargo -y +pipx install pexpect cargo install rbw # Add things to path for this script @@ -18,10 +18,10 @@ export PATH="$PATH:$HOME/.cargo/bin" export PATH="$PATH:$CHEZDIR/temp_bin" # Install ansible extensions -ansible-galaxy install -r "$CHEZDIR/provision/fedora/ansible/requirements.yml" +ansible-galaxy install -r "$CHEZDIR/provision/debian/ansible/requirements.yml" # Run setup playbook -ansible-playbook "$CHEZDIR/provision/fedora/ansible/setup.yml" -i "$CHEZDIR/provision/fedora/ansible/hosts" --ask-become-pass +ansible-playbook "$CHEZDIR/provision/debian/ansible/setup.yml" -i "$CHEZDIR/provision/debian/ansible/hosts" --ask-become-pass # Copy jumpstart scripts to temp bin dir and add to path mkdir -p "$CHEZDIR/temp_bin" @@ -31,13 +31,6 @@ chmod +x "$CHEZDIR/temp_bin/rbw-get" # Set bitwarden email rbw config set email "$bitemail" -# Make temporary i3 gen file -mkdir -p "$CHEZDIR/home/.gen" -echo "{ - \"disp_pri\": \"HDMI-0\", - \"disp_sec\": \"HDMI-0\" -}" > "$CHEZDIR/home/.gen/i3.json" - # initialize chezmoi chezmoi init