Gen 441: Extra firefox tweaks and organized the scripts folder

flake.lock

@@ -825,11 +825,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1728769516,
+        "lastModified": 1728792359,
-        "narHash": "sha256-pAN1uxvHwCVU6gNiNxI08BKM8+feS3rSLqbECkHp9LI=",
+        "narHash": "sha256-aXIK4Tat912rwK01FLeOoE0rrbZD8Q+KJb/SgW1WHUc=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2783ec9ab9ea630d8f7657bee76cef81e0c125e6",
+        "rev": "120a1adeb88d528d494bb0bad3572683716ff03d",
         "type": "github"
       },
       "original": {

glasshouse-desktop/home/default.nix

@@ -2,21 +2,21 @@
 
 {
 	imports = 
-		[ (import ./btop.nix) 	      ]
+		[ (import ./btop.nix) 	         ]
-	 ++ [ (import ./bat.nix) 	      ]
+	 ++ [ (import ./bat.nix) 	         ]
-	 ++ [ (import ./firefox.nix) 	  ]
+	 ++ [ (import ./firefox/firefox.nix) ]
-	 ++ [ (import ./cava.nix) 	      ]
+	 ++ [ (import ./cava.nix) 	         ]
-	 ++ [ (import ./fuzzel.nix)       ]
+	 ++ [ (import ./fuzzel.nix)          ]
-	 ++ [ (import ./gtk.nix) 	      ]
+	 ++ [ (import ./gtk.nix) 	         ]
-	 ++ [ (import ./hyprland)         ]
+	 ++ [ (import ./hyprland)            ]
-	 ++ [ (import ./kitty.nix)        ]
+	 ++ [ (import ./kitty.nix)           ]
-	 ++ [ (import ./spicetify.nix)    ]
+	 ++ [ (import ./spicetify.nix)       ]
-	 ++ [ (import ./starship.nix)     ]
+	 ++ [ (import ./starship.nix)        ]
-	 ++ [ (import ./scripts)     	  ]
+	 ++ [ (import ./scripts)     	     ]
-	 ++ [ (import ./yazi.nix)         ]
+	 ++ [ (import ./yazi.nix)            ]
-	 ++ [ (import ./swaync/swaync.nix)]
+	 ++ [ (import ./swaync/swaync.nix)   ]
-	 ++ [ (import ./userpkgs.nix)     ]
+	 ++ [ (import ./userpkgs.nix)        ]
-	 ++ [ (import ./waybar) 	      ]
+	 ++ [ (import ./waybar) 	         ]
-	 ++ [ (import ./eza.nix) 	      ]
+	 ++ [ (import ./eza.nix) 	         ]
-	 ++ [ (import ./zshell.nix)       ];
+	 ++ [ (import ./zshell.nix)          ];
 }

glasshouse-desktop/home/firefox.nix

@@ -1,47 +0,0 @@
-{ nur, username, ... }:
-
-{
-	programs.firefox = {
-		enable = true;
-		profiles.${username} = {
-			name = "${username}";
-			isDefault = true;
-			bookmarks = [
-				{ name = "NixOS Options";
-					url = "https://search.nixos.org/options";
-				}
-				{ name = "Home Manager Options";
-					url = "https://home-manager-options.extranix.com/";
-				}
-				{ 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
-				vimium
-				firenvim
-				privacy-badger
-			];
-			settings = {
-				"extensions.autoDisableScopes" = 0;
-				"browser.startup.homepage" = "https://nixos.org";
-			};
-		};
-	};
-}

glasshouse-desktop/home/firefox/firefox.nix

@@ -0,0 +1,92 @@
+{ 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 = "NixOS Options";
+					url = "https://search.nixos.org/options";
+				}
+				{ name = "Home Manager Options";
+					url = "https://home-manager-options.extranix.com/";
+				}
+				{ 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
+				tampermonkey
+			];
+			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";
+			'';
+		};
+	};
+}

glasshouse-desktop/home/firefox/index.html

