Minor packaging tweaks; KDE SSH fixes

ShobuPrime · Feb 2, 2024 · 1f60514 · 1f60514
1 parent 0f29422
commit 1f60514
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/.build/ShobuArch b/.build/ShobuArch
diff --git a/pkg/config/pacman.go b/pkg/config/pacman.go
@@ -33,8 +33,10 @@ func BasePkgs(c *Config) {
 		"firefox",                // "Default" Web Browser
 		"firewalld",              // Firewall daemon with D-Bus interface
 		"flatpak",                // Sandboxed desktop applications on Linux.
+		"freerdp",                // Free implementation of the Remote Desktop Protocol (RDP)
 		"fwupd",                  // Daemon to update some devices' firmware
 		"go",                     // Core compiler tools for the Go programming language
+		"gnu-netcat",             // GNU rewrite of netcat, the network piping application (QEMU)
 		"iptables-nft",           // Linux kernel packet control tool (using nft interface)
 		"jq",                     // Command-line JSON processor
 		//"keepassxc",            // Cross-platform community-driven port of Keepass password manager
@@ -44,6 +46,7 @@ func BasePkgs(c *Config) {
 		"lib32-pipewire-v4l2",    // Pipewire V4L2 interceptor -- 32bit
 		"networkmanager",         // Network connection manager and user applications
 		"network-manager-applet", // Applet for managing network connections
+		"noto-fonts-emoji",       // Google Noto emoji fonts
 		"openssh",                // Premier connectivity tool for remote login with the SSH protocol
 		"os-prober",              // Utility to detect other OSes on a set of drives
 		"packagekit",             // A system designed to make installation and updates of packages easier
@@ -55,8 +58,8 @@ func BasePkgs(c *Config) {
 		"python",                 // Next generation of the python high-level scripting language
 		"python-black",           // Uncompromising Python code formatter
 		"python-pip",             // The PyPA recommended tool for installing Python packages
+		"python-pipx",            // Install and Run Python Applications in Isolated Environments
 		"qemu-full",              // A generic and open source machine emulator and virtualizer
-		"qpwgraph",               // PipeWire Graph Qt GUI Interface
 		"reflector",              // A Python 3 module and script to retrieve and filter the latest Pacman mirror list.
 		"rsync",                  // A fast and versatile file copying tool for remote and local files
 		"steam",                  // Valve's digital software delivery system
@@ -66,6 +69,7 @@ func BasePkgs(c *Config) {
 		"wget",                   // Network utility to retrieve files from the
 		"wireplumber",            // Session & policy manager implementation for PipeWire
 		"wpa_supplicant",         // A utility providing key negotiation for WPA wireless networks
+		//"x11-ssh-askpass",      // Lightweight passphrase dialog for SSH (QEMU)
 		"xdg-desktop-portal-gtk", // Prevent blurry text from GTK Flatpaks
 		"xdg-user-dirs",          // Manage user directories like ~/Desktop and ~/Music
 		"xdg-utils",              // Command line tools that assist applications with a variety of desktop integration tasks
@@ -134,7 +138,7 @@ func KDE(c *Config) {
 			"kdf",                         // View Disk Usage
 			"keditbookmarks",              // Bookmark Organizer and Editor
 			"kfind",                       // Find files/folders
-			"kgamma5",                     // Adjust monitor gamma settings
+			"kgamma",                      // Adjust monitor gamma settings
 			"kgpg",                        // GnuPG frontend
 			"khelpcenter",                 // KDE Applications documentation
 			"khotkeys",                    // KHotKeys
@@ -158,6 +162,7 @@ func KDE(c *Config) {
 			"kwave",                       // Sound editor
 			"kwayland-integration",        // Integration plugins for KDE frameworks and Wayland
 			"kwrited",                     // KDE daemon listening for wall and write messages
+			"maliit-keyboard",             // Virtual keyboard based on Maliit framework
 			"markdownpart",                // KPart for rendering Markdown content
 			"merkuro",                     // A calendar application using Akonadi to sync with external services
 			"okular",                      // Document Viewer
@@ -558,7 +563,6 @@ func Flatpak(c *Config) {
 			"im.riot.Riot",                                           // Element -- Matrix Chat Client
 			"in.srev.guiscrcpy",                                      // Android Screen Mirroring Software
 			"io.github.antimicrox.antimicrox",                        // Map gamepad buttons
-			"io.github.hakandundar34coding.system-monitoring-center", // Multi-featured system monitor
 			"io.github.peazip.PeaZip",                                // File Archiver Utility (RAR, TAR, ZIP)
 			"io.github.simple64.simple64",                            // Nintendo 64 Emulator
 			"io.github.seadve.Kooha",                                 // Record your screen
@@ -584,6 +588,7 @@ func Flatpak(c *Config) {
 			"org.mozilla.Thunderbird",                                // Email, RSS, and newsgroup client with integrated spam filter
 			//"org.onlyoffice.desktopeditors",                        // OnlyOffice productivity suite
 			"org.ppsspp.PPSSPP",                                      // PlayStation Portable emulator
+			"org.rncbc.qpwgraph",                                     // PipeWire Graph Qt GUI Interface
 			"org.upscayl.Upscayl",                                    // Free and Open Source AI Image Upscaler
 			"org.yuzu_emu.yuzu",                                      // Nintendo Switch emulator
 			"tv.plex.PlexDesktop",                                    // Plex client for desktop computers
@@ -616,3 +621,5 @@ func PWA(c *Config) {
 
 	SaveConfig(c)
 }
+
+// Make a note to update /usr/bin/steam-runtime to include `env LD_PRELOAD=/usr/lib32/libextest.so` between `exec` and `/usr/lib/steam/steam "$@"`
diff --git a/pkg/install/setup.go b/pkg/install/setup.go
@@ -364,7 +364,7 @@ func SetupCustomRepos(c *conf.Config) {
 		cmd = []string{`pacman-key`, `-f`, `DDF7DB817396A49B2A2723F7403BD972F75D9D76`}
 		z.Arch_chroot(&cmd, false, c)
 
-		cmd = []string{`awk`, `BEGIN{ printf "# Origin Server - France\n" >> "/etc/pacman.conf" }`}
+		cmd = []string{`awk`, `BEGIN{ printf "# Origin Server - Finland\n" >> "/etc/pacman.conf" }`}
 		z.Arch_chroot(&cmd, false, c)
 
 		cmd = []string{`awk`, `BEGIN{ printf "Server = http://archzfs.com/$repo/x86_64\n" >> "/etc/pacman.conf" }`}
@@ -388,7 +388,7 @@ func SetupCustomRepos(c *conf.Config) {
 		cmd = []string{`awk`, `BEGIN{ printf "Server = https://mirror.in.themindsmaze.com/archzfs/$repo/x86_64\n" >> "/etc/pacman.conf" }`}
 		z.Arch_chroot(&cmd, false, c)
 
-		cmd = []string{`awk`, `BEGIN{ printf "# ArchZFS - US Mirror\n" >> "/etc/pacman.conf" }`}
+		cmd = []string{`awk`, `BEGIN{ printf "# ArchZFS - United States\n" >> "/etc/pacman.conf" }`}
 		z.Arch_chroot(&cmd, false, c)
 
 		cmd = []string{`awk`, `BEGIN{ printf "Server = https://zxcvfdsa.com/archzfs/$repo/$arch\n" >> "/etc/pacman.conf" }`}
@@ -730,9 +730,14 @@ func SetupMiscHardware(c *conf.Config) {
 			log.Printf("'%s' detected!\n", usb.USBDevices[i].Description)
 			log.Println("Appending Razer compatible package(s)...")
 
+			c.Pacman.Packages = append(c.Pacman.Packages,
+				"openrazer-daemon",      // Userspace daemon that abstracts access to the kernel driver. Provides a DBus service for applications to use
+				"openrazer-driver-dkms", // OpenRazer kernel modules sources
+				"python-openrazer",      // Library for interacting with the OpenRazer daemon
+			)
+
 			c.Pacman.AUR.Packages = append(c.Pacman.AUR.Packages,
-				"openrazer-meta", // Razer device drivers
-				"polychromatic",  // RGB management GUI for Razer Devices
+				"polychromatic", // RGB management GUI for Razer Devices
 			)
 		case strings.Contains(usb.USBDevices[i].Description, `Razer USA, Ltd Nari`):
 			log.Println("Appending Razer Nari compatible package(s)...")

diff --git a/pkg/install/user.go b/pkg/install/user.go
@@ -323,11 +323,19 @@ func UserVariables(c *conf.Config) {
 	environment_config := "environment.conf"
 
 	config_settings := []string{
-		`MOZ_ENABLE_WAYLAND=1`,
+		// `MOZ_ENABLE_WAYLAND=1`, // Firefox 121.0 is supposed to have Wayland support enabled by default
 		`MOZ_DBUS_REMOTE=1`,
 		`AMD_VULKAN_ICD=RADV`, // https://wiki.archlinux.org/title/Vulkan#Selecting_via_environment_variable
 	}
 
+	switch c.Desktop.Environment {
+	case "kde":
+		config_settings = append(config_settings,
+			`SSH_ASKPASS='/usr/bin/ksshaskpass'`,
+			`SSH_ASKPASS_REQUIRE=prefer`,
+		)
+	}
+
 	log.Println(`Creating "environment.conf"`)
 	u.WriteFile(&environment_dir, &environment_config, &config_settings, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0755)
 
@@ -501,6 +509,14 @@ func UserDotFiles(c *conf.Config) {
 				}
 			}
 
+			// Aider Chat
+			// https://marketplace.visualstudio.com/items?itemName=MattFlower.aider
+			code_extensions = append(code_extensions, `MattFlower.aider`)
+
+			// Github CoPilot
+			// https://marketplace.visualstudio.com/items?itemName=GitHub.copilot
+			code_extensions = append(code_extensions, `GitHub.copilot`)
+
 			for i := range code_extensions {
 				cmd_list = append(cmd_list, fmt.Sprintf(`code --install-extension %s`, code_extensions[i]),
 				)
@@ -575,7 +591,9 @@ func UserDotFiles(c *conf.Config) {
 				`		"[\"-s\", \"-w\"]"`,
 				`	],`,
 				`	"python.formatting.provider": "black",`,
-				`	"editor.formatOnSave": true`,
+				`	"editor.formatOnSave": true,`,
+				`	"workbench.colorTheme": "Visual Studio Dark",`,
+				`	"editor.largeFileOptimizations": false`,
 				`}`,
 			}
 			u.WriteFile(&code_dir, &code_file, &code_contents, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0755) // Overwrite
@@ -584,10 +602,11 @@ func UserDotFiles(c *conf.Config) {
 			code_file = "argv.json"
 
 			// This configuration file allows you to pass permanent command line arguments to VS Code.
-			// https://github.com/microsoft/vscode-python/issues/20247#issuecomment-1350342224`
+			// https://github.com/microsoft/vscode-python/issues/20247#issuecomment-1350342224
+			// https://github.com/orgs/community/discussions/11509
 			code_contents = []string{
 				`{`,
-				`	"enable-proposed-api": ["ms-python.python"]`,
+				`	"enable-proposed-api": ["ms-python.python", "github.copilot"],`,
 				`}`,
 			}
 			u.WriteFile(&code_dir, &code_file, &code_contents, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0755) // Overwrite