tstarr/dotfiles
1
0
Fork 0
mirror of https://github.com/starr-dusT/dotfiles.git synced 2025-02-19 19:27:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge

Browse Source
This commit is contained in:
Tyler Starr 2023-07-03 17:35:01 -07:00
commit 8a8e9ea886
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
home/dot_config/i3/config.tmpl → home/dot_config/i3/config
View File

@ -1,5 +1,3 @@
{{- $i3:= include ".gen/i3.json" | mustFromJson -}}
# i3 config file (v4) # i3 config file (v4)
# TODO: add scratchpads (terminal, password manager, discord, task) # TODO: add scratchpads (terminal, password manager, discord, task)
# Test a edit! # Test a edit!
@ -8,10 +6,10 @@
#----- VARIABLES #----- VARIABLES
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
set $HOME {{ .chezmoi.homeDir }} set $HOME /home/tstarr
set $DISP_PRI {{ $i3.disp_pri }} set $DISP_PRI HDMI-0
set $DISP_SEC {{ $i3.disp_sec }} set $DISP_SEC DP-3
set $BOR_WIDTH 4 set $BOR_WIDTH 4
set $GAP_INNER 4 set $GAP_INNER 4

19
provision/debian/jumpstart.sh
View File

@ -1,15 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
echo -e "Starting initial setup for Fedora..." echo -e "Starting initial setup for Debian..."
CHEZDIR="$HOME/.local/share/chezmoi" CHEZDIR="$HOME/.local/share/chezmoi"
echo "Input email for bitwarden:" echo "Input email for bitwarden:"
read bitemail read bitemail
# Install ansible python dependencies # Install ansible python dependencies
sudo dnf update -y sudo apt update -y
sudo dnf install python3 python3-pip ansible cargo -y sudo apt install chezmoi python3 pipx ansible cargo -y
pip install pexpect pipx install pexpect
cargo install rbw cargo install rbw
# Add things to path for this script # Add things to path for this script
@ -18,10 +18,10 @@ export PATH="$PATH:$HOME/.cargo/bin"
export PATH="$PATH:$CHEZDIR/temp_bin" export PATH="$PATH:$CHEZDIR/temp_bin"
# Install ansible extensions # 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 # 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 # Copy jumpstart scripts to temp bin dir and add to path
mkdir -p "$CHEZDIR/temp_bin" mkdir -p "$CHEZDIR/temp_bin"
@ -31,13 +31,6 @@ chmod +x "$CHEZDIR/temp_bin/rbw-get"
# Set bitwarden email # Set bitwarden email
rbw config set email "$bitemail" 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 # initialize chezmoi
chezmoi init chezmoi init