@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>My Homepage</title>
+    <style>
+        html, body {
+            height: 100%; /* Ensures the background covers the entire viewport */
+            margin: 0;
+            padding: 0;
+        }
+        body {
+            font-family: Arial, sans-serif;
+            display: flex;
+            justify-content: left; /* Align content to the right */
+            align-items: center; /* Vertically center content */
+            background-image: url('../../../media/wallpapers/catppuccin/nixos-catppuccin.png'); /* Path to your local image */
+            background-size: cover;
+            background-position: right; /* Adjust the background image to stay aligned to the left */
+            background-attachment: fixed;
+            background-repeat: no-repeat;
+            min-height: 100vh; /* Ensure it covers at least the full viewport */
+            padding-left: 140px; /* Add space between the content and the right edge */
+        }
+        .content {
+            text-align: center; /* Align text and links to the right */
+        }
+        .links {
+            margin-bottom: 20px;
+        }
+        a {
+            color: white;
+            text-decoration: none;
+            font-size: 1.2em;
+            margin-left: 10px;
+            margin-right: 10px;
+        }
+        a:hover {
+            text-decoration: underline;
+        }
+        .search {
+            margin-top: 20px;
+        }
+        input[type="text"] {
+            padding: 10px;
+            font-size: 1.5em;
+            width: 50%;
+            border: none;
+            border-radius: 5px;
+        }
+    </style>
+</head>
+<body>
+    <div class="content">
+        <div class="links">
+            <a href="https://github.com" target="_blank">GitHub</a>
+            <a href="https://www.youtube.com" target="_blank">YouTube</a>
+            <a href="https://chat.openai.com" target="_blank">ChatGPT</a>
+            <a href="https://app.dataannotation.tech/users/sign_in" target="_blank">Data Annotation</a>
+        </div>
+        
+        <div class="search">
+            <input type="text" id="search" placeholder="Search the web..." onkeydown="search(event)">
+        </div>
+    </div>
+
+    <script>
+        function search(event) {
+            if (event.key === "Enter") {
+                const query = document.getElementById("search").value;
+                window.location.href = `https://www.google.com/search?q=${query}`;
+            }
+        }
+    </script>
+</body>
+</html>

glasshouse-desktop/home/scripts/default.nix

@@ -1,56 +1,56 @@
 { self, pkgs, ... }:  
 
 let
