Refactor

machines/katana.nix

@@ -2,6 +2,7 @@
 {
 	imports = [
 		./hardware/katana.nix
+		../modules
 	];
 
 	system.stateVersion = "24.05"; # Did you read the comment?

machines/katana/boot.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+	boot.loader.systemd-boot.enable = true;
+	boot.loader.efi.canTouchEfiVariables = true;
+	boot.loader.systemd-boot.configurationLimit = 10;
+	boot.initrd.luks.devices."luks-332a07bd-65fb-4d91-91ba-fe3f594063b1".device = "/dev/disk/by-uuid/332a07bd-65fb-4d91-91ba-fe3f594063b1";
+	boot.kernelPackages = pkgs.linuxPackages_latest;
+}

machines/katana/default.nix

@@ -0,0 +1,9 @@
+{ ... }:
+{
+	imports = [
+		./hardware.nix
+		./boot.nix
+		./nvidia.nix
+		./services.nix
+	];
+}

machines/katana/nvidia.nix

@@ -0,0 +1,18 @@
+{ config, ... }:
+{
+	hardware.graphics.enable = true;
+	hardware.nvidia = {
+		modesetting.enable = true;	
+		package = config.boot.kernelPackages.nvidiaPackages.beta;
+		open = true;
+		prime = {
+			offload = {
+				enable = true;
+				enableOffloadCmd = true;
+			};
+
+			intelBusId = "PCI:0:2:0";
+			nvidiaBusId = "PCI:1:0:0";
+		};
+	};
+}

machines/katana/services.nix

@@ -0,0 +1,47 @@
+{ pkgs, ... }:
+{
+	services.flatpak.enable = true;
+	services.xserver.videoDrivers = ["nvidia"];
+
+	services.xserver.enable = true;
+	services.displayManager.sddm.enable = true;
+	services.desktopManager.plasma6.enable = true;
+	services.displayManager.sddm.wayland.enable = true; 
+
+	# services.xserver.displayManager.gdm.enable = true;
+	# services.xserver.desktopManager.gnome.enable = true;
+	# environment.gnome.excludePackages = (with pkgs; [
+	# 	atomix # puzzle game
+	# 	cheese # webcam tool
+	# 	epiphany # web browser
+	# 	evince # document viewer
+	# 	geary # email reader
+	# 	gedit # text editor
+	# 	gnome-characters
+	# 	gnome-music
+	# 	gnome-photos
+	# 	gnome-terminal
+	# 	gnome-tour
+	# 	hitori # sudoku game
+	# 	iagno # go game
+	# 	tali # poker game
+	# 	totem # video player
+	# ]);
+
+
+	# Configure keymap in X11
+	services.xserver.xkb = {
+		layout = "us";
+		variant = "";
+	};
+
+	# Enable CUPS to print documents.
+	services.printing.enable = true;
+
+	services.pipewire = {
+		enable = true;
+		alsa.enable = true;
+		alsa.support32Bit = true;
+		pulse.enable = true;
+	};
+}