configuration.nix

@@ -30,7 +30,7 @@ in
 		#	"ddcci-driver"	# Brightness Controll (even on OLEDS)
 		#	"i2c-dev"		# Brightness Controll (even on OLEDS)
 		#];
-		#kernelParams = [ "module_blacklist=i915" "nvidia_drm.modeset=1" ];
+		kernelParams = [ "module_blacklist=i915" "nvidia_drm.modeset=1" ];
 		#kernelPatches = [ {
 		#	name = "hdr";
 		#	patch = null;
@@ -38,21 +38,15 @@ in
 		#		AMD_PRIVATE_COLOR y
 		#	'';
 		#	} ];
-		#extraModprobeConfig = ''
+		extraModprobeConfig = ''
-		#	options nvidia_drm modes.et=1 fbdev=1
+			options nvidia_drm modes.et=1 fbdev=1
-		#	options nvidia NVreg_PreserveVideoMemoryAllocations=1
+			options nvidia NVreg_PreserveVideoMemoryAllocations=1
-		#'';
+		'';
 		loader = {
 			efi.canTouchEfiVariables = true;
-			efi.efiSysMountPoint = "/boot";
+			systemd-boot = {
-			#systemd-boot = {
+				consoleMode = "max";
-			#	consoleMode = "max";
+				memtest86.enable = true;
-			#	memtest86.enable = true;
-			#};
-			grub =  {
-				enable = true;
-				efiSupport = true;
-				device = "nodev";
 			};
 		};
 		initrd.systemd.enable = true;
@@ -61,11 +55,11 @@ in
 	# Filesystems
 	fileSystems =
 	{
-		#"/share" = {
+		"/share" = {
-		#	options = [
+			options = [
-		#		"nofail"
+				"nofail"
-		#	];
+			];
-		#};
+		};
 	};
 
 	# Graphics 
@@ -73,26 +67,19 @@ in
 		graphics = {
 			enable = true;
 			enable32Bit = true;
-			extraPackages = with pkgs; [
-				vpl-gpu-rt	# newer gpus
-				intel-media-sdk	# older gpus
-			];
 		};	
-		bluetooth.enable = true;
+		nvidia	= {
-		#nvidia	= {
+			modesetting.enable = true; # required
-		#	modesetting.enable = true; # required
+			powerManagement.enable = false; # Experimental
-		#	powerManagement.enable = false; # Experimental
+			open = false; # Support limited to Turing and later: https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
-		#	open = false; # Support limited to Turing and later: https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
+			nvidiaSettings = true; # accessible via nvidia-settings
-		#	nvidiaSettings = true; # accessible via nvidia-settings
+			package = config.boot.kernelPackages.nvidiaPackages.stable;
-		#	package = config.boot.kernelPackages.nvidiaPackages.stable;
+		};
-		#};
 	};
 
 networking = 
 {
-	hostName = "Zuse2"; # Define your hostname
+	hostName = "Zuse1"; # Define your hostname.
-	networkmanager.enable = true;
-	wireless.userControlled.enable = true;
 	#nameservers = [
 	#	"127.0.0.1"
 	#	"::1"
@@ -130,13 +117,13 @@ networking =
 services.xserver = {
 	enable = true;
 
-	#videoDrivers = [ "nvidia" ];
+	videoDrivers = [ "nvidia" ];
 	excludePackages = with pkgs; [
 		xterm	# why the fuck is this garbage even shipped?
 	];
 
 	# Configure keymap in X11
-	xkb.layout = "de";
+	xkb.layout = "us";
 	xkb.options = "eurosign:e,caps:escape";
 
 	# DWM (minimal Xorg Fallback)
@@ -172,9 +159,6 @@ services.gnome.gnome-keyring.enable = true;
 security.pam.services.sddm.enableGnomeKeyring = true;
 security.pam.services.hyprlock.enableGnomeKeyring = true;
 
-# Bluetooth managment
-services.blueman.enable = true;
-
 # Enable CUPS to print documents.
 services.printing.enable = true;
 
@@ -227,7 +211,6 @@ security.krb5 = {
   # Enable touchpad support (enabled default in most desktopManager).
   # services.libinput.enable = true;
 
-
 # /share
 users.groups.share = {};
 
@@ -264,13 +247,6 @@ systemd.tmpfiles.rules = [
 	shell = pkgs.zsh;
   };
 
-  users.users.kiosk = {
-  	isNormalUser = true;
-	home = "/var/kiosk";
-	homeMode = "700";
-	extraGroups = ["audio"];
-  };
-
 # Font Config
 fonts =  {
 	enableDefaultPackages = true;
@@ -339,7 +315,6 @@ environment.etc.crypttab = {
       		#backgroundbin = "$XDG_PICTURES_DIR/Wallpapers/current";
       		loginBackground = true;
       		})
-		networkmanagerapplet # Network Manager GUI
 	];
 	
 	programs = {
@@ -383,9 +358,7 @@ programs.gnupg.agent = {
 	enableSSHSupport = true;
 };
 
-security.polkit = {
+security.polkit.extraConfig = ''
-	enable = true;
-	extraConfig = ''
     polkit.addRule(function(action, subject) {
       if (
         subject.isInGroup("users")
@@ -401,7 +374,23 @@ security.polkit = {
       }
     })
   '';
-  };
+
+systemd.user.services =
+{
+	polkit-gnome-authentication-agent-1 = {
+			description = "polkit-gnome-authentication-agent-1";
+			wantedBy = [ "graphical-session.target" ];
+			wants = [ "graphical-session.target" ];
+			after = [ "graphical-session.target" ];
+			serviceConfig = {
+			Type = "simple";
+			ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+			Restart = "on-failure";
+			RestartSec = 1;
+			TimeoutStopSec = 10;
+		};
+	};
+};
 
 system.userActivationScripts.linktosharedfolder.text = ''
   if [[ ! -h "$XDG_MUSIC_DIR" ]]; then

flake.nix

@@ -38,12 +38,6 @@
           })
         ];
       };
-      Zuse2 = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-      	modules = [
-		./configuration.nix
-	];
-      };
     };
   };
 }

hardware-configuration.nix

@@ -8,30 +8,33 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/445ce2b5-db78-48b5-bde7-1aa3057bafae";
+    { device = "/dev/disk/by-uuid/2ba31f86-69eb-448c-a224-7bb228803f95";
       fsType = "btrfs";
     };
 
-  fileSystems."/var/lib/docker/btrfs" =
+  boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/b9457757-75bc-494e-adaa-87d772b93cbd";
-    { device = "/var/lib/docker/btrfs";
-      fsType = "none";
-      options = [ "bind" ];
-    };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3139-13CA";
+    { device = "/dev/disk/by-uuid/12CE-A600";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
+  fileSystems."/share" =
+    { device = "/dev/disk/by-uuid/61d599a8-170a-4e97-abb3-cd0cb32edac2";
+      fsType = "btrfs";
+    };
+
+  boot.initrd.luks.devices."share".device = "/dev/disk/by-uuid/87aa812d-b5dd-44b7-bb4d-303d6ac7c11a";
+
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/4fc7c055-f053-4bfa-a609-58ad9444450f"; }
+    [ { device = "/dev/disk/by-uuid/a07a0f5b-012b-4b37-b052-8e2da8615413"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -39,9 +42,7 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;