diff --git a/.Slic3r/filament/black pla 0.4.ini b/.Slic3r/filament/black pla 0.4.ini deleted file mode 100644 index 17707b99..00000000 --- a/.Slic3r/filament/black pla 0.4.ini +++ /dev/null @@ -1,16 +0,0 @@ -# generated by Slic3r 1.1.7 on Mon Sep 15 20:24:45 2014 -bed_temperature = 60 -bridge_fan_speed = 100 -cooling = 1 -disable_fan_first_layers = 1 -extrusion_multiplier = 1 -fan_always_on = 0 -fan_below_layer_time = 15 -filament_diameter = 1.75 -first_layer_bed_temperature = 60 -first_layer_temperature = 210 -max_fan_speed = 100 -min_fan_speed = 55 -min_print_speed = 10 -slowdown_below_layer_time = 5 -temperature = 210 diff --git a/.Slic3r/filament/black pla 0.5.ini b/.Slic3r/filament/black pla 0.5.ini deleted file mode 100644 index dfc9cec7..00000000 --- a/.Slic3r/filament/black pla 0.5.ini +++ /dev/null @@ -1,16 +0,0 @@ -# generated by Slic3r 1.1.7 on Sun Aug 17 11:01:37 2014 -bed_temperature = 70 -bridge_fan_speed = 100 -cooling = 1 -disable_fan_first_layers = 1 -extrusion_multiplier = 1 -fan_always_on = 0 -fan_below_layer_time = 15 -filament_diameter = 1.75 -first_layer_bed_temperature = 70 -first_layer_temperature = 190 -max_fan_speed = 100 -min_fan_speed = 55 -min_print_speed = 10 -slowdown_below_layer_time = 5 -temperature = 190 diff --git a/.Slic3r/filament/pink abs 0.4.ini b/.Slic3r/filament/pink abs 0.4.ini index faed1203..e75c5566 100644 --- a/.Slic3r/filament/pink abs 0.4.ini +++ b/.Slic3r/filament/pink abs 0.4.ini @@ -1,9 +1,9 @@ -# generated by Slic3r 1.2.1-dev on Thu Oct 23 20:34:24 2014 +# generated by Slic3r 1.2.1-dev on Sat Oct 25 09:47:11 2014 bed_temperature = 70 bridge_fan_speed = 100 cooling = 0 disable_fan_first_layers = 1 -extrusion_multiplier = 0.935 +extrusion_multiplier = 1 fan_always_on = 1 fan_below_layer_time = 60 filament_diameter = 1.75 diff --git a/.Slic3r/filament/pink abs 0.5.ini b/.Slic3r/filament/pink abs 0.5.ini deleted file mode 100644 index e6c12717..00000000 --- a/.Slic3r/filament/pink abs 0.5.ini +++ /dev/null @@ -1,16 +0,0 @@ -# generated by Slic3r 1.1.7 on Sat Aug 16 14:20:52 2014 -bed_temperature = 90 -bridge_fan_speed = 100 -cooling = 1 -disable_fan_first_layers = 1 -extrusion_multiplier = 1 -fan_always_on = 0 -fan_below_layer_time = 60 -filament_diameter = 1.75 -first_layer_bed_temperature = 90 -first_layer_temperature = 235 -max_fan_speed = 100 -min_fan_speed = 60 -min_print_speed = 10 -slowdown_below_layer_time = 30 -temperature = 235 diff --git a/.Slic3r/print/coarse abs 0.4.ini b/.Slic3r/print/coarse abs 0.4.ini index 3d043f0f..ee89306b 100644 --- a/.Slic3r/print/coarse abs 0.4.ini +++ b/.Slic3r/print/coarse abs 0.4.ini @@ -1,4 +1,4 @@ -# generated by Slic3r 1.2.0 on Sun Oct 12 11:08:08 2014 +# generated by Slic3r 1.2.1-dev on Sat Oct 25 09:59:41 2014 avoid_crossing_perimeters = 1 bottom_solid_layers = 1 bridge_acceleration = 0 @@ -9,17 +9,17 @@ complete_objects = 0 default_acceleration = 1500 dont_support_bridges = 1 external_perimeter_extrusion_width = 0 -external_perimeter_speed = 70% +external_perimeter_speed = 25 external_perimeters_first = 1 extra_perimeters = 1 extruder_clearance_height = 20 extruder_clearance_radius = 20 -extrusion_width = 100% +extrusion_width = 0 fill_angle = 45 -fill_density = 40% -fill_pattern = honeycomb +fill_density = 35% +fill_pattern = 3dhoneycomb first_layer_acceleration = 0 -first_layer_extrusion_width = 0 +first_layer_extrusion_width = 200% first_layer_height = 0.3 first_layer_speed = 100% gap_fill_speed = 10 @@ -30,9 +30,9 @@ infill_extruder = 1 infill_extrusion_width = 0 infill_first = 0 infill_only_where_needed = 1 -infill_speed = 50 +infill_speed = 25 interface_shells = 0 -layer_height = 0.3 +layer_height = 0.2 min_skirt_length = 20 notes = only_retract_when_crossing_perimeters = 1 @@ -42,7 +42,7 @@ overhangs = 1 perimeter_acceleration = 0 perimeter_extruder = 1 perimeter_extrusion_width = 0 -perimeter_speed = 30 +perimeter_speed = 25 perimeters = 3 post_process = raft_layers = 0 @@ -52,11 +52,11 @@ skirt_distance = 6 skirt_height = 1 skirts = 1 small_perimeter_speed = 15 -solid_fill_pattern = rectilinear +solid_fill_pattern = hilbertcurve solid_infill_below_area = 70 -solid_infill_every_layers = 7 -solid_infill_extrusion_width = 90% -solid_infill_speed = 50 +solid_infill_every_layers = 0 +solid_infill_extrusion_width = 0 +solid_infill_speed = 20 spiral_vase = 0 standby_temperature_delta = -5 support_material = 1 @@ -67,7 +67,7 @@ support_material_extrusion_width = 0 support_material_interface_extruder = 1 support_material_interface_layers = 3 support_material_interface_spacing = 0 -support_material_interface_speed = 100% +support_material_interface_speed = 20 support_material_pattern = pillars support_material_spacing = 2.5 support_material_speed = 20 diff --git a/.Slic3r/print/coarse abs 0.5.ini b/.Slic3r/print/coarse abs 0.5.ini deleted file mode 100644 index 806e0174..00000000 --- a/.Slic3r/print/coarse abs 0.5.ini +++ /dev/null @@ -1,79 +0,0 @@ -# generated by Slic3r 1.1.7 on Sat Aug 16 14:32:30 2014 -avoid_crossing_perimeters = 0 -bottom_solid_layers = 3 -bridge_acceleration = 0 -bridge_flow_ratio = 1 -bridge_speed = 15 -brim_width = 0 -complete_objects = 0 -default_acceleration = 0 -dont_support_bridges = 1 -external_perimeter_speed = 15 -external_perimeters_first = 1 -extra_perimeters = 1 -extruder_clearance_height = 20 -extruder_clearance_radius = 20 -extrusion_width = 0 -fill_angle = 45 -fill_density = 40% -fill_pattern = rectilinear -first_layer_acceleration = 0 -first_layer_extrusion_width = 200% -first_layer_height = 0.2 -first_layer_speed = 15 -gap_fill_speed = 15 -gcode_comments = 0 -infill_acceleration = 0 -infill_every_layers = 1 -infill_extruder = 1 -infill_extrusion_width = 0 -infill_first = 0 -infill_only_where_needed = 1 -infill_speed = 12 -interface_shells = 0 -layer_height = 0.4 -min_skirt_length = 20 -notes = -only_retract_when_crossing_perimeters = 1 -ooze_prevention = 0 -output_filename_format = [input_filename_base].gcode -overhangs = 1 -perimeter_acceleration = 0 -perimeter_extruder = 1 -perimeter_extrusion_width = 0 -perimeter_speed = 15 -perimeters = 3 -post_process = -raft_layers = 0 -resolution = 0 -seam_position = random -skirt_distance = 6 -skirt_height = 1 -skirts = 1 -small_perimeter_speed = 15 -solid_fill_pattern = rectilinear -solid_infill_below_area = 70 -solid_infill_every_layers = 7 -solid_infill_extrusion_width = 0 -solid_infill_speed = 12 -spiral_vase = 0 -standby_temperature_delta = -5 -support_material = 0 -support_material_angle = 0 -support_material_enforce_layers = 0 -support_material_extruder = 1 -support_material_extrusion_width = 0 -support_material_interface_extruder = 1 -support_material_interface_layers = 3 -support_material_interface_spacing = 0 -support_material_interface_speed = 15 -support_material_pattern = pillars -support_material_spacing = 2.5 -support_material_speed = 15 -support_material_threshold = 0 -thin_walls = 1 -threads = 8 -top_infill_extrusion_width = 0 -top_solid_infill_speed = 10 -top_solid_layers = 4 -travel_speed = 100 diff --git a/.Slic3r/print/coarse pla 0.4.ini b/.Slic3r/print/coarse pla 0.4.ini deleted file mode 100644 index 367c8860..00000000 --- a/.Slic3r/print/coarse pla 0.4.ini +++ /dev/null @@ -1,79 +0,0 @@ -# generated by Slic3r 1.1.7 on Sun Aug 17 11:50:25 2014 -avoid_crossing_perimeters = 1 -bottom_solid_layers = 3 -bridge_acceleration = 0 -bridge_flow_ratio = 1 -bridge_speed = 60 -brim_width = 0 -complete_objects = 0 -default_acceleration = 0 -dont_support_bridges = 1 -external_perimeter_speed = 70% -external_perimeters_first = 1 -extra_perimeters = 1 -extruder_clearance_height = 20 -extruder_clearance_radius = 20 -extrusion_width = 0 -fill_angle = 45 -fill_density = 35% -fill_pattern = rectilinear -first_layer_acceleration = 0 -first_layer_extrusion_width = 200% -first_layer_height = 0.3 -first_layer_speed = 45% -gap_fill_speed = 20 -gcode_comments = 0 -infill_acceleration = 0 -infill_every_layers = 1 -infill_extruder = 1 -infill_extrusion_width = 0 -infill_first = 0 -infill_only_where_needed = 1 -infill_speed = 60 -interface_shells = 0 -layer_height = 0.3 -min_skirt_length = 30 -notes = -only_retract_when_crossing_perimeters = 1 -ooze_prevention = 0 -output_filename_format = [input_filename_base].gcode -overhangs = 1 -perimeter_acceleration = 0 -perimeter_extruder = 1 -perimeter_extrusion_width = 0 -perimeter_speed = 30 -perimeters = 3 -post_process = -raft_layers = 0 -resolution = 0 -seam_position = random -skirt_distance = 6 -skirt_height = 1 -skirts = 1 -small_perimeter_speed = 30 -solid_fill_pattern = rectilinear -solid_infill_below_area = 70 -solid_infill_every_layers = 5 -solid_infill_extrusion_width = 0 -solid_infill_speed = 60 -spiral_vase = 0 -standby_temperature_delta = -5 -support_material = 0 -support_material_angle = 0 -support_material_enforce_layers = 0 -support_material_extruder = 1 -support_material_extrusion_width = 0 -support_material_interface_extruder = 1 -support_material_interface_layers = 3 -support_material_interface_spacing = 0 -support_material_interface_speed = 100% -support_material_pattern = pillars -support_material_spacing = 2.5 -support_material_speed = 60 -support_material_threshold = 0 -thin_walls = 1 -threads = 8 -top_infill_extrusion_width = 0 -top_solid_infill_speed = 50 -top_solid_layers = 4 -travel_speed = 130 diff --git a/.Slic3r/print/coarse pla 0.5.ini b/.Slic3r/print/coarse pla 0.5.ini deleted file mode 100644 index c30e229d..00000000 --- a/.Slic3r/print/coarse pla 0.5.ini +++ /dev/null @@ -1,79 +0,0 @@ -# generated by Slic3r 1.1.7 on Sun Aug 17 10:21:49 2014 -avoid_crossing_perimeters = 1 -bottom_solid_layers = 3 -bridge_acceleration = 0 -bridge_flow_ratio = 1 -bridge_speed = 60 -brim_width = 0 -complete_objects = 0 -default_acceleration = 0 -dont_support_bridges = 1 -external_perimeter_speed = 70% -external_perimeters_first = 1 -extra_perimeters = 1 -extruder_clearance_height = 20 -extruder_clearance_radius = 20 -extrusion_width = 0 -fill_angle = 45 -fill_density = 35% -fill_pattern = honeycomb -first_layer_acceleration = 0 -first_layer_extrusion_width = 200% -first_layer_height = 0.4 -first_layer_speed = 45% -gap_fill_speed = 20 -gcode_comments = 0 -infill_acceleration = 0 -infill_every_layers = 1 -infill_extruder = 1 -infill_extrusion_width = 0 -infill_first = 0 -infill_only_where_needed = 1 -infill_speed = 60 -interface_shells = 0 -layer_height = 0.35 -min_skirt_length = 0 -notes = -only_retract_when_crossing_perimeters = 1 -ooze_prevention = 0 -output_filename_format = [input_filename_base].gcode -overhangs = 1 -perimeter_acceleration = 0 -perimeter_extruder = 1 -perimeter_extrusion_width = 0 -perimeter_speed = 30 -perimeters = 3 -post_process = -raft_layers = 0 -resolution = 0 -seam_position = random -skirt_distance = 6 -skirt_height = 1 -skirts = 1 -small_perimeter_speed = 30 -solid_fill_pattern = hilbertcurve -solid_infill_below_area = 70 -solid_infill_every_layers = 5 -solid_infill_extrusion_width = 0 -solid_infill_speed = 60 -spiral_vase = 0 -standby_temperature_delta = -5 -support_material = 0 -support_material_angle = 0 -support_material_enforce_layers = 0 -support_material_extruder = 1 -support_material_extrusion_width = 0 -support_material_interface_extruder = 1 -support_material_interface_layers = 3 -support_material_interface_spacing = 0 -support_material_interface_speed = 100% -support_material_pattern = pillars -support_material_spacing = 2.5 -support_material_speed = 60 -support_material_threshold = 0 -thin_walls = 1 -threads = 8 -top_infill_extrusion_width = 0 -top_solid_infill_speed = 50 -top_solid_layers = 4 -travel_speed = 130 diff --git a/.Slic3r/print/fine abs 0.4.ini b/.Slic3r/print/fine abs 0.4.ini index c25f63a5..94208e1b 100644 --- a/.Slic3r/print/fine abs 0.4.ini +++ b/.Slic3r/print/fine abs 0.4.ini @@ -1,4 +1,4 @@ -# generated by Slic3r 1.2.1-dev on Thu Oct 23 20:34:34 2014 +# generated by Slic3r 1.2.1-dev on Sat Oct 25 10:00:40 2014 avoid_crossing_perimeters = 1 bottom_solid_layers = 1 bridge_acceleration = 0 @@ -20,8 +20,8 @@ fill_density = 35% fill_pattern = 3dhoneycomb first_layer_acceleration = 0 first_layer_extrusion_width = 200% -first_layer_height = 0.3 -first_layer_speed = 100% +first_layer_height = 0.2 +first_layer_speed = 90% gap_fill_speed = 10 gcode_comments = 0 infill_acceleration = 0 @@ -30,9 +30,9 @@ infill_extruder = 1 infill_extrusion_width = 0 infill_first = 0 infill_only_where_needed = 1 -infill_speed = 25 +infill_speed = 20 interface_shells = 0 -layer_height = 0.2 +layer_height = 0.1 min_skirt_length = 20 notes = only_retract_when_crossing_perimeters = 1 @@ -42,7 +42,7 @@ overhangs = 1 perimeter_acceleration = 0 perimeter_extruder = 1 perimeter_extrusion_width = 0 -perimeter_speed = 25 +perimeter_speed = 20 perimeters = 3 post_process = raft_layers = 0 diff --git a/.Slic3r/print/fine abs 0.5.ini b/.Slic3r/print/fine abs 0.5.ini deleted file mode 100644 index ab2933b7..00000000 --- a/.Slic3r/print/fine abs 0.5.ini +++ /dev/null @@ -1,79 +0,0 @@ -# generated by Slic3r 1.1.7 on Sat Aug 16 14:16:18 2014 -avoid_crossing_perimeters = 1 -bottom_solid_layers = 3 -bridge_acceleration = 0 -bridge_flow_ratio = 1 -bridge_speed = 15 -brim_width = 0 -complete_objects = 0 -default_acceleration = 0 -dont_support_bridges = 1 -external_perimeter_speed = 15 -external_perimeters_first = 1 -extra_perimeters = 1 -extruder_clearance_height = 20 -extruder_clearance_radius = 20 -extrusion_width = 0 -fill_angle = 45 -fill_density = 40% -fill_pattern = honeycomb -first_layer_acceleration = 0 -first_layer_extrusion_width = 200% -first_layer_height = 0.2 -first_layer_speed = 15 -gap_fill_speed = 15 -gcode_comments = 0 -infill_acceleration = 0 -infill_every_layers = 1 -infill_extruder = 1 -infill_extrusion_width = 0 -infill_first = 0 -infill_only_where_needed = 1 -infill_speed = 12 -interface_shells = 0 -layer_height = 0.2 -min_skirt_length = 20 -notes = -only_retract_when_crossing_perimeters = 1 -ooze_prevention = 0 -output_filename_format = [input_filename_base].gcode -overhangs = 1 -perimeter_acceleration = 0 -perimeter_extruder = 1 -perimeter_extrusion_width = 0 -perimeter_speed = 15 -perimeters = 3 -post_process = -raft_layers = 0 -resolution = 0 -seam_position = random -skirt_distance = 6 -skirt_height = 1 -skirts = 1 -small_perimeter_speed = 15 -solid_fill_pattern = hilbertcurve -solid_infill_below_area = 70 -solid_infill_every_layers = 5 -solid_infill_extrusion_width = 0 -solid_infill_speed = 12 -spiral_vase = 0 -standby_temperature_delta = -5 -support_material = 0 -support_material_angle = 0 -support_material_enforce_layers = 0 -support_material_extruder = 1 -support_material_extrusion_width = 0 -support_material_interface_extruder = 1 -support_material_interface_layers = 3 -support_material_interface_spacing = 0 -support_material_interface_speed = 15 -support_material_pattern = pillars -support_material_spacing = 2.5 -support_material_speed = 15 -support_material_threshold = 0 -thin_walls = 1 -threads = 8 -top_infill_extrusion_width = 0 -top_solid_infill_speed = 10 -top_solid_layers = 4 -travel_speed = 100 diff --git a/.Slic3r/print/fine pla 0.4.ini b/.Slic3r/print/fine pla 0.4.ini deleted file mode 100644 index 8570261f..00000000 --- a/.Slic3r/print/fine pla 0.4.ini +++ /dev/null @@ -1,79 +0,0 @@ -# generated by Slic3r 1.1.7 on Sun Sep 14 13:14:08 2014 -avoid_crossing_perimeters = 1 -bottom_solid_layers = 3 -bridge_acceleration = 0 -bridge_flow_ratio = 1 -bridge_speed = 60 -brim_width = 0 -complete_objects = 0 -default_acceleration = 0 -dont_support_bridges = 1 -external_perimeter_speed = 70% -external_perimeters_first = 1 -extra_perimeters = 1 -extruder_clearance_height = 20 -extruder_clearance_radius = 20 -extrusion_width = 0 -fill_angle = 45 -fill_density = 40% -fill_pattern = rectilinear -first_layer_acceleration = 0 -first_layer_extrusion_width = 200% -first_layer_height = 0.3 -first_layer_speed = 45% -gap_fill_speed = 20 -gcode_comments = 0 -infill_acceleration = 0 -infill_every_layers = 1 -infill_extruder = 1 -infill_extrusion_width = 0 -infill_first = 0 -infill_only_where_needed = 1 -infill_speed = 60 -interface_shells = 0 -layer_height = 0.3 -min_skirt_length = 30 -notes = -only_retract_when_crossing_perimeters = 1 -ooze_prevention = 0 -output_filename_format = [input_filename_base].gcode -overhangs = 1 -perimeter_acceleration = 0 -perimeter_extruder = 1 -perimeter_extrusion_width = 0 -perimeter_speed = 30 -perimeters = 3 -post_process = -raft_layers = 0 -resolution = 0 -seam_position = random -skirt_distance = 6 -skirt_height = 1 -skirts = 1 -small_perimeter_speed = 30 -solid_fill_pattern = rectilinear -solid_infill_below_area = 70 -solid_infill_every_layers = 5 -solid_infill_extrusion_width = 0 -solid_infill_speed = 60 -spiral_vase = 0 -standby_temperature_delta = -5 -support_material = 0 -support_material_angle = 0 -support_material_enforce_layers = 0 -support_material_extruder = 1 -support_material_extrusion_width = 0 -support_material_interface_extruder = 1 -support_material_interface_layers = 3 -support_material_interface_spacing = 0 -support_material_interface_speed = 100% -support_material_pattern = pillars -support_material_spacing = 2.5 -support_material_speed = 60 -support_material_threshold = 0 -thin_walls = 1 -threads = 8 -top_infill_extrusion_width = 0 -top_solid_infill_speed = 50 -top_solid_layers = 4 -travel_speed = 130 diff --git a/.Slic3r/printer/printer 0.5.ini b/.Slic3r/printer/printer 0.5.ini deleted file mode 100644 index a2e43543..00000000 --- a/.Slic3r/printer/printer 0.5.ini +++ /dev/null @@ -1,23 +0,0 @@ -# generated by Slic3r 1.1.7 on Sun Aug 17 10:22:06 2014 -bed_size = 170,170 -end_gcode = M104 S0 ; turn off temperature\nG28 X0 ; home X axis\nM84 ; disable motors\n -extruder_offset = 0x0 -gcode_flavor = reprap -layer_gcode = -nozzle_diameter = 0.5 -print_center = 85,85 -retract_before_travel = 2 -retract_layer_change = 1 -retract_length = 3 -retract_length_toolchange = 10 -retract_lift = 0 -retract_restart_extra = 0 -retract_restart_extra_toolchange = 0 -retract_speed = 30 -start_gcode = G28 ; home all axes\nG1 Z5 F5000 ; lift nozzle\n -toolchange_gcode = -use_firmware_retraction = 0 -use_relative_e_distances = 0 -vibration_limit = 0 -wipe = 0 -z_offset = 0 diff --git a/.Slic3r/slic3r.ini b/.Slic3r/slic3r.ini index 1bb5a1e8..6afb3d85 100644 --- a/.Slic3r/slic3r.ini +++ b/.Slic3r/slic3r.ini @@ -1,4 +1,4 @@ -# generated by Slic3r 1.2.1-dev on Thu Oct 23 21:37:26 2014 +# generated by Slic3r 1.2.1-dev on Sat Oct 25 10:00:57 2014 autocenter = 1 background_processing = 1 last_output_path = /home/cyryl/reprap/models/gcode diff --git a/.config/terminator/config b/.config/terminator/config index 7bd67a8b..6d7bafdf 100644 --- a/.config/terminator/config +++ b/.config/terminator/config @@ -1,18 +1,22 @@ [global_config] - title_transmit_bg_color = "#073642" + window_state = maximise + borderless = True focus = system + title_transmit_bg_color = "#d30102" [keybindings] [profiles] [[default]] palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3" login_shell = True - background_darkness = 0.95 + background_image = None + background_darkness = 0.93 background_type = transparent use_system_font = False cursor_color = "#eee8d5" foreground_color = "#eee8d5" + icon_bell = False show_titlebar = False - font = Inconsolata Medium 12 + font = Inconsolata for Powerline Medium 11 background_color = "#002b36" [layouts] [[default]] diff --git a/.zshrc b/.zshrc index 7041cd26..65460ff0 100644 --- a/.zshrc +++ b/.zshrc @@ -67,7 +67,7 @@ fi if [[ `uname` =~ 'CYGWIN.*' ]]; then export DISPLAY=:0.0 else - alias ssh="torsocks ssh" + alias tssh="torsocks ssh" fi PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting diff --git a/README.md b/README.md index 3326b8d7..241d4c09 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,9 @@ install: clone this repo run install_fedora.sh or install_ubuntu.sh to setup the whole box +TODO: +* use terminator for all configs +* investigate chsh failing +* automate adding backports to debian-based distros +* automate enabling hibernation on ubuntu diff --git a/install_common.sh b/install_common.sh index d8d7d424..5433c7c2 100755 --- a/install_common.sh +++ b/install_common.sh @@ -14,6 +14,10 @@ curl -sSL https://get.rvm.io | bash -s stable source $HOME/.rvm/scripts/rvm rvm install ruby +# talks: reveal-md +sudo ln -s /usr/bin/nodejs /usr/bin/node +sudo npm install -g reveal-md + #symbolic links ln -s "$DIR/.vim" ~/. ln -s "$DIR/.vimrc" ~/. @@ -25,6 +29,10 @@ ln -s "$DIR/.Slic3r" ~/. ln -s "$DIR/.gitconfig.linux.private" ~/.gitconfig ln -s "$DIR/tools" ~/ +# stuff that does not like symbolic links +rm -f ~/.config/terminator/config +ln "$DIR/.config/terminator/config" ~/.config/terminator/config + #install fonts mkdir ~/.fonts cp -rv "$DIR/fonts" ~/.fonts diff --git a/install_debian.sh b/install_debian.sh new file mode 100755 index 00000000..1b68b7bc --- /dev/null +++ b/install_debian.sh @@ -0,0 +1,8 @@ +#!/bin/bash +sudo apt-get update +sudo apt-get dist-upgrade +sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv gajim tor torsocks nodejs + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +$DIR/install_common.sh + diff --git a/install_ubuntu.sh b/install_ubuntu.sh index 9ced999e..5436099a 100755 --- a/install_ubuntu.sh +++ b/install_ubuntu.sh @@ -1,7 +1,7 @@ #!/bin/bash sudo apt-get update -sudo apt-get dist-ugprade -sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv pixz gajim +sudo apt-get full-upgrade +sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" $DIR/install_common.sh diff --git a/tools/backup_sdcard.sh b/tools/backup_sdcard.sh index 25f5a7b8..a3b127c2 100755 --- a/tools/backup_sdcard.sh +++ b/tools/backup_sdcard.sh @@ -7,7 +7,7 @@ fi device=$1 -timestamp=`date +%Y%M%d` +timestamp=`date +%Y%m%d` dest_file="/tmp/$timestamp.dd.xz" echo "about to clone $device to $dest_file"