hosts/base-configuration.nix

@@ -1,36 +1,36 @@
 { config, pkgs, ... }:
 
 {
-  	# DO NOT change this unless you know what you're doing!
+  # DO NOT change this unless you know what you're doing!
-  	system.stateVersion = "24.11";
+  system.stateVersion = "24.11";
 
-  	environment.variables = {
+  environment.variables = {
-    	XDG_SESSION_TYPE = "wayland";
+    XDG_SESSION_TYPE = "wayland";
-    	XDG_CURRENT_DESKTOP = "Hyprland";
+    XDG_CURRENT_DESKTOP = "Hyprland";
-    	NIXPKGS_ALLOW_INSECURE = 1;
+    NIXPKGS_ALLOW_INSECURE = 1;
-  	};
+  };
 
-  	nixpkgs.config = {
+  nixpkgs.config = {
-    	allowInsecurePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [
+    allowInsecurePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [
-      		"fluffychat-linux"
+      "fluffychat-linux"
-      		"olm"
+      "olm"
-	  		"python312Packages.youtube-dl"
+	  "python312Packages.youtube-dl"
-    	];
+    ];
-  	};
+  };
 
-  	environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [
-    	alacritty
+    alacritty
-    	vim
+    vim
-    	bluez
+    bluez
-    	xwayland
+    xwayland
-    	unzip
+    unzip
-		networkmanager
+	networkmanager
-  	];
+  ];
 
-	services.automatic-timezoned.enable = true;
+  services.automatic-timezoned.enable = true;
 
-  	boot.loader.grub.enable = false;
+  boot.loader.grub.enable = false;
-	boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.enable = true;
 
-	programs.xwayland.enable = true;
+  programs.xwayland.enable = true;
 }

hosts/default.nix

