From 5b3d5208a30db1c2ed90c6766ac6c4c222da5138 Mon Sep 17 00:00:00 2001 From: Bas Grolleman Date: Mon, 9 Jun 2025 10:55:32 +0200 Subject: [PATCH] Welcome to Ubuntu 25.04 and fixes --- .../install-desktop-toolsontech.sh | 4 +++- .../install-desktop-toolsontech.yml | 2 ++ ansible.desktop/tasks/.discord.yml.swp | Bin 12288 -> 0 bytes ansible.desktop/tasks/base_packages.yml | 9 +++++++++ ansible.desktop/tasks/discord.yml | 19 +++++++++++------- ansible.desktop/tasks/flatpak.yml | 5 +++++ ansible.desktop/tasks/steam.yml | 5 +++++ i3/config | 5 +++++ polybar/config.ini | 8 ++++---- profile | 8 ++++++++ 10 files changed, 53 insertions(+), 12 deletions(-) delete mode 100644 ansible.desktop/tasks/.discord.yml.swp create mode 100644 ansible.desktop/tasks/flatpak.yml create mode 100644 ansible.desktop/tasks/steam.yml diff --git a/ansible.desktop/install-desktop-toolsontech.sh b/ansible.desktop/install-desktop-toolsontech.sh index 5c95eb6..692a2b6 100755 --- a/ansible.desktop/install-desktop-toolsontech.sh +++ b/ansible.desktop/install-desktop-toolsontech.sh @@ -1,10 +1,12 @@ #!/bin/sh # Simple script to run the playbook +echo "Open Sudo rights before start" +sudo echo "ok" if [ ! -x /usr/bin/ansible ]; then echo "Missing Ansible, Running Install" if [ -x /usr/bin/apt ]; then # I'm not doing anything fancy, so older version from repo is okay - apt install -f ansible + sudo apt install -f ansible fi fi ansible-playbook install-desktop-toolsontech.yml diff --git a/ansible.desktop/install-desktop-toolsontech.yml b/ansible.desktop/install-desktop-toolsontech.yml index 200e6df..8fcb041 100644 --- a/ansible.desktop/install-desktop-toolsontech.yml +++ b/ansible.desktop/install-desktop-toolsontech.yml @@ -6,9 +6,11 @@ ansible.builtin.include_tasks: "{{ item }}" loop: - tasks/base_packages.yml + - tasks/flatpak.yml - tasks/todoist.yml - tasks/nocfree.yml - tasks/discord.yml + - tasks/steam.yml diff --git a/ansible.desktop/tasks/.discord.yml.swp b/ansible.desktop/tasks/.discord.yml.swp deleted file mode 100644 index cb3adaad2060f9ba9699230ad5a6b77c09d2c8fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&ziZn-6bJBgAw!3>rQOSGG?YNCv)v_RD+x&p2?T;W=OkU_t0kR~?jT+g$lm|J zd)xdC9lG}~=@K&J59m`Ys}RVR#o>GKIO%>oJwBQaDH?qKbVys_NN{^0#Qy86^!M8Q zsT~RtrIpPxovWgmyuW42SL*)hZszQNLU~l#uR3-zpY;=6Pn|8LQ}wi#iK$~-CE+a3 zx{bJi00bUDV14|4G#oUEf{i!y>gD(Wav}u;AOHafKmY;|fB*y_uqpzs?1^(O_DNgt zv$pTu>Dya$5P$##AOHafKmY;|fB*y_009WBpnyt*nDe3kx;gms_y6Vj|L=1l{&4)_ zxa9cB@q^<#$2X1(4##oAvB`0>%&~$7C>a6}fB*y_009U<00Izz00bVNKtNIiG;yx1 zx1~&toA@YL!0kgG(tpET3 diff --git a/ansible.desktop/tasks/base_packages.yml b/ansible.desktop/tasks/base_packages.yml index d59f0cd..75c2059 100644 --- a/ansible.desktop/tasks/base_packages.yml +++ b/ansible.desktop/tasks/base_packages.yml @@ -15,6 +15,8 @@ name: - i3 - polybar + - keychain + - rofi - name: Development Environment become: true @@ -31,3 +33,10 @@ - flameshot - peek - obs-studio + +- name: Brave Browser + become: true + ansible.builtin.shell: 'curl -fsS https://dl.brave.com/install.sh | sh' + args: + creates: /usr/bin/brave-browser + diff --git a/ansible.desktop/tasks/discord.yml b/ansible.desktop/tasks/discord.yml index 4cf4e4e..dd7f1e1 100644 --- a/ansible.desktop/tasks/discord.yml +++ b/ansible.desktop/tasks/discord.yml @@ -1,8 +1,13 @@ +--- - - name: Communication - apt: - name: - - discord -# Let's fix Discord Auto updating, because it's a pain -# https://github.com/FlorianHegele/AutoUpdateDiscord -# / +- name: Install AutoUpdateDiscord + become: true + ansible.builtin.git: + repo: 'https://github.com/FlorianHegele/AutoUpdateDiscord' + dest: /opt/AutoUpdateDiscord + +- name: Install/Update Discord + become: true + ansible.builtin.shell: 'bash /opt/AutoUpdateDiscord/update_discord.sh' + args: + creates: /usr/bin/Discord diff --git a/ansible.desktop/tasks/flatpak.yml b/ansible.desktop/tasks/flatpak.yml new file mode 100644 index 0000000..d72eeb1 --- /dev/null +++ b/ansible.desktop/tasks/flatpak.yml @@ -0,0 +1,5 @@ +- name: Setup Flatpak + become: true + apt: + name: + - flatpak diff --git a/ansible.desktop/tasks/steam.yml b/ansible.desktop/tasks/steam.yml new file mode 100644 index 0000000..0b92dc0 --- /dev/null +++ b/ansible.desktop/tasks/steam.yml @@ -0,0 +1,5 @@ +--- +- name: Install Steam + become: true + ansible.builtin.apt: + deb: 'https://cdn.fastly.steamstatic.com/client/installer/steam.deb' diff --git a/i3/config b/i3/config index 13fc69a..76c2e89 100644 --- a/i3/config +++ b/i3/config @@ -189,3 +189,8 @@ exec_always --no-startup-id $HOME/.config/polybar/launch.sh default_border normal 5px # This needs a newer verison of i3 then I have on my desktop right now #gaps inner 5px + +# Turn off my screen after 10 min of in-activity +exec --no-startup-id xset dpms 600 +exec --no-startup-id /usr/bin/blueman-applet + diff --git a/polybar/config.ini b/polybar/config.ini index ac3814b..facbe50 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -22,11 +22,11 @@ font-4 = NotoColorEmoji:size=14:scale=10;0 modules-left = i3 cpu memory modules-center = date -modules-right = wired-network wireless-network pulseaudio +modules-right = wired-network wireless-network pulseaudio tray -tray-position = right -tray-padding = 2 -tray-maxsize = 16 +#tray-position = right +#tray-padding = 2 +#tray-maxsize = 16 [module/backlight] type = internal/xbacklight diff --git a/profile b/profile index 7d66b9d..1c55767 100755 --- a/profile +++ b/profile @@ -29,3 +29,11 @@ fi #if [ -n "$PS1" ] && [ -z "$TMUX" ] && [ -z "$SSH_TTY" ] && [ -t 1 ]; then # tmux attach-session -t main || tmux new-session -s main #fi + +# Load my SSH Agent and Key +if [ -n "$PS1" ] && [ -z "$SSH_TTY" ] && [ -t 1 ]; then + keychain ~/.ssh/bgrolleman_2024.ed25519 + source ~/.keychain/laura-sh +fi + +alias notes="tmux attach-session -t notes || tmux new-session -s notes 'nvim ~/Notes/Personal'"