add bunch programs & switch to standalone HM

5 files changed, 22 insertions, 6 deletions

diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix
index f8b1297..38d503f 100644
--- a/common/modules/mango/default.nix
+++ b/common/modules/mango/default.nix
@@ -397,12 +397,12 @@ in
             ${lib.optionalString (config.services.picom.enable) ''
               systemctl --user stop picom.service
             ''}
-	    gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 &
-	    swww-daemon -q &
+            gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 &
+            swww-daemon -q &
           '';
         };
         home.packages = with pkgs; [
-	  swww
+          swww
           wl-clipboard-rs
           wl-clip-persist
         ];
diff --git a/flake.nix b/flake.nix
index 100ac9a..484b259 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,7 +43,7 @@
           merge = builtins.foldl' nixpkgs.lib.recursiveUpdate { };
         in
         merge [
-          (mkSystemWithHMasModule {
+          (mkSystemWithHM {
             user = "bee";
             hostname = "nixios";
             system = "x86_64-linux";
diff --git a/hosts/common.nix b/hosts/common.nix
index e5efde1..87249ea 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -220,6 +220,10 @@
 
   environment.systemPackages = with pkgs; [
     android-tools
+    playerctl
+    imagemagick
+    pavucontrol
+    bluetui
     sops
   ];
 
diff --git a/users/bee/default.nix b/users/bee/default.nix
index b684588..15d8328 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -18,8 +18,9 @@
 
   beeMods = {
     mango.enable = true;
+    mango.waybar = true;
     # beeVim.enable = false;
-    matugen.enable = false;
+    matugen.enable = true;
     terminal = {
       foot = true;
     };
@@ -36,5 +37,7 @@
 
   programs.home-manager.enable = true;
 
+  services.mpris-proxy.enable = true;
+
   home.stateVersion = systemState; # check flake.nix
 }
diff --git a/users/common.nix b/users/common.nix
index 0c179c4..9f1e505 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -90,7 +90,16 @@
   programs.yazi.enable = true;
 
   home.packages = with pkgs; [
-    vim
+    neovim
     nautilus
+    opencode
+    totem
+    imv
+    gnome-calculator
+    papers
+    cava
+    (pkgs.obsidian.override {
+      electron = pkgs.electron_40;
+    })
   ];
 }