@hurshb50/setup-ubuntu 2.0.4 → 3.0.0

package/README.md

@@ -18,7 +18,7 @@ Vite+ defaults to pnpm, which can hold back freshly published releases. The setu
 Open a new terminal, then:
 
 - Log out and back in to use Docker without `sudo`.
-- Sign in to Zed, 1Password, and Chrome.
+- Sign in to Zed, 1Password, and Brave.
 - Run `gh auth login` to authenticate the GitHub CLI.
 - Pick a wallpaper in HydraPaper.
 - Put personal shell config in `~/.custom.bashrc`, not `~/.bashrc`.

package/distribution/assets/.gitconfig

@@ -1,7 +1,3 @@
-[user]
-	name = Hursh Patel
-	email = hurshb50@gmail.com
-
 [core]
 	editor = zed --wait
 
@@ -29,3 +25,13 @@
 [credential "https://github.com"]
 	helper =
 	helper = !/usr/bin/gh auth git-credential
+
+[credential "https://gist.github.com"]
+	helper =
+	helper = !/usr/bin/gh auth git-credential
+
+[includeIf "hasconfig:remote.*.url:https://github.com/rai-inst/**"]
+	path = ~/.config/git/work.gitconfig
+
+[includeIf "hasconfig:remote.*.url:https://github.com/hurshb50/**"]
+	path = ~/.config/git/personal.gitconfig

package/distribution/assets/git/personal.gitconfig

@@ -0,0 +1,3 @@
+[user]
+	name = Hursh Patel
+	email = hurshb50@gmail.com

package/distribution/assets/git/work.gitconfig

@@ -0,0 +1,3 @@
+[user]
+	name = Hursh Patel
+	email = hpatel@theaiinstitute.com

package/distribution/assets/zed/settings.json

@@ -7,6 +7,7 @@
             "model": "deepseek-flash",
             "provider": "deepseek"
         },
+        "dock": "right",
         "enable_feedback": false,
         "notify_when_agent_waiting": "never",
         "sandbox_permissions": { "allow_unsandboxed": true, "allow_all_hosts": true, "allow_fs_write_all": true },
