update to nixos 24.11

tejing1 · Dec 12, 2024 · d5b03be · d5b03be
1 parent 7469b55
commit d5b03be
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,8 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";

diff --git a/homeConfigurations/tejing/windowmanager.nix b/homeConfigurations/tejing/windowmanager.nix
@@ -299,9 +299,15 @@ in
   };
 
   services.picom.enable = true;
-  services.picom.backend = "xrender";
-  services.picom.vSync = true;
-  services.picom.opacityRules = [ "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'" ];
+  xdg.configFile."picom/picom.conf".text = lib.mkForce ''
+    backend = "xrender";
+    unredir-if-possible = true;
+    vsync = true;
+    rules=(
+      { match =   "_NET_WM_STATE@[*] = '_NET_WM_STATE_HIDDEN'"; opacity = 0; },
+      { match = "! _NET_WM_STATE@[*] = '_NET_WM_STATE_HIDDEN'"; opacity = 1; },
+    )
+  '';
 
   gtk.enable = true;
   gtk.gtk3.bookmarks = [ "file:///home/tejing/data" ];

diff --git a/nixosConfigurations/tejingdesk/sound.nix b/nixosConfigurations/tejingdesk/sound.nix
@@ -2,4 +2,10 @@
   # Enable pulseaudio
   hardware.pulseaudio.enable = true;
   hardware.pulseaudio.support32Bit = true;
+
+  # Disable pipewire. It's now on by default when X is configured, and I don't want to switch just yet.
+  services.pipewire.enable = false;
+
+  # Really doesn't seem like it should be on by default. It's not that big, but still...
+  services.speechd.enable = false;
 }
diff --git a/nixosConfigurations/tejingdesk/xserver.nix b/nixosConfigurations/tejingdesk/xserver.nix
@@ -10,13 +10,16 @@
   nixpkgs.config.allowUnfree = true;
   services.xserver.videoDrivers = [ "nvidia" ];
 
+  # GeForce GTX 970 is too old for the open drivers
+  hardware.nvidia.open = false;
+
   # Enable experimental nvidia_drm framebuffer console
   hardware.nvidia.modesetting.enable = true;
   boot.kernelParams = [ "nvidia-drm.fbdev=1" ];
   boot.initrd.availableKernelModules = [ "nvidia" "nvidia_modeset" "nvidia_drm" "nvidia_uvm" ];
 
   # 32-bit graphics libraries
-  hardware.opengl.driSupport32Bit = true;
+  hardware.graphics.enable32Bit = true;
 
   environment.sessionVariables = {
     # I don't know why VA-API can't find the driver without this...