From 37d57cdfb5cad48e2e8f911455a0e74185644161 Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Mon, 28 Apr 2025 16:53:28 +0300
Subject: [PATCH] user/programs: refactor

Signed-off-by: unexplrd <unexplrd@linerds.us>
---
 hosts/dunamis/users/user/flatpak.nix  |  3 +-
 hosts/dunamis/users/user/programs.nix | 56 +++++++++++++++------------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/hosts/dunamis/users/user/flatpak.nix b/hosts/dunamis/users/user/flatpak.nix
index 142347f..b55e5a6 100644
--- a/hosts/dunamis/users/user/flatpak.nix
+++ b/hosts/dunamis/users/user/flatpak.nix
@@ -1,11 +1,12 @@
 {
-  lib,
   inputs,
+  pkgs,
   ...
 }: {
   imports = with inputs; [
     nix-flatpak.homeManagerModules.nix-flatpak
   ];
+  home.packages = with pkgs; [flatpak];
   services.flatpak = {
     enable = true;
     uninstallUnmanaged = true;
diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix
index 9b3eb65..f51c13b 100644
--- a/hosts/dunamis/users/user/programs.nix
+++ b/hosts/dunamis/users/user/programs.nix
@@ -8,6 +8,9 @@
   syncthing.enable = true;
   terminal.wezterm.enable = true;
   terminal.ghostty.enable = true;
+  systemd.user.settings.Manager.DefaultEnvironment = {
+    TERMINAL = "ghostty";
+  };
 
   services = {
     pueue.enable = true; # process queue in rust
@@ -49,30 +52,35 @@
     zoxide.enable = true; # fuzzy cd in rust
   };
 
-  home.packages = with pkgs; [
-    alejandra # nix formatter in rust
-    bluetuith # bluetooth tui in go
-    devenv # programming deps in rust
-    dua # disk space usage in rust
-    duf # better df in go
-    fend # calculator in rust
-    flatpak # flatpak cli
-    jj-fzf # fuzzy finder jujutsu tui
-    just # make in rust
-    mprocs # process runner in rust
-    ouch # archive manager in rust
-    overskride # bluetooth gui in rust
-    pika-backup # borg gui in rust
-    pinentry-qt # pinentry for rbw
-    procs # ps in rust
-    rbw # bitwarden cli in rust
-    sd # sed in rust
-    silicon # create code pics in rust
-    trashy # trash cli in rust
-    # vial # qmk keyboard configuring app
-    virt-manager # libvirt gui
-    waycheck # check wayland protocols
-  ];
+  home.packages = with pkgs;
+    [
+      # development utils
+      alejandra # nix formatter in rust
+      devenv # programming deps in rust
+      jj-fzf # fuzzy finder jujutsu tui
+      just # make in rust
+      silicon # create code pics in rust
+    ]
+    ++ [
+      # console utils
+      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
+      rbw # bitwarden cli in rust
+      sd # sed in rust
+      trashy # trash cli in rust
+    ]
+    ++ [
+      # misc apps
+      # vial # qmk keyboard configuring app
+      pinentry-qt # pinentry for rbw
+      virt-manager # libvirt gui
+      waycheck # check wayland protocols
+    ];
 
   xdg.desktopEntries = {
     uni = {