1769288238

modules/users/user/programs.nix

@@ -11,8 +11,16 @@
   inherit (osConfig.virtualisation) libvirtd;
   inherit (osConfig.hardware) bluetooth;
 in {
-  imports = with flake.homeModules; [
-    programs
+  imports = with flake.modules.homePrograms; [
+    atuin
+    direnv
+    fish
+    helix
+    oh-my-posh
+    syncthing
+    wezterm
+    wl-kbptr
+    yazi
   ];
 
   systemd.user.settings.Manager.DefaultEnvironment = {
@@ -31,16 +39,6 @@ in {
   programs =
     lib.attrsets.recursiveUpdate
     {
-      atuin.enable = true;
-      fish.enable = true; # friendly interactive shell in rust
-      oh-my-posh.enable = true;
-
-      helix.enable = true;
-      yazi.enable = true;
-
-      wezterm.enable = true;
-      ghostty.enable = true;
-
       bat.enable = true; # cat in rust
       btop.enable = true;
       # direnv.enable = true;
@@ -75,6 +73,7 @@ in {
       git.signing.format = "ssh";
       git.settings.alias.cl = "clone";
       git.settings.alias.co = "checkout";
+      git.settings.sequence.editor = lib.getExe pkgs.git-interactive-rebase-tool;
 
       keychain.keys = ["id_ed25519"];
 
@@ -115,7 +114,10 @@ in {
       systemctl-tui # systemctl tui in rust
       trashy # trash cli in rust
       up # ultimate plumber in go
-
+      wiremix # pavucontrol for wireplumber in rust
+    ]
+    ++ [
+      # various wrappers
       (perSystem.mypackages.prismlauncher-bwrapped.override {
         addPkgs = with pkgs; [mangohud gamemode gamescope glfw3-minecraft];
         packageOverrides = {
@@ -128,26 +130,14 @@ in {
         };
       })
       (perSystem.mypackages.zen-browser-bwrapped.override {
-        bwrapperOpts = {
-          sockets.x11 = false;
-        };
+        bwrapperOpts.sockets.x11 = false;
       })
       (perSystem.mypackages.legcord-bwrapped.override {
-        bwrapperOpts = {
-          sockets.x11 = false;
-        };
+        bwrapperOpts.sockets.x11 = false;
       })
       (perSystem.mypackages.helium-browser-bwrapped.override {
-        bwrapperOpts = {
-          sockets.x11 = false;
-          mounts.readWrite = [
-            # "$XDG_DOCUMENTS_DIR"
-            "$XDG_DOWNLOAD_DIR"
-            # "$XDG_MUSIC_DIR"
-            # "$XDG_VIDEOS_DIR"
-            # "$XDG_PICTURES_DIR"
-          ];
-        };
+        bwrapperOpts.sockets.x11 = false;
+        bwrapperOpts.mounts.readWrite = ["$XDG_DOWNLOAD_DIR"];
       })
       (pkgs.mkBwrapper rec {
         app = {
@@ -197,6 +187,19 @@ in {
         runtimeInputs = with pkgs; [rbw wl-clipboard];
         text = ''rbw get --clipboard "$1" && sleep 5 && wl-copy -c'';
       })
+      (pkgs.writeShellApplication {
+        name = "bw-get";
+        runtimeInputs = with pkgs; [bitwarden-cli jq wl-clipboard csvlens];
+        text = ''
+          bw get item \
+          "$(bw list items \
+            | jq -r '["name","user","id"], (.[] | [(.name), (.login.username), (.id)]) | @csv' \
+            | csvlens)" \
+          | jq -r '.login.password' \
+          | wl-copy \
+          && sleep 5 && wl-copy -c
+        '';
+      })
       (pkgs.writeShellApplication {
         name = "rbw-totp";
         runtimeInputs = with pkgs; [rbw wl-clipboard];
@@ -207,7 +210,7 @@ in {
       # misc apps
       adwaita-icon-theme
       # vial # qmk keyboard configuring app
-      pinentry-qt # pinentry for rbw
+      pinentry-gnome3 # pinentry for rbw
       (mkIf libvirtd.enable virt-manager) # libvirt gui
       # waycheck # check wayland protocols
       gpu-screen-recorder-gtk
@@ -218,10 +221,10 @@ in {
       # gnome-text-editor
       helvum # pipewire patchbay in rust
       # junction # app chooser
-      mission-center # task manager in rust (partly)
-      (mkIf bluetooth.enable overskride) # bluetooth gui in rust
+      # mission-center # task manager in rust (partly)
+      # (mkIf bluetooth.enable overskride) # bluetooth gui in rust
       pika-backup # borg gui in rust
-      pwvucontrol # pipewire gui in rust
+      # pwvucontrol # pipewire gui in rust
       perSystem.zmx.default
       # sonusmix # pipewire routing tool in rust
     ];