diff --git a/ansible/blue-rock.yaml b/ansible/blue-rock.yaml index 87329ee..3f2f30b 100644 --- a/ansible/blue-rock.yaml +++ b/ansible/blue-rock.yaml @@ -2,7 +2,7 @@ - name: Install packages hosts: blue-rock vars: - ansible_python_interpreter: '/usr/bin/python3' + ansible_python_interpreter: '/usr/local/bin/python3' tasks: - name: Install packages from Homebrew community.general.homebrew: @@ -11,6 +11,7 @@ - adr-tools # - cdktf - chart-testing + - coreutils - dog - dust - gh @@ -22,34 +23,57 @@ - kubectl - kubectx - mas + - python - subversion + - wget - yq # - name: Install casks from Homebrew # community.general.homebrew: # state: present # name: + # - homebrew/cask/1password + # - homebrew/cask/cakebrew + # - homebrew/cask/elgato-stream-deck + # - homebrew/cask/firefox + # - homebrew/cask/google-drive # - homebrew/cask/iterm2 + # - homebrew/cask/keepingyouawake + # - homebrew/cask/logseq # - homebrew/cask/meld + # - homebrew/cask/obs # - homebrew/cask/signal + # - homebrew/cask/slack + # - homebrew/cask/thunderbird + # - homebrew/cask/visual-studio-code # - homebrew/cask/whatsapp + # - homebrew/cask/zoom + # - homebrew/cask-fonts/font-hack-nerd-font + # - homebrew/cask-fonts/font-inconsolata-g-for-powerline + # - homebrew/cask-fonts/font-source-code-pro-for-powerline + # - puppetlabs/puppet/pdk # - name: Install apps from App Store # community.general.mas: - # id: - # - 409183694 # Keynote - # - 413857545 # Divvy # state: present + # id: + # - 1569813296 # 1Password for Safari + # - 417375580 # BetterSnapTool + # - 1532419400 # MeetingBar for Meet, Zoom & Co + # - 1451685025 # WireGuard - - name: Ensure fonts directory - ansible.builtin.file: - path: "{{ lookup('env', 'HOME') }}/.fonts" - state: directory + - name: Install packages with pip + ansible.builtin.pip: + name: + - ansible + - ansible-lint + # - powerline-status # repalced with airline + # - psutil - name: Download Hack Nerd Font ansible.builtin.unarchive: src: https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Hack.zip - dest: "{{ lookup('env', 'HOME') }}/.fonts/" + dest: "{{ lookup('env', 'HOME') }}/Library/Fonts/" remote_src: true # Vim setup @@ -60,6 +84,13 @@ state: link force: true + # - name: Symlink .vimrc_os_specific + # ansible.builtin.file: + # src: "{{ lookup('env', 'HOME') }}/repos/dots/link/mac/vimrc_os_specific" + # dest: "{{ lookup('env', 'HOME') }}/.vimrc_os_specific" + # state: link + # force: true + - name: Install Vundle ansible.builtin.git: repo: 'https://github.com/VundleVim/Vundle.vim' diff --git a/link/mac/vimrc_os_specific b/link/mac/vimrc_os_specific deleted file mode 100644 index 5f3fee6..0000000 --- a/link/mac/vimrc_os_specific +++ /dev/null @@ -1,4 +0,0 @@ -" enable powerline -python3 from powerline.vim import setup as powerline_setup -python3 powerline_setup() -python3 del powerline_setup diff --git a/link/nix/vimrc b/link/nix/vimrc index 4fad9c2..83c51ae 100644 --- a/link/nix/vimrc +++ b/link/nix/vimrc @@ -75,6 +75,4 @@ let g:vim_markdown_folding_disabled = 1 " settings for vim-airline let g:airline_theme='powerlineish' -" import settings that are OS specific -" source ~/.vimrc_os_specific - +" let g:airline_powerline_fonts = 1 diff --git a/link/nix/zshrc b/link/nix/zshrc index 0114d92..2f252cc 100644 --- a/link/nix/zshrc +++ b/link/nix/zshrc @@ -99,9 +99,9 @@ if [[ $(uname) == 'Darwin' ]]; then export PATH=/usr/local/MacGPG2/bin:$PATH fi -export GPG_TTY=$(tty) -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -gpgconf --launch gpg-agent +# export GPG_TTY=$(tty) +# export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +# gpgconf --launch gpg-agent # export MANPATH="/usr/local/man:$MANPATH" @@ -202,7 +202,7 @@ if [[ `uname` == 'Darwin' ]]; then export PATH=$PATH:$GEMBIN # added by travis gem - [ -f ~/.travis/travis.sh ] && source ~/.travis/travis.sh || echo 'The travis gem is missing. After installing it run "echo y|travis" to create ~/.travis' + # [ -f ~/.travis/travis.sh ] && source ~/.travis/travis.sh || echo 'The travis gem is missing. After installing it run "echo y|travis" to create ~/.travis' # added to make pipx work [ -d /Users/gene/.local/bin ] && export PATH=$PATH:/Users/gene/.local/bin