From fa7db1fac6caa919fbd26d16224815be95413bc3 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 12 May 2025 09:59:58 +0200 Subject: [PATCH 1/4] hy3: change back to master-branch --- flake.lock | 11 +++++------ flake.nix | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6ddeb59..fc2d98b 100644 --- a/flake.lock +++ b/flake.lock @@ -558,17 +558,16 @@ ] }, "locked": { - "lastModified": 1746522256, - "narHash": "sha256-NRaB2q1QoT8fu9oMl7rS/X3KHW9hzC+rAqB2XDZhKJI=", - "owner": "Daholli", + "lastModified": 1747021814, + "narHash": "sha256-dYxkdbg6yj8HhuBkCmklMQVR17N7P32R8ir7b7oNxm4=", + "owner": "outfoxxed", "repo": "hy3", - "rev": "a9caea020e457b4c5868913eea391beffd5fc22c", + "rev": "6b40ba5d99992b4006d936220b2bbea26e55a591", "type": "github" }, "original": { - "owner": "Daholli", + "owner": "outfoxxed", "repo": "hy3", - "rev": "a9caea020e457b4c5868913eea391beffd5fc22c", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 9e78077..311760a 100644 --- a/flake.nix +++ b/flake.nix @@ -38,9 +38,7 @@ }; hy3 = { - # url = "github:outfoxxed/hy3"; - - url = "github:Daholli/hy3/a9caea020e457b4c5868913eea391beffd5fc22c"; + url = "github:outfoxxed/hy3"; inputs.hyprland.follows = "hyprland"; }; From 780a1416094360b10df4a60e58d3fa2543e20978 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 12 May 2025 10:00:42 +0200 Subject: [PATCH 2/4] factorio-headless: get pyanodons running --- flake.lock | 8 ++++---- flake.nix | 2 +- modules/nixos/services/factorio-server/default.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index fc2d98b..2cc27ac 100644 --- a/flake.lock +++ b/flake.lock @@ -1152,17 +1152,17 @@ }, "nixpkgs-latest-factorio": { "locked": { - "lastModified": 1743943147, - "narHash": "sha256-4twtjynlPR8thJfN4Jty8ttMaAMXzuf/az1UCCL8mR4=", + "lastModified": 1746906442, + "narHash": "sha256-kQme/JyxLvfpabjoeOwEBzX/3fgkiCqffknGljeT1SU=", "owner": "Daholli", "repo": "nixpkgs", - "rev": "9b2e671195f25c73366bc36863bf64ded6f71194", + "rev": "b7b8918da23391e1bd5f12e2f2f602455680fb67", "type": "github" }, "original": { "owner": "Daholli", "repo": "nixpkgs", - "rev": "9b2e671195f25c73366bc36863bf64ded6f71194", + "rev": "b7b8918da23391e1bd5f12e2f2f602455680fb67", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 311760a..2ed9a59 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; - nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/9b2e671195f25c73366bc36863bf64ded6f71194"; + nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/b7b8918da23391e1bd5f12e2f2f602455680fb67"; nixpkgs-tuya-vacuum.url = "github:Daholli/nixpkgs/84b34e39e7a0879367189f34401191f6a0364bcf"; home-manager = { diff --git a/modules/nixos/services/factorio-server/default.nix b/modules/nixos/services/factorio-server/default.nix index 757ae1c..2ab4fd2 100644 --- a/modules/nixos/services/factorio-server/default.nix +++ b/modules/nixos/services/factorio-server/default.nix @@ -39,7 +39,7 @@ in }; templates."extraSettingsFile.json".content = '' { - "name": "WarptorioHolli", + "name": "Pyanodons Holli", "description": "Trying to run a factorio-headless-server on my nix system", "tags": ["vanilla"], "max_players": 10, @@ -66,7 +66,7 @@ in lan = true; nonBlockingSaving = true; autosave-interval = 15; - saveName = "Warptorio"; + saveName = "Pyanodons"; admins = [ "daholli" "galbrain" From 89000f1eb25e52d00886800cc3bbf6cd44a59d00 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 12 May 2025 10:02:15 +0200 Subject: [PATCH 3/4] chore: update basics include zip, unzip and switch neofetch to fastfetch --- modules/nixos/submodules/basics-wsl/default.nix | 5 ++++- modules/nixos/submodules/basics/default.nix | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/nixos/submodules/basics-wsl/default.nix b/modules/nixos/submodules/basics-wsl/default.nix index 80ff534..c2a0466 100644 --- a/modules/nixos/submodules/basics-wsl/default.nix +++ b/modules/nixos/submodules/basics-wsl/default.nix @@ -17,7 +17,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - neofetch + fastfetch fd tree @@ -27,6 +27,9 @@ in wslu wsl-open + + zip + unzip ]; ${namespace} = { diff --git a/modules/nixos/submodules/basics/default.nix b/modules/nixos/submodules/basics/default.nix index 514b4cc..0878820 100644 --- a/modules/nixos/submodules/basics/default.nix +++ b/modules/nixos/submodules/basics/default.nix @@ -18,7 +18,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - neofetch + fastfetch fd tree @@ -30,6 +30,9 @@ in pciutils usbutils btop + + zip + unzip ]; ${namespace} = { From be94c87b1e3b91e78e151ff42d059cb46d92f8b2 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 12 May 2025 10:03:26 +0200 Subject: [PATCH 4/4] audio: change noisetorch to easyeffects and set up inputfilter for main pc --- .../x86_64-linux/cholli@yggdrasil/default.nix | 270 ++++++++++++++++++ .../nixos/system/hardware/audio/default.nix | 4 +- 2 files changed, 271 insertions(+), 3 deletions(-) diff --git a/homes/x86_64-linux/cholli@yggdrasil/default.nix b/homes/x86_64-linux/cholli@yggdrasil/default.nix index ada786b..cd0e3bb 100644 --- a/homes/x86_64-linux/cholli@yggdrasil/default.nix +++ b/homes/x86_64-linux/cholli@yggdrasil/default.nix @@ -18,4 +18,274 @@ with lib.${namespace}; direnv = enabled; }; }; + + services.easyeffects = { + enable = true; + preset = "jtrv-preset"; + extraPresets = { + jtrv-preset = { + input = { + blocklist = [ + + ]; + "compressor#0" = { + attack = 5; + boost-amount = 6; + boost-threshold = -72; + bypass = false; + dry = -100; + hpf-frequency = 10; + hpf-mode = "off"; + input-gain = 0; + knee = -6; + lpf-frequency = 20000; + lpf-mode = "off"; + makeup = 0; + mode = "Downward"; + output-gain = 0; + ratio = 4; + release = 75; + release-threshold = -40; + sidechain = { + lookahead = 0; + mode = "RMS"; + preamp = 0; + reactivity = 10; + source = "Middle"; + stereo-split-source = "Left/Right"; + type = "Feed-forward"; + }; + stereo-split = false; + threshold = -20; + wet = 0; + }; + "deesser#0" = { + bypass = false; + detection = "RMS"; + f1-freq = 3000.0; + f1-level = -6.0; + f2-freq = 5000.0; + f2-level = -6.0; + f2-q = 1.5000000000000004; + input-gain = 0.0; + laxity = 15; + makeup = 0; + mode = "Wide"; + output-gain = 0; + ratio = 5; + sc-listen = false; + threshold = -20; + }; + "equalizer#0" = { + balance = 0; + bypass = false; + input-gain = 0; + left = { + band0 = { + frequency = 50; + gain = 3; + mode = "RLC (BT)"; + mute = false; + q = 0.7; + slope = "x1"; + solo = false; + type = "Hi-pass"; + width = 4; + }; + band1 = { + frequency = 90; + gain = 3; + mode = "RLC (MT)"; + mute = false; + q = 0.7; + slope = "x1"; + solo = false; + type = "Lo-shelf"; + width = 4; + }; + band2 = { + frequency = 425; + gain = -2; + mode = "BWC (MT)"; + mute = false; + q = 0.9999999999999998; + slope = "x2"; + solo = false; + type = "Bell"; + width = 4; + }; + band3 = { + frequency = 3500; + gain = 3; + mode = "BWC (BT)"; + mute = false; + q = 0.7; + slope = "x2"; + solo = false; + type = "Bell"; + width = 4; + }; + band4 = { + frequency = 9000; + gain = 2; + mode = "LRX (MT)"; + mute = false; + q = 0.7; + slope = "x1"; + solo = false; + type = "Hi-shelf"; + width = 4; + }; + }; + mode = "IIR"; + num-bands = 5; + output-gain = 0; + pitch-left = 0; + pitch-right = 0; + right = { + band0 = { + frequency = 50; + gain = 3; + mode = "RLC (BT)"; + mute = false; + q = 0.7; + slope = "x1"; + solo = false; + type = "Hi-pass"; + width = 4; + }; + band1 = { + frequency = 90; + gain = 3; + mode = "RLC (MT)"; + mute = false; + q = 0.9999999999999998; + slope = "x1"; + solo = false; + type = "Lo-shelf"; + width = 4; + }; + band2 = { + frequency = 425; + gain = -2; + mode = "BWC (MT)"; + mute = false; + q = 0.7; + slope = "x2"; + solo = false; + type = "Bell"; + width = 4; + }; + band3 = { + frequency = 3500; + gain = 3; + mode = "BWC (BT)"; + mute = false; + q = 0.7; + slope = "x2"; + solo = false; + type = "Bell"; + width = 4; + }; + band4 = { + frequency = 9000; + gain = 2; + mode = "LRX (MT)"; + mute = false; + q = 0.7; + slope = "x1"; + solo = false; + type = "Hi-shelf"; + width = 4; + }; + }; + split-channels = false; + }; + "gate#0" = { + attack = 1; + bypass = false; + curve-threshold = -50; + curve-zone = -2; + dry = -100; + hpf-frequency = 10; + hpf-mode = "off"; + hysteresis = true; + hysteresis-threshold = -3; + hysteresis-zone = -1; + input-gain = 0; + lpf-frequency = 20000; + lpf-mode = "off"; + makeup = 1; + output-gain = 0; + reduction = -15; + release = 200; + sidechain = { + input = "Internal"; + lookahead = 0; + mode = "RMS"; + preamp = 0; + reactivity = 10; + source = "Middle"; + stereo-split-source = "Left/Right"; + }; + stereo-split = false; + wet = -1; + }; + "limiter#0" = { + alr = false; + alr-attack = 5; + alr-knee = 0; + alr-release = 50; + attack = 1; + bypass = false; + dithering = "16bit"; + external-sidechain = false; + gain-boost = true; + input-gain = 0; + lookahead = 5; + mode = "Herm Wide"; + output-gain = 0; + oversampling = "Half x2(2L)"; + release = 5; + sidechain-preamp = 0; + stereo-link = 100; + threshold = -1; + }; + plugins_order = [ + "rnnoise#0" + "gate#0" + "deesser#0" + "compressor#0" + "equalizer#0" + "speex#0" + "limiter#0" + ]; + "rnnoise#0" = { + bypass = false; + enable-vad = false; + input-gain = 0; + model-path = ""; + output-gain = 0; + release = 20; + vad-thres = 50; + wet = 0; + }; + "speex#0" = { + bypass = false; + enable-agc = false; + enable-denoise = false; + enable-dereverb = false; + input-gain = 0; + noise-suppression = -70; + output-gain = 0; + vad = { + enable = true; + probability-continue = 90; + probability-start = 95; + }; + }; + }; + }; + }; + }; } diff --git a/modules/nixos/system/hardware/audio/default.nix b/modules/nixos/system/hardware/audio/default.nix index aa0e40a..5be469e 100644 --- a/modules/nixos/system/hardware/audio/default.nix +++ b/modules/nixos/system/hardware/audio/default.nix @@ -18,12 +18,10 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - noisetorch pavucontrol + easyeffects ]; - programs.noisetorch.enable = true; - services.pulseaudio = disabled; security.rtkit.enable = true;