diff --git a/config/optional/sound.nix b/config/optional/sound.nix index 75fe859..adde0cc 100644 --- a/config/optional/sound.nix +++ b/config/optional/sound.nix @@ -14,7 +14,6 @@ lib.optionalAttrs (!minimal) { # > cat /proc/asound/card*/pcm*p/sub*/hw_params # Compare resamplers on: https://src.infinitewave.ca/ - sound.enable = false; # ALSA hardware.pulseaudio.enable = lib.mkForce false; security.rtkit.enable = true; services.pipewire = { diff --git a/flake.lock b/flake.lock index 81ce3e3..1c90ffe 100644 --- a/flake.lock +++ b/flake.lock @@ -1318,22 +1318,6 @@ "type": "github" } }, - "nixpkgs-gpu-screen-recorder": { - "locked": { - "lastModified": 1720133070, - "narHash": "sha256-fo/KKxICtGyQAyYwlvwxuCZSyGhoY4MPR55zf02Q104=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "032e70533b134ea30c0359886dcdec547134dbdd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "032e70533b134ea30c0359886dcdec547134dbdd", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1719876945, @@ -1686,7 +1670,6 @@ "nixos-hardware": "nixos-hardware", "nixos-nftables-firewall": "nixos-nftables-firewall", "nixpkgs": "nixpkgs", - "nixpkgs-gpu-screen-recorder": "nixpkgs-gpu-screen-recorder", "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks_5", "stylix": "stylix", diff --git a/flake.nix b/flake.nix index fda2ef6..adea651 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,6 @@ }; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-gpu-screen-recorder.url = "github:NixOS/nixpkgs/032e70533b134ea30c0359886dcdec547134dbdd"; nixvim = { url = "github:nix-community/nixvim"; diff --git a/pkgs/default.nix b/pkgs/default.nix index d583bd5..b5962bf 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -inputs: [ +_inputs: [ (import ./caddy.nix) (import ./scripts) (_final: prev: { @@ -33,8 +33,6 @@ inputs: [ wrapProgram $out/bin/nvim --add-flags "--clean" ''; }); - gpu-screen-recorder = prev.callPackage "${inputs.nixpkgs-gpu-screen-recorder}/pkgs/applications/video/gpu-screen-recorder/default.nix" {}; - gpu-screen-recorder-gtk = prev.callPackage "${inputs.nixpkgs-gpu-screen-recorder}/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix" {}; #pythonPackagesExtensions = # prev.pythonPackagesExtensions # ++ [ diff --git a/users/myuser/default.nix b/users/myuser/default.nix index f2a1c0f..f1a3456 100644 --- a/users/myuser/default.nix +++ b/users/myuser/default.nix @@ -1,5 +1,4 @@ { - inputs, config, lib, pkgs, @@ -68,6 +67,5 @@ in services.getty.autologinUser = myuser; # Allow screen recorder to access the framebuffer as root - imports = ["${inputs.nixpkgs-gpu-screen-recorder}/nixos/modules/programs/gpu-screen-recorder.nix"]; - programs.gpu-screen-recorder.wrapCapabilities = true; + programs.gpu-screen-recorder.enable = true; } diff --git a/users/myuser/dev/gdb.nix b/users/myuser/dev/gdb.nix index 9f79bc0..28071ab 100644 --- a/users/myuser/dev/gdb.nix +++ b/users/myuser/dev/gdb.nix @@ -23,8 +23,8 @@ ''; }); in { - home.packages = builtins.trace "WARN: reenable pwndbg later!" [ - #pwndbgWithDebuginfod + home.packages = [ + pwndbgWithDebuginfod pkgs.hotspot ];