@@ -7,9 +7,7 @@ let
   	pkgs = inputs.nixpkgs.legacyPackages.${system};
   	mkSystem = pkgs: hostname:
     	pkgs.lib.nixosSystem {
-      		specialArgs = {
+      		specialArgs = { inherit inputs; };
-				inherit inputs; 
-			};
       		modules = [
         		./base-configuration.nix
         		./${hostname}

hosts/hulk/modules.nix

@@ -1,9 +1,10 @@
 { inputs, ... }:
 
 {
-	imports = [
+  imports = [
-    	../../modules/greetd.nix
+    ../../modules/greetd.nix
-    	../../modules/nvidia-support.nix
+    ../../modules/nvidia-support.nix
-    	../../modules/fingerprint.nix
+    ../../modules/open-fprint-suspend-fix.nix
-  	];
+    inputs.fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
+  ];
 }

hosts/hulk/networking.nix

@@ -8,16 +8,4 @@ in {
 
 	networking.wireless.enable = pkgs.lib.mkIf wirelessEnabled true;
 	networking.wireless.userControlled.enable = pkgs.lib.mkIf wirelessEnabled true;
-
-	networking.firewall = {
-      		trustedInterfaces = [ "p2p-wl+" ];
-      		allowedTCPPorts = [
-        		7236
-        		7250
-      		];
-      		allowedUDPPorts = [
-        		7236
-        		5353
-      		];
-	};
 }

hosts/hulk/programs.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 
 {
-	programs.adb.enable = true;
 	programs.thunar.enable = true;
 	
 	programs.thunar.plugins = with pkgs.xfce; [

hosts/hulk/services.nix

@@ -18,11 +18,24 @@
   	};
 
 	security.rtkit.enable = true;
+	services.pipewire = {
+  		enable = true;
+  		alsa.enable = false;
+  		alsa.support32Bit = true;
+  		pulse.enable = true;
+  		jack.enable = true;
+	};
+
 	systemd.services.bluetooth.serviceConfig.ExecStart = pkgs.lib.mkForce [
   		""
   		"${pkgs.bluez}/libexec/bluetooth/bluetoothd -f /etc/bluetooth/main.conf -C"
 	];
 
+	hardware.bluetooth.enable = true;
+	hardware.bluetooth.powerOnBoot = true;
+
+	services.blueman.enable = true;
+
 	services.gvfs.enable = true;
 	services.tlp = {
       	enable = true;
@@ -32,25 +45,5 @@
 		};
 	};
 
-	services.geoclue2 = {
-    	enableWifi = true;
-    	geoProviderUrl = "https://api.beacondb.net/v1/geolocate";
-	};
-
 	services.dbus.enable = true;
-	services.pipewire = {
-    	enable = true;
-    	alsa.enable = true;
-    	alsa.support32Bit = true;
-    	pulse.enable = true;
-    	jack.enable = true;
-	};
-
-  	hardware.bluetooth = {
-    	enable = true;
-    	powerOnBoot = true;
-  	};
-
-	services.blueman.enable = true;
-	hardware.enableAllFirmware = true;
 }

hosts/hulk/users.nix

@@ -1,16 +1,16 @@
 { pkgs, ... }:
 
 let
-	username = "sadorowo";
+  username = "sadorowo";
-	fullname = "Franek";
+  fullname = "Franek";
-	preferredShell = pkgs.fish;
+  preferredShell = pkgs.fish;
 in {
-	users.users.${username} = {
+  users.users.${username} = {
-    	isNormalUser = true;
+    isNormalUser = true;
-    	description = fullname;
+    description = fullname;
-    	home = "/home/${username}";
+    home = "/home/${username}";
-    	extraGroups = [ "wheel" "networkmanager" "plugdev" "adbusers" ];
+    extraGroups = [ "wheel" "networkmanager" ];
-    	shell = preferredShell;
+    shell = preferredShell;
-    	ignoreShellProgramCheck = true; # Will do it later in profile configuration
+    ignoreShellProgramCheck = true; # Will do it later in profile configuration
-  	};
+  };
 }

modules/open-fprint-suspend-fix.nix

@@ -1,15 +1,11 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
-	options.services.fingerprint-fix.enable = lib.mkEnableOption "Enable support for fingerprint for P51S-like ThinkPads.";
+	options.services.fingerprint-fix.enable = lib.mkEnableOption "Enable systemd service to restart fingerprint services after suspend.";
 	options.services.fingerprint-fix.calibDataFile = lib.mkOption {
 		description = "Path to calibration data file.";
 	};
 
-	imports = [
-		inputs.fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
-	];
-
   	config = lib.mkIf config.services.fingerprint-fix.enable {
     	# Needed because we're getting TLS error with open-fprintd-resume
 		systemd.services.validity-restart = let
@@ -17,8 +13,11 @@
     	in {
     	  	description = "Restart services to fix fingerprint integration";
     	  	wantedBy = targets;
-    	 	after = targets;
+    	  	after = targets;
-    	  	serviceConfig.ExecStart = "systemctl restart open-fprintd python3-validity";
+    	  	serviceConfig = {
+    	    	type = "oneshot";
+    	    	ExecStart = "systemctl restart python3-validity.service";
+    	  	};
     	};
 
 		services."06cb-009a-fingerprint-sensor" = {
@@ -27,9 +26,6 @@
         	calib-data-file = config.services.fingerprint-fix.calibDataFile;
     	};
 
-		security.pam.services.su.fprintAuth = true;
+		services.fprintd.enable = lib.mkForce true; # Fprintd is not working with P51s
-		security.pam.services.sudo.fprintAuth = true;
+  };
-		security.pam.services.login.fprintAuth = true;
-		security.pam.services.greetd.fprintAuth = true;
-	};
 }

profiles/hulk/default.nix

