diff --git a/flake.lock b/flake.lock index 48747c3..3eb07d9 100644 --- a/flake.lock +++ b/flake.lock @@ -292,20 +292,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", "lastModified": 1748186689, "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", "owner": "GNOME", "repo": "gnome-shell", "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", "type": "github" }, "original": { "owner": "GNOME", "ref": "48.2", - "ref": "48.2", "repo": "gnome-shell", "type": "github" } @@ -317,11 +313,11 @@ ] }, "locked": { - "lastModified": 1751462021, - "narHash": "sha256-RUKSK5JFZ15hsQK8qgthbzP0iTuBlAYfnkH8tjz6SPU=", + "lastModified": 1751589297, + "narHash": "sha256-3q35cq6BPuwIRL3IoVKYPc72r3OleeuRyf4YAPjEqzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6c53df3b9c809e3b4b30d515e18bfa4c6f079254", + "rev": "83f978812c37511ef2ffaf75ffa72160483f738a", "type": "github" }, "original": { @@ -382,14 +378,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1751335430, - "narHash": "sha256-OVP1yknJHvRK+eIy56UZsf9kUXSmwlwitPa9dZ0/HWo=", - "lastModified": 1751335430, - "narHash": "sha256-OVP1yknJHvRK+eIy56UZsf9kUXSmwlwitPa9dZ0/HWo=", + "lastModified": 1751615996, + "narHash": "sha256-Hys3QZbSRQLS+na6nitA2Pd7mADZXPR9fN4UpZdC01Q=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fab3c874b28d95696225b4e575c3b6dc5d6058fe", - "rev": "fab3c874b28d95696225b4e575c3b6dc5d6058fe", + "rev": "2f422b6ca7f4cd1f368b719fe27727e375b1fc39", "type": "github" }, "original": { @@ -500,11 +493,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1751444861, - "narHash": "sha256-zEQOZt97TVDUxVX/s6JY+Yvjm7ri8uejXQ0zOrdaEy0=", + "lastModified": 1751592500, + "narHash": "sha256-yntDCqXzrfMzUkzvwPjCyK1AfKwkBXyVeXItmBRHAUo=", "owner": "kaylorben", "repo": "nixcord", - "rev": "da2507d7613534513024ed07282f75ffef1cb8f0", + "rev": "53ee7e4bd8cf17d055fcb89eea7465f0d96aca9b", "type": "github" }, "original": { @@ -515,14 +508,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -564,14 +554,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1751479989, + "narHash": "sha256-M5KgdpVBVcW4HRVq9/OSRbrxlwsQ1ogEKqnvzsClDqU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "34627c90f062da515ea358360f448da57769236e", "type": "github" }, "original": { @@ -599,11 +586,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751064264, - "narHash": "sha256-FQQyEt6/Q3FNeCkY9Gu1JeKBLzRQnZL+WYkjc53shLM=", - "owner": "NixOS", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c0874d923d0fd19d73d95a02820acd27ae11e320", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -698,11 +685,11 @@ ] }, "locked": { - "lastModified": 1751354716, - "narHash": "sha256-bLMNn3gh09gtkIEwZW3USt4ehLrmwmfnb3rqahYBI+4=", + "lastModified": 1751521639, + "narHash": "sha256-9Iy9VHgdMMIEZDn1XHkD0+AOy9RFGYBbXKEh3RiPlKE=", "ref": "refs/heads/master", - "rev": "f681e2016fd71b42985bd520b3a20c62488582e9", - "revCount": 599, + "rev": "0e6518a7061b49693e2d8d8b9a2b787c6221ae61", + "revCount": 601, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -748,11 +735,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751405764, - "narHash": "sha256-romzrDMOWMPZioeChZnrugwaUSpROfkWClHhWHuRnRQ=", + "lastModified": 1751602277, + "narHash": "sha256-mlJeMDyj+B9QYNw/f9YdlBzvq6mcQ3dx5qjfepzV70I=", "owner": "nix-community", "repo": "stylix", - "rev": "5b257989a8337dddc22aa04a70d3665d0384abef", + "rev": "3c73dee2dbdf242a16a6e929f3e574dd0694d85a", "type": "github" }, "original": { @@ -933,11 +920,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1751440815, - "narHash": "sha256-cBEcG90ahVVPMKEHiyn13KT7cxpcEwSOqrLhgz5/M9k=", + "lastModified": 1751599118, + "narHash": "sha256-3a47LxEZ7751Wd5upwZa8psX5mRsYACQgS2WxY5zitc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a37c444f51b3e7df8ea3333c57a4154c6b09dc39", + "rev": "a3566f5b9c6ec2fa490976051889ebada20910b4", "type": "github" }, "original": { diff --git a/home/mrfluffy.nix b/home/mrfluffy.nix index 83a81b8..7f9c177 100755 --- a/home/mrfluffy.nix +++ b/home/mrfluffy.nix @@ -99,7 +99,7 @@ in ".config/nixpkgs/config.nix".text = '' { allowUnfree = true; } ''; - ".config/doom".source = ../dots/doom; + #".config/doom".source = ../dots/doom; ".config/quickshell".source = ../dots/quickshell; #".config/kitty".source = ../../universal/dots/kitty; #".config/nvim".source = ../../universal/dots/nvim; diff --git a/home/work.nix b/home/work.nix index 180a94f..8ec33ff 100755 --- a/home/work.nix +++ b/home/work.nix @@ -100,7 +100,7 @@ in ".config/nixpkgs/config.nix".text = '' { allowUnfree = true; } ''; - ".config/doom".source = ../dots/doom; + #".config/doom".source = ../dots/doom; ".config/quickshell".source = ../dots/quickshell; #".config/kitty".source = ../../universal/dots/kitty; #".config/nvim".source = ../../universal/dots/nvim; diff --git a/system/boot.nix b/system/boot.nix index 8a0edd7..ba50149 100755 --- a/system/boot.nix +++ b/system/boot.nix @@ -16,6 +16,9 @@ efi.canTouchEfiVariables = true; }; initrd.kernelModules = lib.mkMerge [ + [ + "btusb" + ] (lib.mkIf (systemName == "laptop") [ "kvm" ]) @@ -25,9 +28,11 @@ ]) ]; - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.linuxPackages_latest; kernelModules = [ "v4l2loopback" ]; - extraModulePackages = [ pkgs.linuxPackages_zen.v4l2loopback ]; + extraModulePackages = [ + pkgs.linuxPackages_latest.v4l2loopback + ]; kernelParams = lib.mkMerge [ (lib.mkIf (systemName == "laptop") [ "ipv6e=1" diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix index 9ef74b7..792bd64 100755 --- a/system/nixOSPkgs.nix +++ b/system/nixOSPkgs.nix @@ -59,6 +59,7 @@ in { programs.gamescope = { enable = true; + }; nixpkgs.config = { allowUnfree = true; @@ -89,10 +90,17 @@ in programs.virt-manager.enable = true; programs.zsh.enable = true; programs.corectrl.enable = true; + programs.opengamepadui = { + enable = true; + gamescopeSession.enable = true; + }; programs.steam = { enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + gamescopeSession = { + enable = true; + }; }; # enable dynamic bin executables programs.nix-ld.enable = true; @@ -178,6 +186,7 @@ in gnumake gcc libtool + ladspaPlugins inputs.nix-alien.packages.${pkgs.system}.nix-alien ]; } diff --git a/system/services.nix b/system/services.nix index b1d4a30..c510b6c 100755 --- a/system/services.nix +++ b/system/services.nix @@ -40,62 +40,13 @@ pulse.enable = true; jack.enable = true; extraConfig.pipewire = { - # the key "00-clock-rate" names the drop-in file - "00-clock-rate" = { - # these properties go under [context.properties] in pipewire.conf - context.properties = { - # force the graph sample rate + "92-low-latency" = { + "context.properties" = { "default.clock.rate" = 48000; - # tell PipeWire which other rates you allow it to switch to - "default.clock.allowed-rates" = [ - 44100 - 48000 - 96000 - ]; - # quantum = number of frames per period (i.e. buffer size) - "default.clock.min-quantum" = 32; - "default.clock.max-quantum" = 8192; + "default.clock.allowed-rates" = [ 48000 ]; }; }; - "99-input-denoising" = { - "context.modules" = [ - { - "name" = "libpipewire-module-filter-chain"; - "args" = { - "node.description" = "Noise Canceling source"; - "media.name" = "Noise Canceling source"; - "filter.graph" = { - "nodes" = [ - { - "type" = "ladspa"; - "name" = "rnnoise"; - "plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; - "label" = "noise_suppressor_mono"; - "control" = { - "VAD Threshold (%)" = 20.0; - "VAD Grace Period (ms)" = 200; - "Retroactive VAD Grace (ms)" = 0; - }; - } - ]; - }; - - "capture.props" = { - "node.name" = "effect_input.rnnoise"; - "node.passive" = true; - "audio.rate" = 48000; - }; - "playback.props" = { - "node.name" = "effect_output.rnnoise"; - "media.class" = "Audio/Source"; - "audio.rate" = 48000; - }; - }; - } - ]; - }; }; - }) (lib.mkIf (systemName == "pc") { enable = true; @@ -106,49 +57,63 @@ extraConfig.pipewire = { "92-low-latency" = { "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ 48000 ]; + "default.clock.rate" = 96000; + "default.clock.allowed-rates" = [ + 44100 + 48000 + 96000 + ]; }; }; - "99-input-denoising" = { - "context.modules" = [ - { - "name" = "libpipewire-module-filter-chain"; - "args" = { - "node.description" = "Noise Canceling source"; - "media.name" = "Noise Canceling source"; - "filter.graph" = { - "nodes" = [ - { - "type" = "ladspa"; - "name" = "rnnoise"; - "plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; - "label" = "noise_suppressor_mono"; - "control" = { - "VAD Threshold (%)" = 50.0; - "VAD Grace Period (ms)" = 200; - "Retroactive VAD Grace (ms)" = 0; - }; - } - ]; - }; - - "capture.props" = { - "node.name" = "effect_input.rnnoise"; - "node.passive" = true; - "audio.rate" = 48000; - }; - "playback.props" = { - "node.name" = "effect_output.rnnoise"; - "media.class" = "Audio/Source"; - "audio.rate" = 48000; - }; - }; - } - ]; - }; + #"93-mic-gain" = { + # "context.modules" = [ + # { + # name = "libpipewire-module-filter-chain"; + # args = { + # node.description = "Mic Gain Boost"; + # media.name = "Mic Gain Boost"; + # filter.graph = { + # nodes = [ + # { + # type = "ladspa"; + # name = "gain"; + # plugin = "amp"; # LADSPA amplifier plugin + # label = "amp_mono"; + # control = { + # "Gain" = 12.0; # Boost gain by 12 dB (adjust as needed) + # }; + # } + # ]; + # }; + # capture.props = { + # "node.name" = "effect_input.mic_boost"; + # "audio.position" = [ "MONO" ]; + # }; + # playback.props = { + # "node.name" = "effect_output.mic_boost"; + # "audio.position" = [ "MONO" ]; + # }; + # }; + # } + # ]; + #}; }; - + #wireplumber.extraConfig = { + # "monitor.alsa.rules" = { + # rule1 = { # Give the rule a unique name + # matches = [ + # { "node.name" = "~alsa_input.*"; } + # ]; + # actions = { + # update-props = { + # "api.alsa.soft-mixer" = true; + # "api.alsa.volume" = "100%"; + # "api.alsa.headroom" = 0; + # }; + # }; + # }; + # }; + #}; }) ]; @@ -165,7 +130,7 @@ # List services that you want to enable: services.emacs = { enable = true; - package = pkgs.emacs-gtk; # replace with emacs-gtk, or a version provided by the community overlay if desired. + package = pkgs.emacs-pgtk; # replace with emacs-gtk, or a version provided by the community overlay if desired. }; services.sunshine = lib.mkIf (systemName == "pc") { enable = true;