From 6906e45f0e8d62a2b3ff6ca23786a937a5dd78e1 Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotip.com>
Date: Wed, 25 Jan 2023 12:25:38 -0800
Subject: [PATCH] hmm

---
 users/jsutter.nix | 146 ++++++++++++++++++++++++----------------------
 1 file changed, 76 insertions(+), 70 deletions(-)

diff --git a/users/jsutter.nix b/users/jsutter.nix
index 548fc05..9122b21 100644
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -54,81 +54,87 @@ in
   # Zerotier
   services.zerotierone.joinNetworks = [ "b15644912e748585" ];
   services.zerotierone.enable= true;
-  home-manager.users.jsutter = {
-    home.username = "jsutter";
-    home.homeDirectory = "/home/jsutter";
-    programs.home-manager.enable = true;
-    home.stateVersion = "22.11";
+  
+  #Everything below is home manager managed:
+  home-manager = {
+  	useUserPackages = true;
+    useGlobalPackages = true;
+    users.jsutter = {
+      home.username = "jsutter";
+      home.homeDirectory = "/home/jsutter";
+      programs.home-manager.enable = true;
+      home.stateVersion = "22.11";
 
-  # Git Configuration
-    programs.git = {
-    enable = true;
-    userName  = "Julian Sutter";
-    userEmail = "jsutter@symbiotip.com";
-    };
-    dconf.settings = {
-      "org/gnome/mutter" = {
-        experimental-features = [ "scale-monitor-framebuffer" ];
-      };
-    };
-
-  # Firefox
-    programs.firefox = {
+    # Git Configuration
+      programs.git = {
       enable = true;
-        package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
-          extraPolicies = {
-              CaptivePortal = false;
-              DisableFirefoxStudies = true;
-              DisablePocket = true;
-              DisableTelemetry = true;
-              DisableFirefoxAccounts = false;
-              NoDefaultBookmarks = true;
-              OfferToSaveLogins = false;
-              OfferToSaveLoginsDefault = false;
-              PasswordManagerEnabled = false;
-              FirefoxHome = {
-                  Search = true;
-                  Pocket = false;
-                  Snippets = false;
-                  TopSites = false;
-                  Highlights = false;
-              };
-              UserMessaging = {
-                  ExtensionRecommendations = false;
-                  SkipOnboarding = true;
-              };
-          };
+      userName  = "Julian Sutter";
+      userEmail = "jsutter@symbiotip.com";
       };
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-          ublock-origin
-          privacy-badger
-          bitwarden
-          clearurls
-          decentraleyes
-          ghostery
-          privacy-redirect
-          privacy-badger
-          disconnect
-        ];
-        profiles = {
-          jsutter = {
-            id = 0;
-            name = "jsutter";
-            settings = {
-              "general.smoothScroll" = true;
+      dconf.settings = {
+        "org/gnome/mutter" = {
+          experimental-features = [ "scale-monitor-framebuffer" ];
+        };
+      };
+
+    # Firefox
+      programs.firefox = {
+        enable = true;
+          package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
+            extraPolicies = {
+                CaptivePortal = false;
+                DisableFirefoxStudies = true;
+                DisablePocket = true;
+                DisableTelemetry = true;
+                DisableFirefoxAccounts = false;
+                NoDefaultBookmarks = true;
+                OfferToSaveLogins = false;
+                OfferToSaveLoginsDefault = false;
+                PasswordManagerEnabled = false;
+                FirefoxHome = {
+                    Search = true;
+                    Pocket = false;
+                    Snippets = false;
+                    TopSites = false;
+                    Highlights = false;
+                };
+                UserMessaging = {
+                    ExtensionRecommendations = false;
+                    SkipOnboarding = true;
+                };
             };
-            extraConfig = ''
-              user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
-              user_pref("full-screen-api.ignore-widgets", true);
-              user_pref("media.ffmpeg.vaapi.enabled", true);
-              user_pref("media.rdd-vpx.enabled", true);
-            '';
-        userChrome = ''
-          @import "firefox-gnome-theme/userChrome.css";
-          @import "firefox-gnome-theme/theme/colors/dark.css"; 
-        '';
+        };
+          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+            ublock-origin
+            privacy-badger
+            bitwarden
+            clearurls
+            decentraleyes
+            ghostery
+            privacy-redirect
+            privacy-badger
+            disconnect
+          ];
+          profiles = {
+            jsutter = {
+              id = 0;
+              name = "jsutter";
+              settings = {
+                "general.smoothScroll" = true;
+              };
+              extraConfig = ''
+                user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
+                user_pref("full-screen-api.ignore-widgets", true);
+                user_pref("media.ffmpeg.vaapi.enabled", true);
+                user_pref("media.rdd-vpx.enabled", true);
+              '';
+          userChrome = ''
+            @import "firefox-gnome-theme/userChrome.css";
+            @import "firefox-gnome-theme/theme/colors/dark.css"; 
+          '';
+          };
         };
       };
     };
   };
-}
+}
\ No newline at end of file