@@ -8,6 +8,7 @@ in {
     	./packages.nix 		 # Packages to install
     	./programs.nix 		 # Programs to enable
 		./theme.nix 		 # System-wide/GTK theme
+		./portal.nix 		 # Desktop portals
 	];
 
   	home = {
@@ -24,4 +25,3 @@ in {
   	programs.home-manager.enable = true;
   	home.stateVersion = "24.11"; # DO NOT change this unless you know what you're doing!
 }
-

profiles/hulk/packages.nix

@@ -44,8 +44,7 @@ in {
       		starship
 			firefox-beta-bin
 			thunderbird-bin
-			youtube-music
+			element-desktop
-			fluffychat
 			libreoffice-qt6-fresh
 			gimp
 			vscodium git nodejs
@@ -57,6 +56,7 @@ in {
 			greetd.greetd greetd.tuigreet
 			playerctl
 			adwaita-icon-theme
+			darkman
 			android-tools
 			filezilla
 			bitwarden-desktop

profiles/hulk/portal.nix

@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+
+let
+  	portals-config = pkgs.writeTextDir "share/xdg-desktop-portal/portals/portals.conf" ''
+    	[preferred]
+    	default=hyprland
+    	org.freedesktop.impl.portal.Settings=darkman
+  	'';
+  	packages = [
+    	pkgs.xdg-desktop-portal
+    	pkgs.xdg-desktop-portal-hyprland
+    	pkgs.xdg-desktop-portal-gtk
+    	pkgs.darkman
+  	];
+  	portals = pkgs.symlinkJoin {
+    	name = "xdg-portals";
+    	paths = [ portals-config ] ++ packages;
+    	pathsToLink = [
+      		"/share/xdg-desktop-portal/portals"
+      		"/share/applications"
+    	];
+  	};
+in {
+  	home.sessionVariables = {
+    	XDG_DESKTOP_PORTAL_DIR = "${portals}/share/xdg-desktop-portal/portals";
+  	};
+  	
+	home.packages = packages;
+}

profiles/hulk/programs.nix

@@ -13,36 +13,21 @@
     	];
   	};
 
-	programs.obs-studio = {
-		enable = true;
-		plugins = with pkgs.obs-studio-plugins; [
-			obs-backgroundremoval
-      		obs-pipewire-audio-capture
-			#advanced-scene-switcher
-			obs-tuna
-			obs-move-transition
-			waveform
-			wlrobs
-		];
-	};
-
 	services.darkman = {
     	enable = true;
     	darkModeScripts = {
-        	theme = ''
+        	gtk-theme = ''
-				${pkgs.dconf}/bin/dconf write\
+          		${pkgs.dconf}/bin/dconf write\
           		/org/gnome/desktop/interface/color-scheme "'prefer-dark'"
         	'';
 
 			wallpaper = ''
 				$HOME/.config/hypr/scripts/random-wallpaper.sh
 			'';
-
-			pywalfox = "command -v pywalfox &>/dev/null && pywalfox dark && pywalfox update";
       	};
 
       	lightModeScripts = {
-        	theme = ''
+        	gtk-theme = ''
           		${pkgs.dconf}/bin/dconf write\
           		/org/gnome/desktop/interface/color-scheme "'prefer-light'"
         	'';
@@ -50,10 +35,8 @@
 			wallpaper = ''
 				$HOME/.config/hypr/scripts/random-wallpaper.sh
 			'';
-
-			pywalfox = "command -v pywalfox &>/dev/null && pywalfox light && pywalfox update";
       	};
 
-      	settings.usegeoclue = true;
+      	settings.usegeoclue = false;
     };
 }

profiles/hulk/theme.nix

@@ -1,17 +1,17 @@
 { pkgs, inputs, ... }:
 
 let
-  	nerdfonts = (pkgs.nerdfonts.override {
+  nerdfonts = (pkgs.nerdfonts.override {
-    	fonts = [
+    fonts = [
-      		"CascadiaCode"
+      "CascadiaCode"
-      		"JetBrainsMono"
+      "JetBrainsMono"
-      		"FiraCode"
+      "FiraCode"
-      		"SpaceMono"	  
+      "SpaceMono"	  
-    	];
+    ];
-  	});
+  });
 
-  	cursor-theme = "Bibata-Modern-Classic";
+  cursor-theme = "Bibata-Modern-Classic";
-	cursor-pkg = pkgs.bibata-cursors;
+  cursor-pkg = pkgs.bibata-cursors;
 in
 {
 	home = {