sorta refactor

modules/users/user/flatpak.nix

@@ -36,11 +36,6 @@
         "org.kde.kdenlive" # video editor
         {
           appId = "com.collabora.Office";
-          bundle = builtins.fetchurl {
-            url = "https://cdn.collaboraoffice.com/collaboraoffice-v25.04.7.2_final.flatpak";
-            name = "collaboraoffice-v25.04.7.2_final.flatpak";
-            sha256 = "RHEXrlymoWnNmdVEzVh85/icxQsWVpLpgkJubi7SpsY=";
-          };
         }
       ]
       ++ [

modules/users/user/programs.nix

@@ -1,9 +1,9 @@
 {
   config,
-  inputs,
   lib,
   osConfig,
   perSystem,
+  flake,
   pkgs,
   ...
 }: let
@@ -11,22 +11,19 @@
   inherit (osConfig.virtualisation) libvirtd;
   inherit (osConfig.hardware) bluetooth;
 in {
-  imports = [
-    inputs.vicinae.homeManagerModules.default
-  ];
-
-  services.vicinae.enable = true;
-
-  console.yazi.enable = true;
-  editor.helix.enable = true;
-  shell = {
-    fish.enable = true;
-    oh-my-posh.enable = true;
-  };
+  imports = with flake.modules.hm-programs;
+    [
+      yazi
+      helix
+      fish
+      oh-my-posh
+      wezterm
+      ghostty
+    ]
+    ++ [./vicinae.nix];
 
   syncthing.enable = true;
-  terminal.wezterm.enable = true;
-  terminal.ghostty.enable = true;
+
   systemd.user.settings.Manager.DefaultEnvironment = {
     TERMINAL = "wezterm";
     HISTFILE = ''"$XDG_STATE_HOME"/bash/history'';
@@ -37,7 +34,7 @@ in {
     NUGET_PACKAGES = ''"$XDG_CACHE_HOME"/NuGetPackages'';
     NPM_CONFIG_INIT_MODULE = ''"$XDG_CONFIG_HOME"/npm/config/npm-init.js'';
     NPM_CONFIG_CACHE = ''"$XDG_CACHE_HOME"/npm'';
-    NPM_CONFIG_TMP = ''"$XDG_RUNTIME_DIR"/npm'';
+    # NPM_CONFIG_TMP = ''"$XDG_RUNTIME_DIR"/npm'';
   };
 
   services = {
@@ -153,8 +150,6 @@ in {
       # sonusmix # pipewire routing tool in rust
     ];
 
-  xdg.configFile."vicinae/vicinae.json".enable = false;
-
   # xdg.desktopEntries.uni = {
   #   actions."Copy".exec = "fish -c \"~/.local/bin/uni --copy\"";
   #   categories = ["Utility" "X-Launch" "Network"];

modules/users/user/vicinae.nix

@@ -0,0 +1,7 @@
+{inputs, ...}: {
+  imports = [inputs.vicinae.homeManagerModules.default];
+
+  services.vicinae.enable = true;
+
+  xdg.configFile."vicinae/vicinae.json".enable = false;
+}