Installation script confirmed working for laptop flake, re-adding waybar. Also moved firefox to programs folder

hosts/installer/default.nix

@@ -57,7 +57,7 @@ let
 		rm -rf /mnt/etc/nixos
 		ln -s /mnt/home/pagedmov/.sysflake /etc/nixos
 
-		nixos-enter <<HEREDOC
+		nixos-enter <<-HEREDOC
 		chown -R pagedmov /home/pagedmov/.sysflake
 		nixos-generate-config --show-hardware-config > /home/pagedmov/.sysflake/hosts/laptop/hardware.nix
 		NIXOS_SWITCH_USE_DIRTY_ENV=1 nixos-rebuild boot --flake /home/pagedmov/.sysflake#mercury
@@ -135,22 +135,14 @@ in
 
     shellAliases = {
       grep = "grep --color=auto";
-      yazi = "y";
       vi = "nvim";
       mv = "mv -v";
       cp = "cp -vr";
-      gt = "gtrash";
-      gtp = "gtrash put";
-      grub-update = "sudo grub-mkconfig -o /boot/grub/grub.cfg";
-      sr = "source ~/.zshrc";
       ".." = "cd ..";
-      rm = "echo 'use \"gtp\" instead'";
       psg = "ps aux | grep -v grep | grep -i -e VSZ -e";
       mkdir = "mkdir -p";
       pk = "pkill -9 -f";
-      svcu = "systemctl --user";
       svc = "sudo systemctl";
-      viflake = "nvim flake.nix";
     };
 		promptInit = ''
       bindkey -v

modules/home/default.nix

@@ -11,9 +11,7 @@
 
 let
 	desktop_modules = if (host == "onagesson") then