@@ -51,6 +52,7 @@
         }
     },
     "git_panel": {
+        "dock": "left",
         "tree_view": true
     },
     "gutter": {
@@ -73,6 +75,7 @@
     "project_panel": {
         "auto_fold_dirs": false,
         "bold_folder_labels": false,
+        "dock": "left",
         "folder_indicator": "icon",
         "git_status": false,
         "hide_gitignore": false,

package/distribution/setup-ubuntu.mjs

@@ -11,7 +11,7 @@ import util from "util";
 import childProcess from "child_process";
 //#region package.json
 var name = "@hurshb50/setup-ubuntu";
-var version = "2.0.3";
+var version = "2.0.5";
 //#endregion
 //#region source/modules/logger/logger.ts
 var Logger = class Logger {
@@ -367,28 +367,48 @@ var Browser = class {
 		const task = new Task("Browser");
 		context.logger.add(task);
 		task.start();
-		const dependencies = ["google-chrome-stable"];
-		if (await context.dependencyManager.isInstalled(dependencies)) {
-			task.finish();
-			return;
+		const dependencies = ["brave-browser"];
+		const isInstalled = await context.dependencyManager.isInstalled(dependencies);
+		const keyringFilePath = path.join("/", "usr", "share", "keyrings", "brave-browser-archive-keyring.gpg");
+		const sourceFilePath = path.join("/", "etc", "apt", "sources.list.d", "brave-browser-release.sources");
+		const sourceFilePaths = [keyringFilePath, sourceFilePath];
+		const sourceFilesExist = (await Promise.all(sourceFilePaths.map(async (filePath) => {
+			const statistics = await fs.stat(filePath, { throwIfNoEntry: false });
+			return statistics !== void 0 && statistics.size > 0;
+		}))).every(Boolean);
+		if (!isInstalled || !sourceFilesExist) {
+			task.continue("Update package manager");
+			await context.dependencyManager.update(task);
+			const systemDependencies = ["curl", "unattended-upgrades"];
+			task.continue(`Installing dependencies: ${systemDependencies.join(", ")}`);
+			await context.dependencyManager.install(systemDependencies, task);
+			task.continue("Set up Brave sources");
+			const exec = util.promisify(childProcess.exec);
+			await exec(`sudo curl -fsSLo ${keyringFilePath} https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg`);
+			await exec(`sudo curl -fsSLo ${sourceFilePath} https://brave-browser-apt-release.s3.brave.com/brave-browser.sources`);
+			await exec(`sudo rm -f /etc/apt/sources.list.d/brave-browser-*.list`);
+			task.continue("Update package manager");
+			await context.dependencyManager.update(task);
+			if (!isInstalled) {
+				task.continue(`Installing dependencies: ${dependencies.join(", ")}`);
+				await context.dependencyManager.install(dependencies, task);
+			}
 		}
-		task.continue("Update package manager");
-		await context.dependencyManager.update(task);
-		const systemDependencies = ["gnupg"];
-		task.continue(`Installing dependencies: ${systemDependencies.join(", ")}`);
-		await context.dependencyManager.install(systemDependencies, task);
-		const keyringFilePath = path.join("/", "usr", "share", "keyrings", "google-chrome.gpg");
-		const sourceFilePath = path.join("/", "etc", "apt", "sources.list.d", "google-chrome.list");
-		task.continue("Set up google chrome sources");
-		const exec = util.promisify(childProcess.exec);
-		await exec(`curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | sudo gpg --dearmor --yes -o ${keyringFilePath}`);
-		await exec(`echo 'deb [arch=amd64 signed-by=${keyringFilePath}] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee ${sourceFilePath} > /dev/null`);
-		task.continue("Update package manager");
-		await context.dependencyManager.update(task);
-		task.continue(`Installing dependencies: ${dependencies.join(", ")}`);
-		await context.dependencyManager.install(dependencies, task);
+		await this.configureAutomaticUpdates(context, task);
 		task.finish();
 	}
+	async configureAutomaticUpdates(context, task) {
+		const dependencies = ["unattended-upgrades"];
+		if (!await context.dependencyManager.isInstalled(dependencies)) {
+			task.continue("Update package manager");
+			await context.dependencyManager.update(task);
+			task.continue(`Installing dependencies: ${dependencies.join(", ")}`);
+			await context.dependencyManager.install(dependencies, task);
+		}
+		const configurationFilePath = path.join("/", "etc", "apt", "apt.conf.d", "51unattended-upgrades-brave");
+		task.continue("Configure automatic updates");
+		await util.promisify(childProcess.exec)(`printf '%s\\n' 'Unattended-Upgrade::Allowed-Origins {' '    "Brave Software:stable";' '};' | sudo tee ${configurationFilePath} > /dev/null`);
+	}
 };
 //#endregion
 //#region source/modules/clipboard/clipboard.ts
@@ -662,7 +682,28 @@ var VersionControlSystem = class {
 		const sourceFilePath = path.join(context.directories.assets, ".gitconfig");
 		const destinationFilePath = path.join(context.directories.home, ".gitconfig");
 		task.continue("Copy configuration");
-		await fs.copyFile(sourceFilePath, destinationFilePath);
+		const sourceConfiguration = await fs.readFile(sourceFilePath, "utf8");
+		let existingConfiguration = "";
+		try {
+			existingConfiguration = await fs.readFile(destinationFilePath, "utf8");
+		} catch (error) {
+			if (error.code !== "ENOENT") throw error;
+		}
+		const userConfigurations = [];
+		let currentSection = [];
+		let preserveCurrentSection = false;
+		for (const line of existingConfiguration.match(/[^\r\n]*(?:\r?\n|$)/g) ?? []) if (/^[ \t]*\[/.test(line)) {
+			if (preserveCurrentSection) userConfigurations.push(currentSection.join(""));
+			preserveCurrentSection = (line.match(/^[ \t]*\[([^\s\]]+)/)?.[1])?.toLowerCase() === "user";
+			currentSection = preserveCurrentSection ? [line] : [];
+		} else if (preserveCurrentSection) currentSection.push(line);
+		if (preserveCurrentSection) userConfigurations.push(currentSection.join(""));
+		const configuration = [...userConfigurations.map((value) => value.trim()), sourceConfiguration.trimEnd()].filter(Boolean).join("\n\n");
+		await fs.writeFile(destinationFilePath, `${configuration}\n`);
+		task.continue("Copy identity profiles");
+		const profilesDirectoryPath = path.join(context.directories.home, ".config", "git");
+		await fs.mkdir(profilesDirectoryPath, { recursive: true });
+		for (const fileName of ["work.gitconfig", "personal.gitconfig"]) await fs.copyFile(path.join(context.directories.assets, "git", fileName), path.join(profilesDirectoryPath, fileName));
 		task.finish();
 	}
 };
@@ -723,7 +764,7 @@ program.name(name).version(version).description("Sets up a fresh Ubuntu machine
 			assets: path.join(import.meta.dirname, "assets"),
 			home: os.homedir()
 		};
-		const installations = packages.map(({ install }) => install({
+		const installations = packages.map((entry) => entry.install({
 			dependencyManager,
 			directories,
 			logger

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hurshb50/setup-ubuntu",
-  "version": "2.0.4",
+  "version": "3.0.0",
   "type": "module",
   "files": [
     "distribution"