-	compress = 		  (import ./compress.nix 		{ self = self; pkgs = pkgs;});
+	compress = 		  (import ./commands/compress.nix 			{ self = self; pkgs = pkgs;});
-	crs = 			  (import ./crs.nix 			{ self = self; pkgs = pkgs;});
+	crs = 			  (import ./commands/crs.nix 				{ self = self; pkgs = pkgs;});
-	extract = 		  (import ./extract.nix 		{ self = self; pkgs = pkgs;});
+	extract = 		  (import ./commands/extract.nix 			{ self = self; pkgs = pkgs;});
-	garbage-collect = (import ./garbage-collect.nix { self = self; pkgs = pkgs;});
+	invoke = 		  (import ./commands/invoke.nix 			{ self = self; pkgs = pkgs;});
-	homep = 		  (import ./homep.nix 			{ self = self; pkgs = pkgs;});
+	splash = 		  (import ./commands/splash.nix 			{ self = self; pkgs = pkgs;});
-	homer = 		  (import ./homer.nix 			{ self = self; pkgs = pkgs;});
+	scheck = 		  (import ./commands/s_check.nix 			{ self = self; pkgs = pkgs;});
-	invoke = 		  (import ./invoke.nix 			{ self = self; pkgs = pkgs;});
+	runbg = 		  (import ./commands/runbg.nix 				{ self = self; pkgs = pkgs;});
-	lofi = 			  (import ./lofi.nix 			{ self = self; pkgs = pkgs;});
+	mcd = 			  (import ./commands/mcd.nix 				{ self = self; pkgs = pkgs;});
-	mcd = 			  (import ./mcd.nix 			{ self = self; pkgs = pkgs;});
+	garbage-collect = (import ./nix/garbage-collect.nix 		{ self = self; pkgs = pkgs;});
-	music = 		  (import ./music.nix 			{ self = self; pkgs = pkgs;});
+	homep = 		  (import ./nix/homep.nix 					{ self = self; pkgs = pkgs;});
-	nixcommit = 	  (import ./nixcommit.nix 		{ self = self; pkgs = pkgs;});
+	homer = 		  (import ./nix/homer.nix 					{ self = self; pkgs = pkgs;});
-	nixp = 			  (import ./nixp.nix 			{ self = self; pkgs = pkgs;});
+	nsp = 			  (import ./nix/nsp.nix 					{ self = self; pkgs = pkgs;});
-	nixr = 			  (import ./nixr.nix 			{ self = self; pkgs = pkgs;});
+	nixswitch = 	  (import ./nix/nixswitch.nix 				{ self = self; pkgs = pkgs;});
-	nixswitch = 	  (import ./nixswitch.nix 		{ self = self; pkgs = pkgs;});
+	nixr = 			  (import ./nix/nixr.nix 					{ self = self; pkgs = pkgs;});
-	nsp = 			  (import ./nsp.nix 			{ self = self; pkgs = pkgs;});
+	nixp = 			  (import ./nix/nixp.nix 					{ self = self; pkgs = pkgs;});
-	runbg = 		  (import ./runbg.nix 			{ self = self; pkgs = pkgs;});
+	nixcommit = 	  (import ./nix/nixcommit.nix 				{ self = self; pkgs = pkgs;});
-	scheck = 		  (import ./s_check.nix 		{ self = self; pkgs = pkgs;});
+	lofi = 			  (import ./wm-controls/lofi.nix 			{ self = self; pkgs = pkgs;});
-	shutdown-script = (import ./shutdown-script.nix { self = self; pkgs = pkgs;});
+	music = 		  (import ./wm-controls/music.nix 			{ self = self; pkgs = pkgs;});
-	splash = 		  (import ./splash.nix 			{ self = self; pkgs = pkgs;});
+	shutdown-script = (import ./wm-controls/shutdown-script.nix { self = self; pkgs = pkgs;});
-	switchmon =       (import ./switchmon.nix 		{ self = self; pkgs = pkgs;});
+	switchmon =       (import ./wm-controls/switchmon.nix 		{ self = self; pkgs = pkgs;});
-	toggle_blur =     (import ./toggle_blur.nix     { self = self; pkgs = pkgs;});
+	toggle_blur =     (import ./wm-controls/toggle_blur.nix     { self = self; pkgs = pkgs;});
-	toggle_float =    (import ./toggle_float.nix 	{ self = self; pkgs = pkgs;});
+	toggle_float =    (import ./wm-controls/toggle_float.nix 	{ self = self; pkgs = pkgs;});
-	toggle_oppacity = (import ./toggle_oppacity.nix { self = self; pkgs = pkgs;});
+	toggle_oppacity = (import ./wm-controls/toggle_oppacity.nix { self = self; pkgs = pkgs;});
-	toggle_waybar =   (import ./toggle_waybar.nix   { self = self; pkgs = pkgs;});
+	toggle_waybar =   (import ./wm-controls/toggle_waybar.nix   { self = self; pkgs = pkgs;});
 in
 {
 	home.packages = [
-		splash
+		compress
-		nixswitch 
-		garbage-collect 
-		mcd 
 		crs 
-		nixcommit 
+		extract
+		garbage-collect 
+		homep
+		homer
 		invoke 
-		nsp 
+		lofi
+		mcd 
+		music
+		nixcommit 
 		nixp
 		nixr
-		homep
+		nixswitch 
-		scheck
+		nsp 
-		homer
 		runbg
-		music
+		scheck
-		lofi
+		shutdown-script
+		splash
 		switchmon
 		toggle_blur
 		toggle_float
 		toggle_oppacity
 		toggle_waybar
-		compress
-		extract
-		shutdown-script
 	];
 }

glasshouse-desktop/home/userpkgs.nix

@@ -36,5 +36,6 @@ in
 		ripgrep
 		nvim
 		toilet
+ 		python3
 	];
 }

glasshouse-desktop/sys/packages.nix

@@ -68,5 +68,6 @@
 		wl-clipboard
 		xpad
  		libnotify
+ 		file
 	];
 }