Common/grub: set catppuccin theme

flake.nix

@@ -105,7 +105,6 @@
 		};
 		packages = {
 			x86_64-linux = with import nixpkgs-unstable-raw { system = "x86_64-linux"; }; {
-				pseint = callPackage ./pkgs/pseint.nix {};
 				anything-sync-daemon = callPackage ./pkgs/anything-sync-daemon {};
 				discord-krisp-fixer = callPackage ./pkgs/discord-krisp-fixer {};
 			};

machines/WinMax2/configuration.nix

@@ -28,6 +28,8 @@
 		initrd.systemd.enable = true;
 		# Plymouth doesn't support fractional scaling :(
 		plymouth.extraConfig = "DeviceScale=2";
+
+		kernelPackages = pkgs.linuxPackages_latest;
 	};
 
 	networking.hostName = "WinMax2"; # Define your hostname.

pkgs/pseint.nix

@@ -1,66 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, wxGTK32
-, libX11
-, libglvnd
-, libGLU
-, gsettings-desktop-schemas
-, makeBinaryWrapper
-, makeDesktopItem
-, wrapGAppsHook
-}:
-# Based on https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pseint
-stdenv.mkDerivation rec {
-	pname = "pseint";
-	version = "20230517";
-
-	src = fetchurl {
-		url = "https://netactuate.dl.sourceforge.net/project/${pname}/${version}/${pname}-src-${version}.tgz";
-		hash = "sha256-8zc7CtDQ9RjXLAVQTigstPqdDJsR8ffBopxBFzVP+eI=";
-	};
-	enableParallelBuilding = true;
-
-	buildInputs = [ wxGTK32 libglvnd libGLU libX11 gsettings-desktop-schemas ];
-
-	nativeBuildInputs = [ makeBinaryWrapper wrapGAppsHook ];
-
-	# Build for linux
-	makeFlags = [ "ARCH=lnx" ];
-
-	installPhase = ''
-		runHook preInstall
-
-		mkdir -p $out/opt/${pname}/ $out/bin/ $out/share/icons/hicolor/{16x16,32x32,48x48,64x64,128x128}
-		cp -rv bin/* $out/opt/${pname}/
-		makeBinaryWrapper $out/opt/${pname}/wxPSeInt $out/bin/pseint
-		cp -rv bin/imgs/icon16.png $out/share/icons/hicolor/16x16/pseint.png
-		cp -rv bin/imgs/icon32.png $out/share/icons/hicolor/32x32/pseint.png
-		cp -rv bin/imgs/icon48.png $out/share/icons/hicolor/48x48/pseint.png
-		cp -rv bin/imgs/icon64.png $out/share/icons/hicolor/64x64/pseint.png
-		cp -rv bin/imgs/icon128.png $out/share/icons/hicolor/128x128/pseint.png
-		cp -rv "${desktopItem}/share/applications" "$out/share"
-
-		runHook postInstall
-	'';
-
-	desktopItem = makeDesktopItem {
-		name = pname;
-		desktopName = "PSeInt";
-		exec = "pseint";
-		icon = "pseint";
-		genericName = meta.description;
-		categories =  [ "Development" ];
-	};
-
-
-	meta = with lib; {
-		description = "A tool for learning programming basis with a simple spanish pseudocode";
-		homepage = "https://pseint.sourceforge.net/";
-		downloadPage = "https://pseint.sourceforge.net/index.php?page=descargas.php";
-		changelog = "https://pseint.sourceforge.net/index.php?page=cambios.php";
-		# Website says GPLv2, so I'm assuming I need to use gpl2Only
-		license = lib.licenses.gpl2Only;
-		platforms = platforms.linux;
-	};
-}

roles/common/configuration.nix

@@ -75,6 +75,7 @@
 						"bat"
 						"btop"
 						"starship"
+						"grub"
 					];
 				};
 			}
@@ -108,6 +109,12 @@
 		];
 	};
 
+	boot.loader.grub = {
+		theme = "${pkgs.catppuccin}/grub";
+		backgroundColor = "#1E1E2E";
+		splashImage = "${pkgs.catppuccin}/grub/background.png";
+	};
+
 	/*
 	I used to keep the host keys in the repo as a secret, but since I use the
 	host keys for decrypting too I'm not sure encrypting a key with itself

roles/kde/plasma.nix

@@ -57,10 +57,7 @@ in
 	# GTK apps need dconf to grab the correct theme on Wayland
 	programs.dconf.enable = true;
 
-	/*
+	# Install the patched Breeze color schemes as well as the plasma default configs
-	Install the patched Breeze color schemes and look and feel packages,
-	as well as the plasma default configs
-	*/
 	environment.systemPackages = [ breezeTint plasmaDefaults ];
 
 	# Plasma configs should be on all users
@@ -92,6 +89,12 @@ in
 					clickItemTo = "select";
 					cursorTheme = "Breeze_Snow";
 				};
+				kwin = {
+					titlebarButtons = {
+						left = [ "on-all-desktops" "keep-above-windows" ];
+						right = [ "minimize" "maximize" "close" ];
+					};
+				};
 				shortcuts = {
 					"kwin" = {
 						"Switch One Desktop to the Left" = [ "Meta+Ctrl+Left" ];
@@ -105,7 +108,6 @@ in
 							"Rows" = 1;
 						};
 						"TabBox"."LayoutName" = "thumbnail_grid";
-						"org\\.kde\\.kdecoration2"."ButtonsOnLeft" = "SF";
 					};
 					"plasmanotifyrc"."Notifications"."NormalAlwaysOnTop" = true;
 				};

roles/school/programs/default.nix

@@ -1,4 +1,4 @@
- { config, pkgs, flakeSelf, ... }:
+ { config, pkgs, ... }:
 
 {
 	imports = [
@@ -9,6 +9,5 @@
 	
 	environment.systemPackages = with pkgs; [
 		dia
-		flakeSelf.packages.x86_64-linux.pseint
 	];
 }