diff --git a/flake.lock b/flake.lock index 8de19d3..f71fedf 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733951607, + "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "type": "github" }, "original": { @@ -61,27 +61,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b4feb0e..108dfee 100644 --- 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 index 17a2003..f39bc0a 100644 --- 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 index 5719e7f..2870841 100644 --- 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 index c536884..ab4e546 100644 --- 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...