Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ziwi01 committed Mar 18, 2024
2 parents fe9bf02 + dd32c7f commit 447f40b
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 14 deletions.
6 changes: 6 additions & 0 deletions ansible/roles/config/files/tmuxp-default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
session_name: Default session
start_directory: /home
windows:
- window_name: home
panes:
- echo Welcome to proveasio. To update windows/panes for this session edit ~/.tmuxp/default.yaml. Create new sessions by adding yaml files. See Proveasio usage docs for details.
15 changes: 15 additions & 0 deletions ansible/roles/config/tasks/tmux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,18 @@
# TODO: Add changed_when/failed_when
- name: "[Config][Tmux] Update plugins" # noqa no-changed-when
ansible.builtin.command: "{{ ansible_env.HOME }}/.tmux/plugins/tpm/bin/update_plugins all"

- name: "[Config][Tmuxp] Create directory in {{ ansible_env.HOME }}/.tmuxp"
ansible.builtin.file:
path: "{{ ansible_env.HOME }}/.tmuxp"
state: directory
mode: '0755'

- name: "[Config][Tmuxp] Add default session file"
vars:
app: Tmuxp
source_file: tmuxp-default.yaml
target_file: "{{ ansible_env.HOME }}/.tmuxp/default_session.yaml"
ansible.builtin.include_role:
name: common
tasks_from: config_file.yml
1 change: 1 addition & 0 deletions ansible/roles/software/tasks/azurecli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
when: azurecli_apt_version not in ['latest', 'present', 'absent']
ansible.builtin.apt:
update_cache: true
allow_downgrade: true
name: "azure-cli={{ azurecli_apt_version }}"

- name: '[AzureCLI] Get installed package version'
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/software/tasks/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
when: item.value not in ['latest', 'present', 'absent']
ansible.builtin.apt:
update_cache: true
allow_downgrade: true
name: "{{ item.key }}={{ item.value }}"
loop: "{{ docker_apt_packages | dict2items }}"

Expand Down
24 changes: 12 additions & 12 deletions ansible/roles/software/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,26 @@ github_packages:
diff_so_fancy: 1.4.4
bat: 0.24.0
zoxide: 0.9.4
helm: 3.14.2
helm: 3.14.3
lazygit: 0.40.2
fzf: 0.46.1
fzf: 0.48.1
tmux: "3.4"
ripgrep: 14.1.0
fd: 9.0.0
kind: 0.22.0
k9s: 0.31.9
yq: 4.41.1
k9s: 0.32.3
yq: 4.42.1
win32yank: 0.1.1
terraform: 1.7.4
terragrunt: 0.55.8
terraform: 1.5.2
terragrunt: 0.48.0
git_fuzzy: latest # Does not have releases, latest (for latest commit) or specific commit
nvm: 0.39.7 # Node Version Manater
tpm: 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 # Tmux plugin manager. Does not have releases, gets latest tag instead
pes: ad6f043b35db9dfc9eff6f46d5029ec13cb8ee76 # Puppet Editor Services. They don't release anymore, so latest means latest commit
p10k: 1.20.0
rvm1_ansible: 2.2.0 # Version of https://github.com/rvm/rvm1-ansible
# Kubectl version
kubectl_version: 1.29.2
kubectl_version: 1.29.3
# Packages and their versions to install with PIP
pip_packages:
thefuck: "3.32"
Expand Down Expand Up @@ -101,8 +101,8 @@ docker_apt_dependencies:
- lsb-release
# Docker main packages from APT repo
docker_apt_packages:
docker-ce: 5:25.0.3-1~ubuntu.22.04~jammy
docker-compose-plugin: 2.24.5-1~ubuntu.22.04~jammy
docker-ce: 5:25.0.4-1~ubuntu.22.04~jammy
docker-compose-plugin: 2.24.7-1~ubuntu.22.04~jammy
containerd.io: 1.6.28-1
# RVM / Ruby
rvm1_rubies:
Expand Down Expand Up @@ -133,13 +133,13 @@ puppet_pdk_version: 3.0.1.3-1focal
# Node
node_version: 'lts/iron'
# Ansible
ansible_pip_version: 9.2.0
ansible_lint_pip_version: 24.2.0
ansible_pip_version: 9.3.0
ansible_lint_pip_version: 24.2.1
# LunarVIM
lunarvim_url: https://github.com/lunarvim/lunarvim.git
lunarvim_home: "{{ ansible_env.HOME }}/.local/opt/lunarvim"
# Azure CLI
azurecli_apt_version: 2.57.0-1~jammy
azurecli_apt_version: 2.58.0-1~jammy
# AWS CLI
awscli_url: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip
# Puppet
Expand Down
4 changes: 3 additions & 1 deletion docs-web/docs/usage/30-tmux.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ For the first option - you can simply save your current session (opened windows,

You can also have multiple sessions, configured in YAML format, where you define open windows, panes, commands etc. You can define one for each project and easily switch/attach to them.

Sessions are stored in `${HOME}/.tmuxp` directory in a `*.yaml` file. See [`tmuxp`](https://github.com/tmux-python/tmuxp) how to define session.
Sessions are stored in `${HOME}/.tmuxp` directory in a `*.yaml` file. There is a default session file created when running Proveasio (for example purposes). To remove creating that file add `tmuxp_default_session: false` in your `overrides.yml` file. See overriding variables in main documentation.

See [`tmuxp`](https://github.com/tmux-python/tmuxp) for details on how to define sessions with multiple windows, panes etc.

After you define you session(s), you can run `lp` from shell, which will invoke a picker for your sessions. You can either attach it to our current session or create a new one.

Expand Down
4 changes: 3 additions & 1 deletion docs-web/versioned_docs/version-stable/usage/30-tmux.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ For the first option - you can simply save your current session (opened windows,

You can also have multiple sessions, configured in YAML format, where you define open windows, panes, commands etc. You can define one for each project and easily switch/attach to them.

Sessions are stored in `${HOME}/.tmuxp` directory in a `*.yaml` file. See [`tmuxp`](https://github.com/tmux-python/tmuxp) how to define session.
Sessions are stored in `${HOME}/.tmuxp` directory in a `*.yaml` file. There is a default session file created when running Proveasio (for example purposes). To remove creating that file add `tmuxp_default_session: false` in your `overrides.yml` file. See overriding variables in main documentation.

See [`tmuxp`](https://github.com/tmux-python/tmuxp) for details on how to define sessions with multiple windows, panes etc.

After you define you session(s), you can run `lp` from shell, which will invoke a picker for your sessions. You can either attach it to our current session or create a new one.

Expand Down

0 comments on commit 447f40b

Please sign in to comment.