From d2e4b239bdb1ae03ac45ea5d0dc43c0791626972 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Sat, 27 Dec 2025 15:29:27 -0600 Subject: [PATCH] update --- .config/autostart/jetbrains-toolbox.desktop | 15 ------ .config/nvim/lua/plugins/codecomapnion.lua | 2 +- .config/scripts/sessions.sh | 4 +- .config/shell/alias.zsh | 1 + .nixpkgs/config.nix | 1 + Makefile | 3 ++ ansible/roles/packages/vars/Pop!_OS-24.04.yml | 50 ++----------------- ansible/roles/security/tasks/defaults.yml | 20 ++++++++ ansible/roles/security/tasks/main.yml | 11 ++++ ansible/roles/security/vars/Pop!_OS-24.04.yml | 0 ansible/roles/update/tasks/main.yml | 10 ++-- ansible/scripts/install_flatpak.yml | 4 +- ansible/security.yml | 5 ++ 13 files changed, 57 insertions(+), 69 deletions(-) delete mode 100755 .config/autostart/jetbrains-toolbox.desktop create mode 100644 ansible/roles/security/tasks/defaults.yml create mode 100644 ansible/roles/security/tasks/main.yml create mode 100644 ansible/roles/security/vars/Pop!_OS-24.04.yml create mode 100644 ansible/security.yml diff --git a/.config/autostart/jetbrains-toolbox.desktop b/.config/autostart/jetbrains-toolbox.desktop deleted file mode 100755 index bc5a3b0..0000000 --- a/.config/autostart/jetbrains-toolbox.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Icon=/opt/jetbrains-toolbox/bin/toolbox.svg -Exec=/opt/jetbrains-toolbox/bin/jetbrains-toolbox --minimize -Version=1.0 -Type=Application -Categories=Development -Name=JetBrains Toolbox -StartupWMClass=jetbrains-toolbox -Terminal=false -MimeType=x-scheme-handler/jetbrains; -X-GNOME-Autostart-enabled=true -StartupNotify=false -X-GNOME-Autostart-Delay=10 -X-MATE-Autostart-Delay=10 -X-KDE-autostart-after=panel diff --git a/.config/nvim/lua/plugins/codecomapnion.lua b/.config/nvim/lua/plugins/codecomapnion.lua index accd820..dffab32 100644 --- a/.config/nvim/lua/plugins/codecomapnion.lua +++ b/.config/nvim/lua/plugins/codecomapnion.lua @@ -65,7 +65,7 @@ return { name = "ollama", schema = { model = { - default = "mistral:latest", + default = "mistral:v0.3", }, }, env = { diff --git a/.config/scripts/sessions.sh b/.config/scripts/sessions.sh index 050007a..fdcb222 100755 --- a/.config/scripts/sessions.sh +++ b/.config/scripts/sessions.sh @@ -10,7 +10,7 @@ new() { name=$(find "$HOME/Documents/gitlab" -mindepth 2 -maxdepth 2 -type d \ | awk -F/ '{print $(NF-1)"/"$NF}' \ | sort \ - | wofi -dmenu -i -p "New Session" --columns 1) + | wofi --dmenu -i -p "New Session" --columns 1) if [ -z "$name" ]; then return @@ -61,7 +61,7 @@ goland-new() { name=$(find "$HOME/Documents/gitlab" -mindepth 2 -maxdepth 2 -type d \ | awk -F/ '{print $(NF-1)"/"$NF}' \ | sort \ - | wofi -dmenu -i -p "New JetBrains Session" --columns 1) + | wofi --dmenu -i -p "New JetBrains Session" --columns 1) if [ -z "$name" ]; then return diff --git a/.config/shell/alias.zsh b/.config/shell/alias.zsh index 7fc34c2..2a77232 100644 --- a/.config/shell/alias.zsh +++ b/.config/shell/alias.zsh @@ -20,3 +20,4 @@ alias gc='git commit -a' alias gd='git diff' alias gp='git push' alias bw='NODE_OPTIONS="" bw' +alias devpod='flatpak run --arch=x86_64 --command=devpod-cli sh.loft.devpod' diff --git a/.nixpkgs/config.nix b/.nixpkgs/config.nix index 7c2672f..a7415b4 100644 --- a/.nixpkgs/config.nix +++ b/.nixpkgs/config.nix @@ -36,6 +36,7 @@ libnotify wl-clipboard dnsutils + golangci-lint ]; }; }; diff --git a/Makefile b/Makefile index a1144bd..cd7d98c 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ export run: ansible-playbook ./ansible/local.yml -K +security: + ansible-playbook ./ansible/security.yml -K + update: ansible-playbook ./ansible/update.yml -K diff --git a/ansible/roles/packages/vars/Pop!_OS-24.04.yml b/ansible/roles/packages/vars/Pop!_OS-24.04.yml index d01e15c..10d25e7 100644 --- a/ansible/roles/packages/vars/Pop!_OS-24.04.yml +++ b/ansible/roles/packages/vars/Pop!_OS-24.04.yml @@ -1,27 +1,8 @@ install_homebrew_if_missing: true required_packages_brew: - #- lazygit - #- glab - #- oh-my-posh - #- tpm - #- kubernetes-cli - zsh-autosuggestions - #- bitwarden-cli - #- ttyd - #- fastfetch - #- vivid - #- yazi - zsh-history-substring-search - #- opentofu - #- helm - #- bat - #- neovim - #- eza - #- zoxide - #- ansible - #- ffmpeg - #- k9s - helm required_packages_apt: @@ -44,26 +25,8 @@ required_packages_apt: - yubikey-personalization - yubikey-manager - distrobox - #- htop - #- curl - #- xsel - #- wl-clipboard - #- podman - #- wget - #- apt-transport-https - #- software-properties-common - #- python3 - #- python3-pip - #- libvirt-clients - #- libvirt-daemon-system - #- bridge-utils - #- virtinst - #- vlc - #- vault - #- fzf - #- ripgrep - #- libsecret-tools - #- rclone + - unattended-upgrades + - timeshift #apt_keys: # - https://packages.microsoft.com/keys/microsoft.asc @@ -74,7 +37,7 @@ required_packages_apt: # - {name: "hashicorp-archive-keyring", url: "https://apt.releases.hashicorp.com/gpg"} flatpak_remote: - - {name: 'flathub', url: "https://dl.flathub.org/repo/flathub.flatpakrepo"} + - {name: 'flathub', url: "https://dl.flathub.org/repo/flathub.flatpakrepo", method: "user"} required_packages_flatpak: - me.proton.Mail @@ -83,19 +46,14 @@ required_packages_flatpak: - com.github.tchx84.Flatseal - com.vscodium.codium - org.chromium.Chromium - - org.libreoffice.LibreOffice - com.parsecgaming.parsec - org.videolan.VLC - fr.handbrake.ghb - com.spotify.Client - org.signal.Signal - com.yubico.yubioath - - org.gnome.Calculator - io.gitlab.librewolf-community - -#go_version_target: "go version go1.23.4 linux/amd64" -#go_tarball: "go1.23.5.linux-amd64.tar.gz" -#go_checksum: "sha256:cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091" + - com.brave.Browser go_apps: - github.com/charmbracelet/vhs@latest diff --git a/ansible/roles/security/tasks/defaults.yml b/ansible/roles/security/tasks/defaults.yml new file mode 100644 index 0000000..770ba1b --- /dev/null +++ b/ansible/roles/security/tasks/defaults.yml @@ -0,0 +1,20 @@ +- name: Configure Security Auto Updates + shell: + cmd: dpkg-reconfigure -p medium unattended-upgrades + become: yes + when: ansible_facts["os_family"] == 'Debian' + +- name: Check if UFW is installed + command: ufw version + register: ufw_version + ignore_errors: true + changed_when: false + +- name: Configure UFW + shell: + cmd: | + ufw enable + ufw default deny incoming + ufw default allow outgoing + become: yes + when: ufw_version.rc == 0 diff --git a/ansible/roles/security/tasks/main.yml b/ansible/roles/security/tasks/main.yml new file mode 100644 index 0000000..80ff2b2 --- /dev/null +++ b/ansible/roles/security/tasks/main.yml @@ -0,0 +1,11 @@ +- name: Load a variable file + include_vars: "{{ item }}" + with_first_found: + - "vars/{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml" + - "vars/{{ ansible_distribution }}.yml" + - "vars/{{ ansible_os_family }}.yml" + - "vars/defaults.yml" + +- name: "load tasks" + include_tasks: "defaults.yml" + diff --git a/ansible/roles/security/vars/Pop!_OS-24.04.yml b/ansible/roles/security/vars/Pop!_OS-24.04.yml new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/update/tasks/main.yml b/ansible/roles/update/tasks/main.yml index c30c3c2..5420890 100644 --- a/ansible/roles/update/tasks/main.yml +++ b/ansible/roles/update/tasks/main.yml @@ -1,13 +1,15 @@ -#- name: Update Pacman -# community.general.pacman: -# update_cache: true -# upgrade: true +- name: Update Pacman + community.general.pacman: + update_cache: true + upgrade: true + when: ansible_facts["os_family"] == 'Archlinux' - name: Upgrade Packages package: update_cache: yes upgrade: safe become: yes + when: ansible_facts["os_family"] == 'Debian' - name: Update Nix Packages become_user: user diff --git a/ansible/scripts/install_flatpak.yml b/ansible/scripts/install_flatpak.yml index 3690dec..5779a2c 100644 --- a/ansible/scripts/install_flatpak.yml +++ b/ansible/scripts/install_flatpak.yml @@ -3,7 +3,7 @@ name: "{{ item.name }}" state: present flatpakrepo_url: "{{ item.url }}" - method: user + method: "{{ item.method }}" with_items: "{{ flatpak_remote }}" when: flatpak_remote is defined @@ -17,6 +17,8 @@ become_user: user community.general.flatpak: name: "{{ item }}" + method: user + state: latest with_items: "{{ required_packages_flatpak }}" when: required_packages_flatpak is defined ignore_errors: yes diff --git a/ansible/security.yml b/ansible/security.yml new file mode 100644 index 0000000..d582cd3 --- /dev/null +++ b/ansible/security.yml @@ -0,0 +1,5 @@ +- hosts: localhost + connection: local + become: true + roles: + - security