From e71a5101636b9358db1daaca55502cf30b937b10 Mon Sep 17 00:00:00 2001
From: Joshua Yuen <joshuayuen99@gmail.com>
Date: Fri, 11 Sep 2026 23:50:10 -0400
Subject: [PATCH] Consolidate firefox to be owned by HM

Move Nix settings to system-level only

Dedupe user packages
---
 homes/josh/home.nix       | 30 ++++++------------------------
 modules/core/default.nix  |  1 -
 modules/core/firefox.nix  | 22 ----------------------
 modules/core/packages.nix | 13 -------------
 modules/core/system.nix   | 14 ++++++++++++++
 5 files changed, 20 insertions(+), 60 deletions(-)
 delete mode 100644 modules/core/firefox.nix

diff --git a/homes/josh/home.nix b/homes/josh/home.nix
index e59e2ef..f4097df 100644
--- a/homes/josh/home.nix
+++ b/homes/josh/home.nix
@@ -3,10 +3,12 @@
   lib,
   pkgs,
   profile,
+  username,
   ...
 }:
 with lib;
-let gpgCfg = config.modules.gpg;
+let
+  gpgCfg = config.modules.gpg;
 in
 {
   imports = [
@@ -19,8 +21,8 @@ in
   modules.shell.defaultShell = "zsh";
 
   home = {
-    username = "josh";
-    homeDirectory = "/home/josh";
+    inherit username;
+    homeDirectory = "/home/${username}";
     stateVersion = "25.11";
 
     packages = with pkgs; [
@@ -50,24 +52,4 @@ in
 
   # Let Home Manager install and manage itself
   programs.home-manager.enable = true;
-
-  nix = {
-    package = mkDefault pkgs.nix;
-    settings = {
-      allowed-users = [ "josh" ];
-      trusted-users = [ "root" "@wheel" "josh" ];
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      extra-substituters = [
-        "https://walker.cachix.org"
-        "https://walker-git.cachix.org"
-      ];
-      extra-trusted-public-keys = [
-        "walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM="
-        "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
-      ];
-    };
-  };
-}
\ No newline at end of file
+}
diff --git a/modules/core/default.nix b/modules/core/default.nix
index dec05b5..2e865b1 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -4,7 +4,6 @@
 {
   imports = [
     ./boot.nix
-    ./firefox.nix
     ./fonts.nix
     ./gdm.nix
     ./gnomeBoxes.nix
diff --git a/modules/core/firefox.nix b/modules/core/firefox.nix
deleted file mode 100644
index 068e5b5..0000000
--- a/modules/core/firefox.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib;
-let
-  pipewireCfg = config.modules.pipewire;
-in
-{
-  # Add wayland screensharing support if PipeWire is enabled
-  environment.systemPackages =
-    with pkgs;
-    [ ]
-    ++ (
-      if pipewireCfg.enable then
-        [ (wrapFirefox (firefox-unwrapped.override { pipewireSupport = true; }) { }) ]
-      else
-        [ firefox ]
-    );
-}
diff --git a/modules/core/packages.nix b/modules/core/packages.nix
index 456f479..222a3db 100644
--- a/modules/core/packages.nix
+++ b/modules/core/packages.nix
@@ -1,18 +1,5 @@
 {
-  pkgs,
   ...
 }:
 {
-  programs = {
-
-  };
-
-  environment.systemPackages = with pkgs; [
-    git
-    home-manager
-    tldr
-    tmux
-    vim-full
-    wl-clipboard
-  ];
 }
diff --git a/modules/core/system.nix b/modules/core/system.nix
index a998a30..4c39d43 100644
--- a/modules/core/system.nix
+++ b/modules/core/system.nix
@@ -1,5 +1,6 @@
 {
   config,
+  username,
   ...
 }:
 let
@@ -8,10 +9,23 @@ in
 {
   nix = {
     settings = {
+      allowed-users = [ username ];
+      trusted-users = [
+        "@wheel"
+        username
+      ];
       experimental-features = [
         "nix-command"
         "flakes"
       ];
+      extra-substituters = [
+        "https://walker.cachix.org"
+        "https://walker-git.cachix.org"
+      ];
+      extra-trusted-public-keys = [
+        "walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM="
+        "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
+      ];
     };
   };