From 398c6f2d18fb5565adeee658f48d416392b60f0f Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 2 Oct 2024 20:08:35 -0700 Subject: [PATCH] Move the rest of the zsh functions into the dotfiles role --- .../files/zsh/functions}/append_to_path | 0 .../files/zsh/functions}/binary_exists | 0 .../files/zsh/functions}/connect_ssh_agent | 0 .../zsh/functions}/darwin-icloud-drive-path | 0 .../functions}/darwin/darwin-hardware-model | 0 .../zsh/functions}/darwin/darwin-os-build | 0 .../zsh/functions}/darwin/darwin-os-version | 0 .../darwin_configure_screenshots_directory | 0 .../files/zsh/functions}/darwin_init_once | 0 .../files/zsh/functions}/do_init_functions | 0 .../dotfiles/files/zsh/functions}/finder | 0 .../roles/dotfiles/files/zsh/functions}/g | 0 .../files/zsh/functions}/homebrew-prefix | 0 .../files/zsh/functions}/import_cacert | 0 .../zsh/functions}/init_app_environments | 0 .../files/zsh/functions}/init_configure_ls | 0 .../files/zsh/functions}/init_profile_darwin | 0 .../functions}/init_profile_darwin_say_hello | 0 .../files/zsh/functions}/init_rc_aliases | 0 .../functions}/init_rc_configure_completion | 0 .../zsh/functions}/init_rc_configure_prompt | 0 .../zsh/functions}/init_rc_configure_zle | 0 .../files/zsh/functions}/init_rc_fpath_darwin | 0 .../files/zsh/functions}/init_rc_linux | 0 .../files/zsh/functions}/init_rc_tilde_paths | 0 .../files/zsh/functions/init_site_environment | 9 ++++++++ .../zsh/functions/init_website_environment | 9 ++++++++ .../dotfiles/files/zsh/functions}/init_xcode | 0 .../files/zsh/functions}/init_zsh_functions | 0 .../files/zsh/functions}/init_zsh_history | 0 .../files/zsh/functions}/init_zsh_options | 0 .../files/zsh/functions}/list_tmux_sessions | 0 .../dotfiles/files/zsh/functions}/load_module | 0 .../files/zsh/functions}/neovim_init_once | 0 .../dotfiles/files/zsh/functions}/nethack | 0 .../dotfiles/files/zsh/functions}/open-xcode | 0 .../files/zsh/functions}/prepend_to_path | 0 .../files/zsh/functions}/prompt_colorize | 0 .../zsh/functions}/prompt_loquacious_setup | 0 .../files/zsh/functions}/refresh_system_tags | 0 .../files/zsh/functions}/setup-cpython | 0 .../files/zsh/functions}/setup_android | 0 .../dotfiles/files/zsh/functions}/solarized | 0 .../roles/dotfiles/files/zsh/functions}/up | 0 .../dotfiles/files/zsh/functions}/update-path | 0 .../dotfiles/files/zsh/functions/weeknotes | 15 +++++++++++++ Ansible/roles/dotfiles/files/zsh/zshenv | 4 +++- Ansible/roles/dotfiles/tasks/zsh.yml | 22 ++++++++++++------- 48 files changed, 50 insertions(+), 9 deletions(-) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/append_to_path (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/binary_exists (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/connect_ssh_agent (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/darwin-icloud-drive-path (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/darwin/darwin-hardware-model (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/darwin/darwin-os-build (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/darwin/darwin-os-version (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/darwin_configure_screenshots_directory (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/darwin_init_once (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/do_init_functions (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/finder (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/g (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/homebrew-prefix (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/import_cacert (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_app_environments (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_configure_ls (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_profile_darwin (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_profile_darwin_say_hello (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_rc_aliases (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_rc_configure_completion (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_rc_configure_prompt (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_rc_configure_zle (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_rc_fpath_darwin (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_rc_linux (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_rc_tilde_paths (100%) create mode 100644 Ansible/roles/dotfiles/files/zsh/functions/init_site_environment create mode 100644 Ansible/roles/dotfiles/files/zsh/functions/init_website_environment rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_xcode (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_zsh_functions (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_zsh_history (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/init_zsh_options (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/list_tmux_sessions (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/load_module (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/neovim_init_once (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/nethack (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/open-xcode (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/prepend_to_path (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/prompt_colorize (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/prompt_loquacious_setup (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/refresh_system_tags (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/setup-cpython (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/setup_android (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/solarized (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/up (100%) rename {zsh/func => Ansible/roles/dotfiles/files/zsh/functions}/update-path (100%) create mode 100644 Ansible/roles/dotfiles/files/zsh/functions/weeknotes diff --git a/zsh/func/append_to_path b/Ansible/roles/dotfiles/files/zsh/functions/append_to_path similarity index 100% rename from zsh/func/append_to_path rename to Ansible/roles/dotfiles/files/zsh/functions/append_to_path diff --git a/zsh/func/binary_exists b/Ansible/roles/dotfiles/files/zsh/functions/binary_exists similarity index 100% rename from zsh/func/binary_exists rename to Ansible/roles/dotfiles/files/zsh/functions/binary_exists diff --git a/zsh/func/connect_ssh_agent b/Ansible/roles/dotfiles/files/zsh/functions/connect_ssh_agent similarity index 100% rename from zsh/func/connect_ssh_agent rename to Ansible/roles/dotfiles/files/zsh/functions/connect_ssh_agent diff --git a/zsh/func/darwin-icloud-drive-path b/Ansible/roles/dotfiles/files/zsh/functions/darwin-icloud-drive-path similarity index 100% rename from zsh/func/darwin-icloud-drive-path rename to Ansible/roles/dotfiles/files/zsh/functions/darwin-icloud-drive-path diff --git a/zsh/func/darwin/darwin-hardware-model b/Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-hardware-model similarity index 100% rename from zsh/func/darwin/darwin-hardware-model rename to Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-hardware-model diff --git a/zsh/func/darwin/darwin-os-build b/Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-os-build similarity index 100% rename from zsh/func/darwin/darwin-os-build rename to Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-os-build diff --git a/zsh/func/darwin/darwin-os-version b/Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-os-version similarity index 100% rename from zsh/func/darwin/darwin-os-version rename to Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-os-version diff --git a/zsh/func/darwin_configure_screenshots_directory b/Ansible/roles/dotfiles/files/zsh/functions/darwin_configure_screenshots_directory similarity index 100% rename from zsh/func/darwin_configure_screenshots_directory rename to Ansible/roles/dotfiles/files/zsh/functions/darwin_configure_screenshots_directory diff --git a/zsh/func/darwin_init_once b/Ansible/roles/dotfiles/files/zsh/functions/darwin_init_once similarity index 100% rename from zsh/func/darwin_init_once rename to Ansible/roles/dotfiles/files/zsh/functions/darwin_init_once diff --git a/zsh/func/do_init_functions b/Ansible/roles/dotfiles/files/zsh/functions/do_init_functions similarity index 100% rename from zsh/func/do_init_functions rename to Ansible/roles/dotfiles/files/zsh/functions/do_init_functions diff --git a/zsh/func/finder b/Ansible/roles/dotfiles/files/zsh/functions/finder similarity index 100% rename from zsh/func/finder rename to Ansible/roles/dotfiles/files/zsh/functions/finder diff --git a/zsh/func/g b/Ansible/roles/dotfiles/files/zsh/functions/g similarity index 100% rename from zsh/func/g rename to Ansible/roles/dotfiles/files/zsh/functions/g diff --git a/zsh/func/homebrew-prefix b/Ansible/roles/dotfiles/files/zsh/functions/homebrew-prefix similarity index 100% rename from zsh/func/homebrew-prefix rename to Ansible/roles/dotfiles/files/zsh/functions/homebrew-prefix diff --git a/zsh/func/import_cacert b/Ansible/roles/dotfiles/files/zsh/functions/import_cacert similarity index 100% rename from zsh/func/import_cacert rename to Ansible/roles/dotfiles/files/zsh/functions/import_cacert diff --git a/zsh/func/init_app_environments b/Ansible/roles/dotfiles/files/zsh/functions/init_app_environments similarity index 100% rename from zsh/func/init_app_environments rename to Ansible/roles/dotfiles/files/zsh/functions/init_app_environments diff --git a/zsh/func/init_configure_ls b/Ansible/roles/dotfiles/files/zsh/functions/init_configure_ls similarity index 100% rename from zsh/func/init_configure_ls rename to Ansible/roles/dotfiles/files/zsh/functions/init_configure_ls diff --git a/zsh/func/init_profile_darwin b/Ansible/roles/dotfiles/files/zsh/functions/init_profile_darwin similarity index 100% rename from zsh/func/init_profile_darwin rename to Ansible/roles/dotfiles/files/zsh/functions/init_profile_darwin diff --git a/zsh/func/init_profile_darwin_say_hello b/Ansible/roles/dotfiles/files/zsh/functions/init_profile_darwin_say_hello similarity index 100% rename from zsh/func/init_profile_darwin_say_hello rename to Ansible/roles/dotfiles/files/zsh/functions/init_profile_darwin_say_hello diff --git a/zsh/func/init_rc_aliases b/Ansible/roles/dotfiles/files/zsh/functions/init_rc_aliases similarity index 100% rename from zsh/func/init_rc_aliases rename to Ansible/roles/dotfiles/files/zsh/functions/init_rc_aliases diff --git a/zsh/func/init_rc_configure_completion b/Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_completion similarity index 100% rename from zsh/func/init_rc_configure_completion rename to Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_completion diff --git a/zsh/func/init_rc_configure_prompt b/Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_prompt similarity index 100% rename from zsh/func/init_rc_configure_prompt rename to Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_prompt diff --git a/zsh/func/init_rc_configure_zle b/Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_zle similarity index 100% rename from zsh/func/init_rc_configure_zle rename to Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_zle diff --git a/zsh/func/init_rc_fpath_darwin b/Ansible/roles/dotfiles/files/zsh/functions/init_rc_fpath_darwin similarity index 100% rename from zsh/func/init_rc_fpath_darwin rename to Ansible/roles/dotfiles/files/zsh/functions/init_rc_fpath_darwin diff --git a/zsh/func/init_rc_linux b/Ansible/roles/dotfiles/files/zsh/functions/init_rc_linux similarity index 100% rename from zsh/func/init_rc_linux rename to Ansible/roles/dotfiles/files/zsh/functions/init_rc_linux diff --git a/zsh/func/init_rc_tilde_paths b/Ansible/roles/dotfiles/files/zsh/functions/init_rc_tilde_paths similarity index 100% rename from zsh/func/init_rc_tilde_paths rename to Ansible/roles/dotfiles/files/zsh/functions/init_rc_tilde_paths diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_site_environment b/Ansible/roles/dotfiles/files/zsh/functions/init_site_environment new file mode 100644 index 0000000..b4f382b --- /dev/null +++ b/Ansible/roles/dotfiles/files/zsh/functions/init_site_environment @@ -0,0 +1,9 @@ +#!/usr/bin/env zsh +# Eryn Wells + +function init_site_environments +{ + export ERYNWELLS_ME_SITE="$HOME/Developer/erynwells.me" +} + +init_site_environments "$@" diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_website_environment b/Ansible/roles/dotfiles/files/zsh/functions/init_website_environment new file mode 100644 index 0000000..e1f791e --- /dev/null +++ b/Ansible/roles/dotfiles/files/zsh/functions/init_website_environment @@ -0,0 +1,9 @@ +#!/usr/bin/env zsh +# Eryn Wells + +function init_website_environments +{ + export ERYNWELLS_ME_SITE="$HOME/Developer/erynwells.me" +} + +init_website_environments "$@" diff --git a/zsh/func/init_xcode b/Ansible/roles/dotfiles/files/zsh/functions/init_xcode similarity index 100% rename from zsh/func/init_xcode rename to Ansible/roles/dotfiles/files/zsh/functions/init_xcode diff --git a/zsh/func/init_zsh_functions b/Ansible/roles/dotfiles/files/zsh/functions/init_zsh_functions similarity index 100% rename from zsh/func/init_zsh_functions rename to Ansible/roles/dotfiles/files/zsh/functions/init_zsh_functions diff --git a/zsh/func/init_zsh_history b/Ansible/roles/dotfiles/files/zsh/functions/init_zsh_history similarity index 100% rename from zsh/func/init_zsh_history rename to Ansible/roles/dotfiles/files/zsh/functions/init_zsh_history diff --git a/zsh/func/init_zsh_options b/Ansible/roles/dotfiles/files/zsh/functions/init_zsh_options similarity index 100% rename from zsh/func/init_zsh_options rename to Ansible/roles/dotfiles/files/zsh/functions/init_zsh_options diff --git a/zsh/func/list_tmux_sessions b/Ansible/roles/dotfiles/files/zsh/functions/list_tmux_sessions similarity index 100% rename from zsh/func/list_tmux_sessions rename to Ansible/roles/dotfiles/files/zsh/functions/list_tmux_sessions diff --git a/zsh/func/load_module b/Ansible/roles/dotfiles/files/zsh/functions/load_module similarity index 100% rename from zsh/func/load_module rename to Ansible/roles/dotfiles/files/zsh/functions/load_module diff --git a/zsh/func/neovim_init_once b/Ansible/roles/dotfiles/files/zsh/functions/neovim_init_once similarity index 100% rename from zsh/func/neovim_init_once rename to Ansible/roles/dotfiles/files/zsh/functions/neovim_init_once diff --git a/zsh/func/nethack b/Ansible/roles/dotfiles/files/zsh/functions/nethack similarity index 100% rename from zsh/func/nethack rename to Ansible/roles/dotfiles/files/zsh/functions/nethack diff --git a/zsh/func/open-xcode b/Ansible/roles/dotfiles/files/zsh/functions/open-xcode similarity index 100% rename from zsh/func/open-xcode rename to Ansible/roles/dotfiles/files/zsh/functions/open-xcode diff --git a/zsh/func/prepend_to_path b/Ansible/roles/dotfiles/files/zsh/functions/prepend_to_path similarity index 100% rename from zsh/func/prepend_to_path rename to Ansible/roles/dotfiles/files/zsh/functions/prepend_to_path diff --git a/zsh/func/prompt_colorize b/Ansible/roles/dotfiles/files/zsh/functions/prompt_colorize similarity index 100% rename from zsh/func/prompt_colorize rename to Ansible/roles/dotfiles/files/zsh/functions/prompt_colorize diff --git a/zsh/func/prompt_loquacious_setup b/Ansible/roles/dotfiles/files/zsh/functions/prompt_loquacious_setup similarity index 100% rename from zsh/func/prompt_loquacious_setup rename to Ansible/roles/dotfiles/files/zsh/functions/prompt_loquacious_setup diff --git a/zsh/func/refresh_system_tags b/Ansible/roles/dotfiles/files/zsh/functions/refresh_system_tags similarity index 100% rename from zsh/func/refresh_system_tags rename to Ansible/roles/dotfiles/files/zsh/functions/refresh_system_tags diff --git a/zsh/func/setup-cpython b/Ansible/roles/dotfiles/files/zsh/functions/setup-cpython similarity index 100% rename from zsh/func/setup-cpython rename to Ansible/roles/dotfiles/files/zsh/functions/setup-cpython diff --git a/zsh/func/setup_android b/Ansible/roles/dotfiles/files/zsh/functions/setup_android similarity index 100% rename from zsh/func/setup_android rename to Ansible/roles/dotfiles/files/zsh/functions/setup_android diff --git a/zsh/func/solarized b/Ansible/roles/dotfiles/files/zsh/functions/solarized similarity index 100% rename from zsh/func/solarized rename to Ansible/roles/dotfiles/files/zsh/functions/solarized diff --git a/zsh/func/up b/Ansible/roles/dotfiles/files/zsh/functions/up similarity index 100% rename from zsh/func/up rename to Ansible/roles/dotfiles/files/zsh/functions/up diff --git a/zsh/func/update-path b/Ansible/roles/dotfiles/files/zsh/functions/update-path similarity index 100% rename from zsh/func/update-path rename to Ansible/roles/dotfiles/files/zsh/functions/update-path diff --git a/Ansible/roles/dotfiles/files/zsh/functions/weeknotes b/Ansible/roles/dotfiles/files/zsh/functions/weeknotes new file mode 100644 index 0000000..9381644 --- /dev/null +++ b/Ansible/roles/dotfiles/files/zsh/functions/weeknotes @@ -0,0 +1,15 @@ +#!/usr/bin/env zsh + +autoload init_website_environment + +function weeknotes +{ + init_website_environment + + YEAR=`date '+%Y'` + WEEK_NUMBER=`date '+%V'` + PAGE_PATH=blog/${YEAR}/weeknotes-${YEAR}w${WEEK_NUMBER}.md + UPCOMING_SUNDAY=`${ERYNWELLS_ME_SITE}/scripts/next_sunday.py` +} + +weeknotes "$@" diff --git a/Ansible/roles/dotfiles/files/zsh/zshenv b/Ansible/roles/dotfiles/files/zsh/zshenv index ead3559..540ecba 100644 --- a/Ansible/roles/dotfiles/files/zsh/zshenv +++ b/Ansible/roles/dotfiles/files/zsh/zshenv @@ -9,7 +9,9 @@ function init-env-fpath { local -r fpath_candidates=( \ "$HOME/.zsh/${SYS}-functions" \ - "$HOME/.zsh/func" \ + "$HOME/.zsh/init-env-functions" \ + "$HOME/.zsh/init-rc-functions" \ + "$HOME/.zsh/functions" \ ) # Process the array in reverse order (`Oa` means "descending index order", diff --git a/Ansible/roles/dotfiles/tasks/zsh.yml b/Ansible/roles/dotfiles/tasks/zsh.yml index 9301154..ef7dd22 100644 --- a/Ansible/roles/dotfiles/tasks/zsh.yml +++ b/Ansible/roles/dotfiles/tasks/zsh.yml @@ -1,5 +1,5 @@ --- -- name: (ZSH) Link startup files +- name: (zsh) Link startup files ansible.builtin.file: path: ~/.{{ item }} src: "{{ role_path }}/files/zsh/{{ item }}" @@ -10,16 +10,22 @@ - zshrc - zprofile -- name: (ZSH) Link env functions +- name: (zsh) Create zsh directories ansible.builtin.file: - path: ~/.zsh/init-env-functions - src: "{{ role_path }}/files/zsh/init-env-functions" - state: link + path: "{{ item }}" + state: directory force: true + loop: + - ~/.zsh + - ~/.zsh/cache -- name: (ZSH) Link rc functions +- name: (zsh) Link function library directories ansible.builtin.file: - path: ~/.zsh/init-rc-functions - src: "{{ role_path }}/files/zsh/init-rc-functions" + path: ~/.zsh/{{ item }} + src: "{{ role_path }}/files/zsh/{{ item }}" state: link force: true + loop: + - init-env-functions + - init-rc-functions + - functions