update

Author: randomizedcoder

hp/hp1/Makefile

@@ -21,7 +21,7 @@ rebuild:
 	#sudo nix-channel --update
 	#sudo nixos-rebuild switch
 	sudo nix flake update;
-	sudo nix-channel --update;
+	#sudo nix-channel --update;
 	sudo nixos-rebuild switch --flake .
 
 sync:

hp/hp1/home.nix

@@ -98,6 +98,9 @@
     dive
     # for pprof
     graphviz
+    #
+    #ffmpeg
+    ffmpeg-full
   ];
 
   programs.bash = {

hp/hp5/Makefile

@@ -21,7 +21,7 @@ rebuild:
 	#sudo nix-channel --update
 	#sudo nixos-rebuild switch
 	sudo nix flake update;
-	sudo nix-channel --update;
+	#sudo nix-channel --update;
 	sudo nixos-rebuild switch --flake .
 
 sync:

hp/hp5/configuration.nix

@@ -55,8 +55,20 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   # https://nixos.wiki/wiki/Linux_kernel
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  #boot.kernelPackages = pkgs.linuxPackages_rpi4
+  #boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages;
+  #boot.kernelPackages = pkgs.linuxPackages_4_19; # 4.19.319
+  #boot.kernelPackages = pkgs.linuxPackages_5_4; # 5.4.281
+  #boot.kernelPackages = pkgs.linuxPackages_5_15; # 5.15.164
+  #boot.kernelPackages = pkgs.linuxPackages_6_1; # 6.1.103
+  #boot.kernelPackages = pkgs.linuxPackages_6_8; # 6.8
+  #boot.kernelPackages = pkgs.linuxPackages_6_10; # 6.10
+
+  boot.blacklistedKernelModules = [ "nouveau" ];
+
+  boot.extraModulePackages = with config.boot.kernelPackages; [
+    nvidia_x11
+  ];
 
   nix = {
     gc = {
@@ -76,17 +88,49 @@
   # https://nlewo.github.io/nixos-manual-sphinx/configuration/ipv4-config.xml.html
   networking.hostName = "hp5";
 
-  services.lldpd.enable = true;
-
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   networking.networkmanager.enable = false;
 
-  # Set your time zone.
   time.timeZone = "America/Los_Angeles";
 
+
+  # hardware.opengl.enable = true;
+  # was renamed to:
+  hardware.graphics = {
+    enable = true;
+    # P620
+    # Linux x64 (AMD64/EM64T) Display Driver 535.146.02 | Linux 64-bit
+    # https://www.nvidia.com/en-us/drivers/details/216820/
+    # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/os-specific/linux/nvidia-x11/default.nix
+    # version = "535.154.05";
+    # package = config.boot.kernelPackages.nvidiaPackages.dc_535;
+    # version = "535.216.01";
+    #package = config.boot.kernelPackages.nvidiaPackages.legacy_535;
+    extraPackages = with pkgs; [
+      vdpauinfo             # sudo vainfo
+      libva-utils           # sudo vainfo
+      # https://discourse.nixos.org/t/nvidia-open-breaks-hardware-acceleration/58770/2
+      nvidia-vaapi-driver
+      vaapiVdpau
+    ];
+  };
+
+  # https://wiki.nixos.org/w/index.php?title=NVIDIA
+  # https://nixos.wiki/wiki/Nvidia
+  # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/hardware/video/nvidia.nix
+  # https://github.com/NixOS/nixpkgs/blob/nixos-24.11/nixos/modules/hardware/video/nvidia.nix
+  hardware.nvidia = {
+    # https://github.com/NixOS/nixpkgs/pull/326369 hits stable
+    modesetting.enable = true;
+    powerManagement = {
+      enable = true;
+    };
+    nvidiaSettings = true;
+  };
+
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
@@ -123,10 +167,21 @@
 
   services.openssh.enable = true;
 
+
+  services.lldpd.enable = true;
+
   services.timesyncd.enable = true;
 
   services.fstrim.enable = true;
 
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    ipv4 = true;
+    ipv6 = true;
+    openFirewall = true;
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

hp/hp5/home-manager.nix

@@ -98,6 +98,9 @@
     dive
     # for pprof
     graphviz
+    #
+    ffmpeg
+    #ffmpeg-full
   ];
 
   programs.bash = {

hp/hp5/home.nix

@@ -3,6 +3,9 @@
 {
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
+
+  nixpkgs.config.nvidia.acceptLicense = true;
+
   # $ nix search wget
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
@@ -25,5 +28,11 @@
     #snmp seems to be needed by lldpd
     net-snmp
     neofetch
+    #
+    #nvidia
+    vdpauinfo             # sudo vainfo
+    libva-utils           # sudo vainfo
+    # https://discourse.nixos.org/t/nvidia-open-breaks-hardware-acceleration/58770/2
+    nvidia-vaapi-driver
   ];
 }

hp/hp5/systemPackages.nix

@@ -1,5 +1,5 @@
 #
-# nixos/t/Makefile
+# nixos/laptops/t/Makefile
 #
 EXPECTED_HOSTNAME := t
 
@@ -16,6 +16,10 @@ else
 endif
 
 rebuild:
+	sudo nix flake update;
+	sudo nixos-rebuild switch --flake .
+
+rebuild_old:
 	# sudo cp ./flake.nix /etc/nixos/
 	# sudo cp ./flake.lock /etc/nixos/
 	# sudo cp ../../modules/* /etc/nixos/
@@ -26,9 +30,9 @@ rebuild:
 	# sudo cp ./*.nix /etc/nixos/
 	# sudo nix-channel --update
 	# sudo nixos-rebuild switch
-	sudo cp ./* /etc/nixos/
+	#sudo cp ./* /etc/nixos/
 	sudo nix flake update;
-	sudo nix-channel --update;
+	#sudo nix-channel --update;
 	sudo nixos-rebuild switch --flake .
 
 update: