added NxACE (untested)

home.nix

@@ -1,66 +1,59 @@
-{ config, pkgs, lib, system, inputs, host, user, allowed, secrets, ... }:
+{ config, pkgs, pkgs-unstable, lib, system, inputs, host, user, allowed, secrets, ... }:
 {
   imports = [
     ./home-modules/vscode.nix
     ./home-modules/discord.nix
     ./home-modules/chatterino.nix
-    # ./home-modules/meli/meli.nix
     ./home-modules/email.nix
     ./home-modules/bitwarden.nix
     ./home-modules/office.nix
     ./home-modules/virt-manager.nix
 
-    # ./home-modules/mutt/neomutt.nix
     ./home-modules/gestures.nix
     
-    ./home-modules/pnx/pnx.nix
-    # ./home-modules/hsmw.nix
+    ./home-modules/pnx.nix
     
     ./home-modules/hyprland.nix
     ./home-modules/hyprland-autoname-workspaces.nix
     ./home-modules/waybar.nix
+    ./home-modules/nx-gcal-event.nix
     ./home-modules/wlogout.nix
     ./home-modules/rofi.nix
     
     ./home-modules/kitty.nix
-    ./home-modules/shell/fish.nix
-    ./home-modules/shell/starship.nix
-    # ./home-modules/nixvim.nix
+    ./home-modules/fish.nix
+    ./home-modules/starship.nix
     ./home-modules/nvim.nix
-    ./home-modules/shell/yazi.nix
-    ./home-modules/shell/zoxide.nix
-    ./home-modules/shell/nh.nix
+    ./home-modules/yazi.nix
+    ./home-modules/zoxide.nix
+    ./home-modules/nh.nix
     
     ./home-modules/ssh.nix
     ./home-modules/git.nix
     ./home-modules/mako.nix
     
-    ./home-modules/theme/gtk.nix
-    ./home-modules/theme/qt.nix
+    ./home-modules/gtk.nix
+    ./home-modules/qt.nix
 
     ./home-modules/latex.nix
     ./home-modules/python.nix
   ];
-  home.username = "nx2";
-  home.homeDirectory = "/home/nx2";
+  home.username = user;
+  home.homeDirectory = "/home/${user}";
   home.stateVersion = "23.11";
   nixpkgs.config = {
     allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) allowed.unfree-packages;
     permittedInsecurePackages = allowed.inecure-packages;
   };
   home.packages = with pkgs; [
-    firefox chromium chatterino2
-    gimp inkscape
-    kitty
+    # firefox
+    chromium 
+    
     zathura 
-    element-desktop
-    zoom-us
-    discord
-    signal-desktop
     xfce.thunar
     
-    obsidian
-    spotify spicetify-cli
+    spotify 
+    spicetify-cli
     obs-studio
     
     waybar swww playerctl
@@ -69,7 +62,7 @@
     pavucontrol fontpreview gtk2fontsel
     lynx bat du-dust eza neofetch tldr fzf figlet ripgrep lolcat jq glow
     brightnessctl wev 
-    element sssnake pipes
+    sssnake pipes
     dig
 
     gnumake
@@ -79,7 +72,18 @@
 
     glib
     gsettings-desktop-schemas
-  ];
+  ] ++ (with pkgs-unstable; [
+    firefox
+  ]) ++ (if host != "NxACE" then (with pkgs; [
+    signal-desktop
+    obsidian
+    element-desktop
+    zoom-us
+    gimp 
+    inkscape
+  ]) else (with pkgs; [
+
+  ]));
 
   xdg = {
     enable = true;