feat: inherited Nvidia configuration from old conf

5 files changed, 57 insertions, 22 deletions

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index bbcc3f8..2690c28 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -8,15 +8,11 @@
 		...
 }: 
 let
-myHostName = "homelab-nix";
-stevenUserName = "stvnliu";
+	globals = import ./globals.nix;
 in
 {
 	imports = [
-#inputs.hardware.nixosModules.common-cpu-amd
-#inputs.hardware.nixosModules.common-ssd
 		./hardware-configuration.nix
-		./services/display-manager.nix
 	];
 	boot.loader = {
 		efi.canTouchEfiVariables = true;
@@ -36,6 +32,12 @@ in
 			'';
 		};
 	};
+	security.polkit.enable = true;
+	services.gnome.gnome-keyring.enable = true;
+	programs.sway = {
+		enable = true;
+		wrapperFeatures.gtk = true;
+	};
 	nixpkgs = {
 		overlays = [
 		];
@@ -56,20 +58,18 @@ in
 		nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
 	};
 	networking = {
-		hostName = "${myHostName}";
+		hostName = "${globals.myHostName}";
 		networkmanager.enable = true;
 	};
 	users.users = {
-		"${stevenUserName}" = {
+		"${globals.myUserName}" = {
 			initialPassword = "stevenpassword";
 			isNormalUser = true;
 			openssh.authorizedKeys.keys = [
 			];
 			packages = with pkgs; [
-				nh
-					neovim
-					gitFull
-			];
+					nh
+				];
 			extraGroups = ["wheel"];
 		};
 	};
diff --git a/nixos/globals.nix b/nixos/globals.nix
new file mode 100644
index 0000000..e8dc5e6
--- /dev/null
+++ b/nixos/globals.nix
@@ -0,0 +1,4 @@
+{
+	myUserName = "stvnliu";
+	myHostName = "homelab-nix";
+}
diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix
new file mode 100644
index 0000000..e75a77a
--- /dev/null
+++ b/nixos/nvidia.nix
@@ -0,0 +1,34 @@
+{
+	config,
+		lib,
+		...
+}: {
+	specialisation = {
+		powersave.configuration = {
+			hardware.nvidia.prime = {
+				offload = {
+					enable = lib.mkForce true;
+					enableOffloadCmd = lib.mkForce true;
+				};
+				sync.enable = lib.mkForce false;
+			};
+		};
+	};
+	hardware.nvidia = {
+		prime = {
+			offload.enable = false;
+			sync = {
+				enable = true;
+			};
+			amdgpuBusId = "PCI:5:0:0";
+			nvidiaBusId = "PCI:1:0:0";
+		};
+		forceFullCompositionPipeline = true;
+		modesetting.enable = true;
+		powerManagement.enable = false;
+		powerManagement.finegrained = false;
+		open = true;
+		nvidiaSettings = true;
+		package = config.boot.kernelPackages.nvidiaPackages.stable;
+	};
+}
diff --git a/nixos/services/display-manager.nix b/nixos/services/display-manager.nix
deleted file mode 100644
index edbd360..0000000
--- a/nixos/services/display-manager.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, lib, ... }:
-{
-	programs.sway = {
-		enable = true;
-		wrapperFeatures.gtk = true;
-	};
-	services.displayManager = {
-		enable = true;
-		execCmd = "${pkgs.lemurs}/bin/lemurs --no-logs";
-	};
-}
diff --git a/nixos/services/syncthing.service.nix b/nixos/services/syncthing.service.nix
new file mode 100644
index 0000000..17d52b1
--- /dev/null
+++ b/nixos/services/syncthing.service.nix
@@ -0,0 +1,8 @@
+{pkgs, lib, ...}:
+let
+	myUserName = "";
+in
+{
+	enable = true;
+	user = ""
+}