omf

tasks/fish.yml

@@ -7,21 +7,32 @@
 - name: use mycard omf
   set_fact:
     omf_uri: https://code.mycard.moe/nanahira/oh-my-fish
+    omf_install_uri_prefix: https://code.mycard.moe/nanahira/oh-my-fish/-
+    robbyrussell_path: https://code.mycard.moe/nanahira/theme-robbyrussell
   when: china_mirror_omf
 - name: use original omf
   set_fact:
     omf_uri: https://github.com/oh-my-fish/oh-my-fish
+    omf_install_uri_prefix: https://github.com/oh-my-fish/oh-my-fish
+    robbyrussell_path: robbyrussell
   when: not china_mirror_omf
 - name: 终端环境 fish omf
-  shell: curl -L https://cdn02.moecube.com:444/init/install_fish | fish
+  shell: curl -L '{{omf_install_uri_prefix}}/raw/master/bin/install' | fish
   environment:
     NONINTERACTIVE: true
     ASSUME_YES: true
     OMF_REPO_URI: '{{omf_uri}}'
   args:
     creates: '~/.local/share/omf'
+  ignore_errors: true
+- name: change omf mirror
+  when: china_mirror_omf
+  copy:
+    content: https://code.mycard.moe/nanahira/omf-packages-main master
+    dest: '~/.local/share/omf/repositories'
+  when: china_mirror_omf
 - name: 终端环境 fish robbyrussell
-  shell: omf install robbyrussell
+  shell: 'omf install {{robbyrussell_path}}'
   args:
     executable: /usr/bin/fish
     creates: '~/.local/share/omf/themes/robbyrussell'