From 28456e0a79c58f9d5a1d2dbb28f170f6a85b271e Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Mon, 30 Jun 2025 19:47:18 -0700 Subject: [PATCH] audio --- extras/dev.nix | 193 +++++++++++++++++++++---------------------- extras/gaming.nix | 61 +------------- systems/BASED.nix | 1 - systems/NOlaptop.nix | 4 +- 4 files changed, 100 insertions(+), 159 deletions(-) diff --git a/extras/dev.nix b/extras/dev.nix index 33ed374..1c9f9f3 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -1,109 +1,108 @@ {pkgs, ...}: { - services.scx.enable = true; - services.scx.scheduler = "scx_lavd"; # default is "scx_rustland" - boot.kernelPackages = pkgs.linuxPackages_latest; + services.scx.enable = true; + services.scx.scheduler = "scx_lavd"; # default is "scx_rustland" - environment.systemPackages = with pkgs; [ - # act - # asm-lsp - # bash-language-server - # digital - # etcher - # fontforge - # freecad - # git-cliff - # lua-language-server - # lychee # link checker - # markdown-oxide # markdown lsp - # quickemu - # radicle-node - # vulkan-loader - b3sum - delta - devenv - direnv - gh - hyperfine - jujutsu - just - lldb - mask - mprocs - nomachine-client - presenterm - qFlipper - qemu - sd - sshfs - taplo # toml lsp - tio - tokei # repo code stats - typos + environment.systemPackages = with pkgs; [ + # act + # asm-lsp + # bash-language-server + # digital + # etcher + # fontforge + # freecad + # git-cliff + # lua-language-server + # lychee # link checker + # markdown-oxide # markdown lsp + # quickemu + # radicle-node + # vulkan-loader + b3sum + delta + devenv + direnv + gh + hyperfine + jujutsu + just + lldb + mask + mprocs + nomachine-client + presenterm + qFlipper + qemu + sd + sshfs + taplo # toml lsp + tio + tokei # repo code stats + typos - # # databases - # sqlite - # sqls - # sqlx-cli - # sea-orm-cli - # rainfrog + # # databases + # sqlite + # sqls + # sqlx-cli + # sea-orm-cli + # rainfrog - # # arduino - # arduino-language-server - # arduino-cli - # pkgsCross.avr.buildPackages.gcc - # avrdude - # ravedude + # # arduino + # arduino-language-server + # arduino-cli + # pkgsCross.avr.buildPackages.gcc + # avrdude + # ravedude - # c - clang - clang-tools - gcc - gdb - gnumake + # c + clang + clang-tools + gcc + gdb + gnumake - # nix - nil - alejandra + # nix + nil + alejandra - # python - # pypy3 - python3 - uv - ruff + # python + # pypy3 + python3 + uv + ruff - # rust - cargo-binstall - bacon - cargo-expand - cargo-feature - cargo-generate - cargo-watch - elf2uf2-rs - flip-link - mdbook - mold-wrapped - probe-rs - rustup - rusty-man - sccache - trunk - wasm-bindgen-cli - ]; + # rust + cargo-binstall + bacon + cargo-expand + cargo-feature + cargo-generate + cargo-watch + elf2uf2-rs + flip-link + mdbook + mold-wrapped + probe-rs + rustup + rusty-man + sccache + trunk + wasm-bindgen-cli + ]; - hardware.flipperzero.enable = true; + hardware.flipperzero.enable = true; - services.udev.extraRules = '' - SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb" - SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port", SYMLINK+="ttyBmpTarg" - ''; + services.udev.extraRules = '' + SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb" + SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port", SYMLINK+="ttyBmpTarg" + ''; - virtualisation.docker = { - enable = true; - storageDriver = "btrfs"; - }; - # virtualisation.docker.rootless = { - # enable = true; - # setSocketVariable = true; - # }; - users.extraGroups.docker.members = ["tao"]; + virtualisation.docker = { + enable = true; + storageDriver = "btrfs"; + }; + # virtualisation.docker.rootless = { + # enable = true; + # setSocketVariable = true; + # }; + users.extraGroups.docker.members = ["tao"]; } diff --git a/extras/gaming.nix b/extras/gaming.nix index 23ebfdc..73586d3 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -1,20 +1,9 @@ -{ - pkgs, - lib, - ... -}: -# let -# if_desktop = -# if lib.strings.hasPrefix "NOcomputer" (builtins.readFile /etc/hostname) -# then true -# else false; -# in -{ - # programs.noisetorch.enable = true; +{pkgs, ...}: { # aagl.url = "github:ezKEa/aagl-gtk-on-nix"; # aagl.inputs.nixpkgs.follows = "nixpkgs"; environment.systemPackages = with pkgs; [ + easyeffects # parsec-bin # yuzu # nintendo can suck the shit out of my asshole gamemode @@ -58,50 +47,4 @@ groups = ["wheel"]; } ]; - - # THE FINALS audio borked - # services.pipewire.enable = !if_desktop; - # hardware.pulseaudio.enable = if_desktop; - # hardware.pulseaudio.support32Bit = if_desktop; - # services.pipewire.extraConfig = { - # pipewire."99-low-latency" = { - # context.properties = { - # default.allowed-rates = [44100 48000 96000 192000]; - # default.clock.rate = 192000; - # default.clock.quantum = 32; - # default.clock.min-quantum = 32; - # default.clock.max-quantum = 32; - # }; - # context.modules = [ - # { - # name = "libpipewire-module-rt"; - # args = { - # nice.level = -12; - # rt.prio = 89; - # rt.time.soft = 200000; - # rt.time.hard = 200000; - # }; - # flags = ["ifexists nofail"]; - # } - # ]; - # }; - # pipewire-pulse."99-low-latency" = { - # context.modules = [ - # { - # name = "libpipewire-module-protocol-pulse"; - # args = { - # pulse.min.req = "32/192000"; - # pulse.default.req = "32/192000"; - # pulse.max.req = "32/192000"; - # pulse.min.quantum = "32/192000"; - # pulse.max.quantum = "32/192000"; - # }; - # } - # ]; - # stream.properties = { - # node.latency = "32/192000"; - # resample.quality = 1; - # }; - # }; - # }; } diff --git a/systems/BASED.nix b/systems/BASED.nix index 81e854c..ddd732c 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -112,7 +112,6 @@ services.smartd.enable = true; # services.btrfs.autoScrub.enable = lib.mkDefault true; - # hardware.pulseaudio.enable = lib.mkDefault false; security.rtkit.enable = true; services.pipewire = { enable = lib.mkDefault true; diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index f4b7825..fed5e90 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -15,10 +15,10 @@ { environment.etc."alsa-card-profile/analog-input-internal-mic.conf".source = ../extras/analog-input-internal-mic.conf; - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.extraPackages = with pkgs; [ amdvlk ]; - hardware.opengl.extraPackages32 = with pkgs; [ + hardware.graphics.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; services.xserver.videoDrivers = [