-		[(import ./programs/steam.nix)]
+		[(import ./programs/steam.nix)] else [];
-    ++ [(import ./waybar)] else
-		[];
 in
 {
   imports =
@@ -28,12 +26,13 @@ in
     ++ [(import ./programs/git.nix)]
     ++ [(import ./programs/password-store.nix)]
     ++ [(import ./programs/autojump.nix)]
+    ++ [(import ./programs/firefox.nix)]
     ++ [(import ./environment/gtk.nix)]
     ++ [(import ./environment/spicetify.nix)]
     ++ [(import ./environment/starship.nix)]
     ++ [(import ./environment/desktop_userpkgs.nix)]
     ++ [(import ./environment/zshell.nix)]
-    ++ [(import ./firefox/firefox.nix)]
+    ++ [(import ./waybar)]
     ++ [(import ./hyprland)]
     ++ [(import ./scripts)]
     ++ [(import ./swaync/swaync.nix)]

modules/home/firefox/firefox.nix

@@ -1,127 +0,0 @@
-{
-  nur,
-  username,
-  self,
-  ...
-}: {
-  programs.firefox = {
-    enable = true;
-    policies = {
-      DisableTelemetry = true;
-      DisableFirefoxStudies = true;
-      EnableTrackingProtection = {
-        Value = true;
-        Locked = true;
-        Cryptomining = true;
-        Fingerprinting = true;
-      };
-      DisablePocket = true;
-      DisableFirefoxAccounts = true;
-      DisableAccounts = true;
-      DisableFirefoxScreenshots = true;
-      OverrideFirstRunPage = "";
-      OverridePostUpdatePage = "";
-      DontCheckDefaultBrowser = true;
-      DisplayBookmarksToolbar = "always"; # alternatives: "always" or "newtab"
-      DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
-      SearchBar = "unified"; # alternative: "separate"		isDefault = true;
-    };
-    profiles.${username} = {
-      name = "${username}";
-      bookmarks = [
-        {
-          name = "Nix Sites";
-          toolbar = true;
-          bookmarks = [
-            {
-              name = "NixOS Wiki";
-              url = "https://nixos.wiki/wiki/Main_Page";
-            }
-            {
-              name = "Nixpkgs Reference Manual";
-              url = "https://nixos.org/manual/nixpkgs/stable/";
-            }
-            {
-              name = "NixOS Manual";
-              url = "https://nixos.org/manual/nixos/stable/";
-            }
-            {
-              name = "NixOS Options";
-              url = "https://search.nixos.org/options";
-            }
-            {
-              name = "Home Manager Options";
-              url = "https://home-manager-options.extranix.com/";
-            }
-            {
-              name = "Nixpkgs Package Search";
-              url = "https://search.nixos.org/packages";
-            }
-            {
-              name = "Noogle - Nixpkgs Function Docs";
-              url = "https://noogle.dev";
-            }
-            {
-              name = "Nixvim Docs";
-              url = "https://nix-community.github.io/nixvim/";
-            }
-          ];
-        }
-        {
-          name = "Rust Manual";
-          url = "https://doc.rust-lang.org/book/ch01-03-hello-cargo.html";
-        }
-        {
-          name = "ChatGPT";
-          url = "https://chatgpt.com/";
-        }
-        {
-          name = "DataAnnotation";
-          url = "https://app.dataannotation.tech/users/sign_in";
-        }
-        {
-          name = "Nerd Fonts Cheatsheet";
-          url = "https://www.nerdfonts.com/cheat-sheet";
-        }
-      ];
-      extensions = with nur.repos.rycee.firefox-addons; [
-        darkreader
-        adnauseam
-        cookie-autodelete
-        disconnect
-        firefox-color
-        vimium
-        firenvim
-        privacy-badger
-        new-tab-override
-      ];
-      extraConfig = ''
-         "browser.startup.homepage" = "${self}/glasshouse-desktop/home/firefox/homepage.html";
-         "browser.active_color" = "#EE0000";
-         "browser.active_color.dark" = "#FF6666";
-         "browser.anchor_color" = "#0000EE";
-         "browser.anchor_color.dark" = "#8C8CFF";
-         "browser.display.background_color" = "#FFFFFF";
-         "browser.display.background_color.dark" = "#1C1B22";
-         "browser.display.document_color_use" = "1";
-         "browser.display.foreground_color" = "#000000";
-         "browser.display.foreground_color.dark" = "#FBFBFE";
-         "browser.display.suppress_canvas_background_image_on_forced_colors" = "true";
-         "browser.display.use_system_colors" = "false";
-         "browser.newtabpage.activity-stream.newNewtabExperience.colors" = "#0090ED,#FF4F5F,#2AC3A2,#FF7139,#A172FF,#FFA437,#FF2A8A";
-         "browser.theme.colorway-closet" = "true";
-         "browser.theme.colorway-migration" = "true";
-         "browser.theme.windows.accent-color-in-tabs.enabled" = "false";
-         "browser.visited_color" = "#551A8B";
-         "browser.visited_color.dark" = "#FFADFF";
-         "browser.newtabpage.pinned" = [{
-        title = "Homepage";
-        url = "${self}/glasshouse-desktop/home/firefox/homepage.html";
-         }];
-         "devtools.defaultColorUnit" = "authored";
-         "editor.background_color" = "#FFFFFF";
-         "editor.use_custom_colors" = "false";
-      '';
-    };
-  };
-}

modules/home/programs/firefox.nix

@@ -1,6 +1,8 @@
 {
   nur,
   username,
+  self,
+  ...
 }: {
   programs.firefox = {
     enable = true;
@@ -28,9 +30,21 @@
       name = "${username}";
       bookmarks = [
         {
-          name = "Nix sites";
+          name = "Nix Sites";
           toolbar = true;
           bookmarks = [
+            {
+              name = "NixOS Wiki";
+              url = "https://nixos.wiki/wiki/Main_Page";
+            }
+            {
+              name = "Nixpkgs Reference Manual";
+              url = "https://nixos.org/manual/nixpkgs/stable/";
+            }
+            {
+              name = "NixOS Manual";
+              url = "https://nixos.org/manual/nixos/stable/";
+            }
             {
               name = "NixOS Options";
               url = "https://search.nixos.org/options";
@@ -39,26 +53,18 @@
               name = "Home Manager Options";
               url = "https://home-manager-options.extranix.com/";
             }
+            {
+              name = "Nixpkgs Package Search";
+              url = "https://search.nixos.org/packages";
+            }
+            {
+              name = "Noogle - Nixpkgs Function Docs";
+              url = "https://noogle.dev";
+            }
             {
               name = "Nixvim Docs";
               url = "https://nix-community.github.io/nixvim/";
             }
-            {
-              name = "Noogle";
-              url = "https://noogle.dev/";
-            }
-            {
-              name = "NixOS Wiki";
-              url = "https://nixos.wiki/";
-            }
-            {
-              name = "NixOS Manual";
-              url = "https://nixos.org/manual/nixos/stable";
-            }
-            {
-              name = "Nixpkgs Reference";
-              url = "https://nixos.org/manual/nixpkgs/stable";
-            }
           ];
         }
         {
@@ -88,7 +94,6 @@
         firenvim
         privacy-badger
         new-tab-override
-        tampermonkey
       ];
       extraConfig = ''
          "browser.startup.homepage" = "${self}/glasshouse-desktop/home/firefox/homepage.html";