Skip to content

Commit 447f40b

Browse files
committed
Merge branch 'develop'
2 parents fe9bf02 + dd32c7f commit 447f40b

File tree

7 files changed

+41
-14
lines changed

7 files changed

+41
-14
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
session_name: Default session
2+
start_directory: /home
3+
windows:
4+
- window_name: home
5+
panes:
6+
- 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.

ansible/roles/config/tasks/tmux.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,18 @@
1515
# TODO: Add changed_when/failed_when
1616
- name: "[Config][Tmux] Update plugins" # noqa no-changed-when
1717
ansible.builtin.command: "{{ ansible_env.HOME }}/.tmux/plugins/tpm/bin/update_plugins all"
18+
19+
- name: "[Config][Tmuxp] Create directory in {{ ansible_env.HOME }}/.tmuxp"
20+
ansible.builtin.file:
21+
path: "{{ ansible_env.HOME }}/.tmuxp"
22+
state: directory
23+
mode: '0755'
24+
25+
- name: "[Config][Tmuxp] Add default session file"
26+
vars:
27+
app: Tmuxp
28+
source_file: tmuxp-default.yaml
29+
target_file: "{{ ansible_env.HOME }}/.tmuxp/default_session.yaml"
30+
ansible.builtin.include_role:
31+
name: common
32+
tasks_from: config_file.yml

ansible/roles/software/tasks/azurecli.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
when: azurecli_apt_version not in ['latest', 'present', 'absent']
4040
ansible.builtin.apt:
4141
update_cache: true
42+
allow_downgrade: true
4243
name: "azure-cli={{ azurecli_apt_version }}"
4344

4445
- name: '[AzureCLI] Get installed package version'

ansible/roles/software/tasks/docker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
when: item.value not in ['latest', 'present', 'absent']
5656
ansible.builtin.apt:
5757
update_cache: true
58+
allow_downgrade: true
5859
name: "{{ item.key }}={{ item.value }}"
5960
loop: "{{ docker_apt_packages | dict2items }}"
6061

ansible/roles/software/vars/main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,26 @@ github_packages:
4545
diff_so_fancy: 1.4.4
4646
bat: 0.24.0
4747
zoxide: 0.9.4
48-
helm: 3.14.2
48+
helm: 3.14.3
4949
lazygit: 0.40.2
50-
fzf: 0.46.1
50+
fzf: 0.48.1
5151
tmux: "3.4"
5252
ripgrep: 14.1.0
5353
fd: 9.0.0
5454
kind: 0.22.0
55-
k9s: 0.31.9
56-
yq: 4.41.1
55+
k9s: 0.32.3
56+
yq: 4.42.1
5757
win32yank: 0.1.1
58-
terraform: 1.7.4
59-
terragrunt: 0.55.8
58+
terraform: 1.5.2
59+
terragrunt: 0.48.0
6060
git_fuzzy: latest # Does not have releases, latest (for latest commit) or specific commit
6161
nvm: 0.39.7 # Node Version Manater
6262
tpm: 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 # Tmux plugin manager. Does not have releases, gets latest tag instead
6363
pes: ad6f043b35db9dfc9eff6f46d5029ec13cb8ee76 # Puppet Editor Services. They don't release anymore, so latest means latest commit
6464
p10k: 1.20.0
6565
rvm1_ansible: 2.2.0 # Version of https://github.com/rvm/rvm1-ansible
6666
# Kubectl version
67-
kubectl_version: 1.29.2
67+
kubectl_version: 1.29.3
6868
# Packages and their versions to install with PIP
6969
pip_packages:
7070
thefuck: "3.32"
@@ -101,8 +101,8 @@ docker_apt_dependencies:
101101
- lsb-release
102102
# Docker main packages from APT repo
103103
docker_apt_packages:
104-
docker-ce: 5:25.0.3-1~ubuntu.22.04~jammy
105-
docker-compose-plugin: 2.24.5-1~ubuntu.22.04~jammy
104+
docker-ce: 5:25.0.4-1~ubuntu.22.04~jammy
105+
docker-compose-plugin: 2.24.7-1~ubuntu.22.04~jammy
106106
containerd.io: 1.6.28-1
107107
# RVM / Ruby
108108
rvm1_rubies:
@@ -133,13 +133,13 @@ puppet_pdk_version: 3.0.1.3-1focal
133133
# Node
134134
node_version: 'lts/iron'
135135
# Ansible
136-
ansible_pip_version: 9.2.0
137-
ansible_lint_pip_version: 24.2.0
136+
ansible_pip_version: 9.3.0
137+
ansible_lint_pip_version: 24.2.1
138138
# LunarVIM
139139
lunarvim_url: https://github.com/lunarvim/lunarvim.git
140140
lunarvim_home: "{{ ansible_env.HOME }}/.local/opt/lunarvim"
141141
# Azure CLI
142-
azurecli_apt_version: 2.57.0-1~jammy
142+
azurecli_apt_version: 2.58.0-1~jammy
143143
# AWS CLI
144144
awscli_url: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip
145145
# Puppet

docs-web/docs/usage/30-tmux.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ For the first option - you can simply save your current session (opened windows,
4040

4141
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.
4242

43-
Sessions are stored in `${HOME}/.tmuxp` directory in a `*.yaml` file. See [`tmuxp`](https://github.com/tmux-python/tmuxp) how to define session.
43+
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.
44+
45+
See [`tmuxp`](https://github.com/tmux-python/tmuxp) for details on how to define sessions with multiple windows, panes etc.
4446

4547
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.
4648

docs-web/versioned_docs/version-stable/usage/30-tmux.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ For the first option - you can simply save your current session (opened windows,
4040

4141
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.
4242

43-
Sessions are stored in `${HOME}/.tmuxp` directory in a `*.yaml` file. See [`tmuxp`](https://github.com/tmux-python/tmuxp) how to define session.
43+
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.
44+
45+
See [`tmuxp`](https://github.com/tmux-python/tmuxp) for details on how to define sessions with multiple windows, panes etc.
4446

4547
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.
4648

0 commit comments

Comments
 (0)