From d497490285af724537317a52b6e0489ee1d6799b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?c=C4=83t=C4=83lin?= <catalin@roboces.dev>
Date: Thu, 22 Aug 2024 10:05:47 +0200
Subject: [PATCH] split the ansible agnostic packages installation into cli and
 gui packages

---
 ansible/roles/packages/tasks/flatpak.yml |  2 ++
 ansible/roles/packages/tasks/main.yml    | 17 ++++++++++++++---
 fish/conf.d/functions.fish               | 13 +++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/packages/tasks/flatpak.yml b/ansible/roles/packages/tasks/flatpak.yml
index 412a724..e4cb441 100644
--- a/ansible/roles/packages/tasks/flatpak.yml
+++ b/ansible/roles/packages/tasks/flatpak.yml
@@ -14,4 +14,6 @@
       - app/com.nextcloud.desktopclient.nextcloud/x86_64/stable
       - net.lutris.Lutris
       - io.github.diegoivanme.flowtime
+      - org.gnome.Decibels
+      - net.davidotek.pupgui2
     method: "user"
diff --git a/ansible/roles/packages/tasks/main.yml b/ansible/roles/packages/tasks/main.yml
index 9667aaf..cdfd0a1 100644
--- a/ansible/roles/packages/tasks/main.yml
+++ b/ansible/roles/packages/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Install os-agnostic packages
+- name: Install CLI os-agnostic packages
   become: true
   ansible.builtin.package:
     name:
@@ -8,13 +8,24 @@
       - fish
       - rofi
       - automake
-      - libtool
-      - mpv
       - ncdu
       - xclip
     state: present
   tags:
     - agnostic
+    - cli
+
+- name: Install GUI os-agnostic packages
+  become: true
+  ansible.builtin.package:
+    name:
+      - mpv
+      - rofi
+    state: present
+  tags:
+    - agnostic
+    - gui
+
 
 - name: Install Arch packages
   when: ansible_os_family == "Archlinux"
diff --git a/fish/conf.d/functions.fish b/fish/conf.d/functions.fish
index c64aebb..4956b80 100644
--- a/fish/conf.d/functions.fish
+++ b/fish/conf.d/functions.fish
@@ -17,6 +17,19 @@ function envsource
   end
 end
 
+function envunset
+  if not set -q argv[1]
+    set argv[1] ".env"
+  end
+
+  echo "Using $argv[1] as input file"
+
+  for line in (grep -v '^\s*\(#\|$\)' $argv[1] | grep -E '^[A-Za-z_]+=[^#\n]+')
+    set item (string split -m 1 '=' $line)
+    set -e $item[1]
+    echo "key $item[1] unset"
+  end
+end
 
 function gen-secret
     if not set -q argv[1]