From 590a94af5696240017a6583c6db250d7cb043952 Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Wed, 11 Jun 2025 00:15:22 +0300
Subject: [PATCH] user/flatpak: add comments, add/remove programs
 hosts/dunamis/users/user/programs: bleh

Signed-off-by: unexplrd <unexplrd@linerds.us>
---
 hosts/dunamis/users/user/flatpak.nix  | 49 ++++++++++++++-------------
 hosts/dunamis/users/user/programs.nix | 24 ++++++++-----
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/hosts/dunamis/users/user/flatpak.nix b/hosts/dunamis/users/user/flatpak.nix
index 0d224e1..3a8c565 100644
--- a/hosts/dunamis/users/user/flatpak.nix
+++ b/hosts/dunamis/users/user/flatpak.nix
@@ -24,54 +24,57 @@
       [
         # browsers
         "app.zen_browser.zen"
-        "com.vivaldi.Vivaldi"
+        # "com.vivaldi.Vivaldi"
         "net.mullvad.MullvadBrowser"
         "org.torproject.torbrowser-launcher"
       ]
       ++ [
         # editing
-        "com.github.PintaProject.Pinta"
-        "org.gimp.GIMP"
-        "org.kde.kdenlive"
+        "com.github.PintaProject.Pinta" # bootleg paint
+        "org.gimp.GIMP" # the holy gimp
+        "org.kde.kdenlive" # video editor
       ]
       ++ [
         # chatting
-        "im.riot.Riot"
-        "io.github.kukuruzka165.materialgram"
-        "io.github.spacingbat3.webcord"
-        "org.mozilla.Thunderbird"
+        "im.riot.Riot" # matrix client
+        "io.github.kukuruzka165.materialgram" # telegram client
+        "io.github.spacingbat3.webcord" # discord client
+        # "org.mozilla.Thunderbird" # mail client
         "org.signal.Signal"
         # "org.telegram.desktop"
       ]
       ++ [
         # media
-        "ca.edestcroix.Recordbox"
-        "io.bassi.Amberol"
-        "io.freetubeapp.FreeTube"
-        "org.atheme.audacious"
+        # "ca.edestcroix.Recordbox" # music player
+        "com.github.neithern.g4music" # music player
+        # "io.bassi.Amberol" # music player
+        "io.freetubeapp.FreeTube" # youtube client
+        # "org.atheme.audacious" # music player
       ]
       ++ [
         # gaming
-        "com.heroicgameslauncher.hgl"
+        "com.heroicgameslauncher.hgl" # gog/egs launcher
         "com.valvesoftware.Steam"
-        "net.lutris.Lutris"
-        "org.prismlauncher.PrismLauncher"
+        "net.lutris.Lutris" # everything launcher
+        "org.prismlauncher.PrismLauncher" # minecraft launcher
         "org.freedesktop.Platform.VulkanLayer.MangoHud//24.08"
         "org.freedesktop.Platform.VulkanLayer.gamescope//24.08"
       ]
       ++ [
         # misc
+        "app.drey.Warp" # share files using magic wormhole
         "com.bitwarden.desktop"
-        "com.github.tchx84.Flatseal"
+        "com.github.tchx84.Flatseal" # control flatpak permissions
         "com.logseq.Logseq"
         "com.obsproject.Studio"
-        "com.usebottles.bottles"
-        "de.capypara.FieldMonitor"
-        "de.haeckerfelix.Fragments"
-        "io.github.amit9838.mousam"
-        "io.gitlab.news_flash.NewsFlash"
-        "me.iepure.devtoolbox"
-        "org.nicotine_plus.Nicotine"
+        "com.usebottles.bottles" # wine containers
+        "de.capypara.FieldMonitor" # libvirt
+        "de.haeckerfelix.Fragments" # torrents
+        "io.github.amit9838.mousam" # weather
+        "io.github.lainsce.Khronos" # log time for tasks
+        "io.gitlab.news_flash.NewsFlash" # rss reader
+        "me.iepure.devtoolbox" # some cool utils
+        "org.nicotine_plus.Nicotine" # soulseek
       ];
     overrides = let
       homeNoNetwork = {
diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix
index 7fa1b9c..f3cc57a 100644
--- a/hosts/dunamis/users/user/programs.nix
+++ b/hosts/dunamis/users/user/programs.nix
@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf;
+in {
   console.yazi.enable = true;
   editor.helix.enable = true;
   shell = {
@@ -6,10 +13,10 @@
     oh-my-posh.enable = true;
   };
   syncthing.enable = true;
-  terminal.wezterm.enable = true;
+  # terminal.wezterm.enable = true;
   terminal.ghostty.enable = true;
   systemd.user.settings.Manager.DefaultEnvironment = {
-    TERMINAL = "wezterm";
+    TERMINAL = "ghostty";
   };
 
   services = {
@@ -23,8 +30,8 @@
       enable = true;
       settings.update_ms = 200;
     };
-    direnv.enable = true;
-    direnv.silent = true;
+    # direnv.enable = true;
+    # direnv.silent = true;
     eza.enable = true; # ls in rust
     fd.enable = true; # find in rust
     fzf.enable = true; # fuzzy finder in rust
@@ -58,19 +65,19 @@
       # development utils
       alejandra # nix formatter in rust
       # devenv # programming deps in rust
-      jj-fzf # fuzzy finder jujutsu tui
+      (mkIf config.programs.jujutsu.enable jj-fzf) # fuzzy finder jujutsu tui
       just # make in rust
       silicon # create code pics in rust
     ]
     ++ [
       # console utils
-      bluetuith # bluetooth tui in go
+      # bluetuith # bluetooth tui in go
       dua # disk space usage in rust
       duf # better df in go
       fend # calculator in rust
       mprocs # process runner in rust
       ouch # archive manager in rust
-      procs # ps in rust
+      # procs # ps in rust
       rbw # bitwarden cli in rust
       sd # sed in rust
       systemctl-tui # systemctl tui in rust
@@ -78,6 +85,7 @@
     ]
     ++ [
       # misc apps
+      adwaita-icon-theme
       # vial # qmk keyboard configuring app
       pinentry-qt # pinentry for rbw
       virt-manager # libvirt gui