Compare commits

...

4 Commits

Author SHA1 Message Date
390f8d2a0e Stow orcaslicer 2023-11-25 13:11:34 -05:00
35f7ddfe63 Use new script location 2023-11-25 10:23:31 -05:00
bafcfae28d Fix update script 2023-11-25 09:54:08 -05:00
b41a4141f2 Stow scripts 2023-11-25 09:35:34 -05:00
56 changed files with 411 additions and 18 deletions

View File

@ -36,7 +36,7 @@ exec --no-startup-id "workspace $15; exec flatpak run org.signal.Signal"
# Starts Jack for audio
exec --no-startup-id "workspace $1; exec alacritty"
exec --no-startup-id sh ~/.config/scripts/audio/system-start-audio.sh
exec --no-startup-id sh ~/bin/audio/system-start-audio.sh
# Open Google Play Music on workspace 10
for_window [title="Google Play Music Desktop Player"] move to workspace $ws10
@ -114,7 +114,7 @@ for_window [class="factorio" title="Factorio*"] move to workspace $wsGames
for_window [class="factorio" title="Factorio*"] exec --no-startup-id cat ~/.config/g13/factorio.bind > /tmp/g13-0 && sleep .1 && cat ~/.config/g13/factorio.lpbm > /tmp/g13-0
# The side buttons move the desktop around
bindsym --whole-window button9 exec --no-startup-id python3 ~/.config/scripts/i3-mouse.py back
bindsym --whole-window button8 exec --no-startup-id python3 ~/.config/scripts/i3-mouse.py forward
bindsym $mod+Tab exec --no-startup-id python3 ~/.config/scripts/i3-mouse.py thumb
bindsym --whole-window button9 exec --no-startup-id python3 ~/bin/i3-mouse.py back
bindsym --whole-window button8 exec --no-startup-id python3 ~/bin/i3-mouse.py forward
bindsym $mod+Tab exec --no-startup-id python3 ~/bin/i3-mouse.py thumb

View File

@ -124,9 +124,9 @@ bindsym $mod+Shift+9 move container to workspace $ws9
bindsym $mod+Shift+0 move container to workspace $ws10
# reload the configuration file
bindsym $mod+Shift+c exec "sh ~/.config/scripts/i3wm-config-gen.sh"
bindsym $mod+Shift+c exec "sh ~/bin/i3wm-config-gen.sh"
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
bindsym $mod+Shift+r exec "sh ~/.config/scripts/i3wm-config-gen.sh" ; restart
bindsym $mod+Shift+r exec "sh ~/bin/i3wm-config-gen.sh" ; restart
# exit i3 (logs you out of your X session)
bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
@ -171,7 +171,7 @@ bindsym $mod+r mode "resize"
exec_always --no-startup-id setxkbmap -option 'caps:super'
# Startup scripts
exec --no-startup-id sh ~/.config/scripts/connect-nas.sh
exec --no-startup-id sh ~/bin/connect-nas.sh
exec --no-startup-id systemctl --user start polybar
exec --no-startup-id systemctl --user restart streamdeck
exec --no-startup-id waybar &
@ -230,8 +230,8 @@ for_window [instance="^sun-awt-X11-XDialogPeer$" title="^Complete Installation$"
# Bitwig
for_window [class="^Bitwig Studio$" title="^Bitwig Studio"] gaps inner set 0; gaps outer set 0
for_window [class="^Bitwig Studio$" title="^Bitwig Studio"] exec python ~/.config/scripts/audio/synth-power.py -d
for_window [class="^Bitwig Studio$" title="^Bitwig Studio"] exec sh ~/.config/scripts/audio/aquamix.sh -d
for_window [class="^Bitwig Studio$" title="^Bitwig Studio"] exec python ~/bin/audio/synth-power.py -d
for_window [class="^Bitwig Studio$" title="^Bitwig Studio"] exec sh ~/bin/audio/aquamix.sh -d
for_window [class="^Bitwig Studio$" title="^Bitwig Studio"] exec systemctl --user restart i3wm-close-window.service
#Other

View File

@ -8,8 +8,7 @@ fi
dotdir=~/dotfiles
# src dest sudo
files=($dotdir/scripts ~/.config/ 'n'
$dotdir/systemd ~/.config/ 'n'
files=($dotdir/systemd ~/.config/ 'n'
$dotdir/settings.conf ~/.config/ 'n')
# arg parser
@ -118,6 +117,8 @@ function stow_dotfiles {
stow rofi
stow waybar
stow mako
stow scripts
stow orcaslicer
}
function install_python_libs {

View File

@ -0,0 +1,5 @@
sync_info = update
user_id =
setting_id =
base_id = GFSA04
updated_time = 1697299895

View File

@ -0,0 +1,31 @@
{
"filament_cost": [
"19.99"
],
"filament_max_volumetric_speed": [
"8"
],
"filament_settings_id": [
"PETG - Overture @CR-10s"
],
"filament_vendor": [
"Overture"
],
"from": "User",
"inherits": "My Generic PETG",
"is_custom_defined": "0",
"name": "PETG - Overture @CR-10s",
"nozzle_temperature": [
"245"
],
"nozzle_temperature_initial_layer": [
"245"
],
"pressure_advance": [
"0.26"
],
"slow_down_layer_time": [
"1"
],
"version": "1.6.1.0"
}

View File

@ -0,0 +1,5 @@
sync_info = update
user_id =
setting_id =
base_id = GFSA04
updated_time = 1696802272

View File

@ -0,0 +1,34 @@
{
"enable_pressure_advance": [
"1"
],
"filament_cost": [
"19.99"
],
"filament_flow_ratio": [
"0.9025"
],
"filament_settings_id": [
"PETG - Overture"
],
"filament_vendor": [
"Overture"
],
"from": "User",
"inherits": "My Generic PETG",
"is_custom_defined": "0",
"name": "PETG - Overture",
"nozzle_temperature": [
"245"
],
"nozzle_temperature_initial_layer": [
"245"
],
"pressure_advance": [
"0.26"
],
"slow_down_layer_time": [
"1"
],
"version": "1.6.1.0"
}

View File

@ -0,0 +1,5 @@
sync_info = create
user_id =
setting_id =
base_id = GM001
updated_time = 1695585702

View File

@ -0,0 +1,83 @@
{
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;{layer_z}\n\n",
"from": "User",
"inherits": "MyKlipper 0.4 nozzle",
"is_custom_defined": "0",
"machine_end_gcode": "END_PRINT",
"machine_max_acceleration_extruding": [
"500",
"20000"
],
"machine_max_acceleration_retracting": [
"1000",
"5000"
],
"machine_max_acceleration_x": [
"500",
"20000"
],
"machine_max_acceleration_y": [
"500",
"20000"
],
"machine_max_acceleration_z": [
"100",
"200"
],
"machine_max_jerk_e": [
"5",
"2.5"
],
"machine_max_jerk_x": [
"8",
"9"
],
"machine_max_jerk_y": [
"8",
"9"
],
"machine_max_jerk_z": [
"0.4",
"0.4"
],
"machine_max_speed_e": [
"60",
"25"
],
"machine_max_speed_z": [
"10",
"12"
],
"machine_start_gcode": "START_PRINT BED_TEMP=[bed_temperature_initial_layer_single] EXTRUDER_TEMP=[nozzle_temperature_initial_layer]",
"max_layer_height": [
"0.48"
],
"name": "CR-10s 0.4 nozzle",
"nozzle_type": "brass",
"print_host": "192.168.1.5",
"printable_area": [
"0x0",
"300x0",
"300x300",
"0x300"
],
"printable_height": "400",
"printer_settings_id": "CR-10s 0.4 nozzle",
"retract_length_toolchange": [
"1"
],
"retraction_length": [
"0.5"
],
"retraction_minimum_travel": [
"2"
],
"use_firmware_retraction": "1",
"version": "1.6.1.0",
"wipe": [
"0"
],
"z_hop_types": [
"Auto Lift"
]
}

View File

@ -0,0 +1,5 @@
sync_info = update
user_id =
setting_id =
base_id = GM001
updated_time = 1700927332

View File

@ -0,0 +1,89 @@
{
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;{layer_z}\n\n",
"from": "User",
"inherits": "MyKlipper 0.4 nozzle",
"is_custom_defined": "0",
"machine_end_gcode": "END_PRINT",
"machine_max_acceleration_extruding": [
"500",
"20000"
],
"machine_max_acceleration_retracting": [
"1000",
"5000"
],
"machine_max_acceleration_x": [
"500",
"20000"
],
"machine_max_acceleration_y": [
"500",
"20000"
],
"machine_max_acceleration_z": [
"100",
"200"
],
"machine_max_jerk_e": [
"5",
"2.5"
],
"machine_max_jerk_x": [
"8",
"9"
],
"machine_max_jerk_y": [
"8",
"9"
],
"machine_max_jerk_z": [
"0.4",
"0.4"
],
"machine_max_speed_e": [
"60",
"25"
],
"machine_max_speed_z": [
"10",
"12"
],
"machine_start_gcode": "START_PRINT BED_TEMP=[bed_temperature_initial_layer_single] EXTRUDER_TEMP=[nozzle_temperature_initial_layer]",
"max_layer_height": [
"0.48"
],
"name": "CR-10s 0.6 nozzle",
"nozzle_diameter": [
"0.6"
],
"nozzle_type": "brass",
"print_host": "192.168.1.5",
"printable_area": [
"0x0",
"300x0",
"300x300",
"0x300"
],
"printable_height": "400",
"printer_settings_id": "CR-10s 0.6 nozzle",
"retract_length_toolchange": [
"1"
],
"retraction_length": [
"0.5"
],
"retraction_minimum_travel": [
"2"
],
"use_firmware_retraction": "1",
"version": "1.6.1.0",
"wipe": [
"0"
],
"z_hop": [
"0"
],
"z_hop_types": [
"Auto Lift"
]
}

View File

@ -0,0 +1,5 @@
sync_info = update
user_id =
setting_id =
base_id = GM001
updated_time = 1695341948

View File

@ -0,0 +1,85 @@
{
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;{layer_z}\n\n",
"from": "User",
"inherits": "MyKlipper 0.4 nozzle",
"is_custom_defined": "0",
"machine_end_gcode": "END_PRINT",
"machine_max_acceleration_extruding": [
"500",
"20000"
],
"machine_max_acceleration_retracting": [
"1000",
"5000"
],
"machine_max_acceleration_x": [
"500",
"20000"
],
"machine_max_acceleration_y": [
"500",
"20000"
],
"machine_max_acceleration_z": [
"100",
"200"
],
"machine_max_jerk_e": [
"5",
"2.5"
],
"machine_max_jerk_x": [
"8",
"9"
],
"machine_max_jerk_y": [
"8",
"9"
],
"machine_max_jerk_z": [
"0.4",
"0.4"
],
"machine_max_speed_e": [
"60",
"25"
],
"machine_max_speed_z": [
"10",
"12"
],
"machine_start_gcode": "START_PRINT BED_TEMP=[bed_temperature_initial_layer_single] EXTRUDER_TEMP=[nozzle_temperature_initial_layer]",
"max_layer_height": [
"0.48"
],
"name": "Ender 3 0.6 nozzle",
"nozzle_diameter": [
"0.6"
],
"nozzle_type": "brass",
"print_host": "192.168.1.6",
"printable_area": [
"0x0",
"235x0",
"235x235",
"0x235"
],
"printer_settings_id": "Ender 3 0.6 nozzle",
"retract_length_toolchange": [
"1"
],
"retraction_length": [
"0.5"
],
"retraction_minimum_travel": [
"2"
],
"use_firmware_retraction": "1",
"version": "1.6.1.0",
"wipe": [
"0"
],
"z_hop_types": [
"Auto Lift"
]
}

View File

@ -0,0 +1,5 @@
sync_info = update
user_id =
setting_id =
base_id = GP004
updated_time = 1697250231

View File

@ -0,0 +1,39 @@
{
"brim_type": "brim_ears",
"brim_width": "10",
"default_acceleration": "0",
"enable_support": "1",
"from": "User",
"gap_infill_speed": "30",
"infill_combination": "1",
"inherits": "0.20mm Standard @MyKlipper",
"initial_layer_acceleration": "0",
"initial_layer_infill_speed": "35",
"initial_layer_line_width": "137%",
"initial_layer_speed": "20",
"inner_wall_acceleration": "0",
"inner_wall_line_width": "112%",
"inner_wall_speed": "40",
"internal_solid_infill_line_width": "112%",
"internal_solid_infill_speed": "50",
"is_custom_defined": "0",
"line_width": "100%",
"name": "0.20mm Standard CR-10s",
"outer_wall_acceleration": "0",
"outer_wall_line_width": "80%",
"outer_wall_speed": "40",
"print_settings_id": "0.20mm Standard CR-10s",
"sparse_infill_density": "30%",
"sparse_infill_line_width": "107%",
"sparse_infill_speed": "60",
"support_interface_speed": "30",
"support_line_width": "95%",
"support_speed": "30",
"support_type": "tree(auto)",
"top_surface_acceleration": "0",
"top_surface_line_width": "107%",
"top_surface_speed": "30",
"travel_acceleration": "1500",
"travel_speed": "150",
"version": "1.6.1.0"
}

View File

@ -39,12 +39,13 @@ function updateProgram {
function manualUpdate {
if command -v dnf &> /dev/null; then
echo Updating manually installed programs...
updateProgram bitwig-studio ~/.config/scripts/installers/bitwig-install.sh &
updateProgram /opt/dragonframe5/bin/Dragonframe ~/.config/scripts/installers/dragonframe-install.sh &
updateProgram reaper ~/.config/scripts/installers/reaper-install.sh &
updateProgram /opt/resolve/bin/resolve ~/.config/scripts/installers/resolve-install.sh &
updateProgram /opt/keeweb/keeweb ~/.config/scripts/installers/keeweb-install.sh &
updateProgram yabridgectl ~/.config/scripts/installers/yabridge-install.sh &
SCRIPT_PATH="$HOME/bin/installers"
updateProgram bitwig-studio $SCRIPT_PATH/bitwig-install.sh &
updateProgram /opt/dragonframe5/bin/Dragonframe $SCRIPT_PATH/dragonframe-install.sh &
updateProgram reaper $SCRIPT_PATH/reaper-install.sh &
updateProgram /opt/resolve/bin/resolve $SCRIPT_PATH/resolve-install.sh &
updateProgram /opt/keeweb/keeweb $SCRIPT_PATH/keeweb-install.sh &
updateProgram yabridgectl $SCRIPT_PATH/yabridge-install.sh &
wait
fi
}

View File

@ -23,7 +23,7 @@ alias e='emacs -nw'
# Other
alias i='sudo dnf install'
alias d='sudo dnf'
alias u='sh ~/.config/scripts/update.sh'
alias u='sh ~/bin/update.sh'
alias dot='cd ~/dotfiles'
alias h='cd ~/git/cacolglazier.com/ && hugo server'
# Git