diff --git a/flake.lock b/flake.lock index 2cc27ac..6ddeb59 100644 --- a/flake.lock +++ b/flake.lock @@ -558,16 +558,17 @@ ] }, "locked": { - "lastModified": 1747021814, - "narHash": "sha256-dYxkdbg6yj8HhuBkCmklMQVR17N7P32R8ir7b7oNxm4=", - "owner": "outfoxxed", + "lastModified": 1746522256, + "narHash": "sha256-NRaB2q1QoT8fu9oMl7rS/X3KHW9hzC+rAqB2XDZhKJI=", + "owner": "Daholli", "repo": "hy3", - "rev": "6b40ba5d99992b4006d936220b2bbea26e55a591", + "rev": "a9caea020e457b4c5868913eea391beffd5fc22c", "type": "github" }, "original": { - "owner": "outfoxxed", + "owner": "Daholli", "repo": "hy3", + "rev": "a9caea020e457b4c5868913eea391beffd5fc22c", "type": "github" } }, @@ -1152,17 +1153,17 @@ }, "nixpkgs-latest-factorio": { "locked": { - "lastModified": 1746906442, - "narHash": "sha256-kQme/JyxLvfpabjoeOwEBzX/3fgkiCqffknGljeT1SU=", + "lastModified": 1743943147, + "narHash": "sha256-4twtjynlPR8thJfN4Jty8ttMaAMXzuf/az1UCCL8mR4=", "owner": "Daholli", "repo": "nixpkgs", - "rev": "b7b8918da23391e1bd5f12e2f2f602455680fb67", + "rev": "9b2e671195f25c73366bc36863bf64ded6f71194", "type": "github" }, "original": { "owner": "Daholli", "repo": "nixpkgs", - "rev": "b7b8918da23391e1bd5f12e2f2f602455680fb67", + "rev": "9b2e671195f25c73366bc36863bf64ded6f71194", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 2ed9a59..9e78077 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/b7b8918da23391e1bd5f12e2f2f602455680fb67"; + nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/9b2e671195f25c73366bc36863bf64ded6f71194"; nixpkgs-tuya-vacuum.url = "github:Daholli/nixpkgs/84b34e39e7a0879367189f34401191f6a0364bcf"; home-manager = { @@ -38,7 +38,9 @@ }; hy3 = { - url = "github:outfoxxed/hy3"; + # url = "github:outfoxxed/hy3"; + + url = "github:Daholli/hy3/a9caea020e457b4c5868913eea391beffd5fc22c"; inputs.hyprland.follows = "hyprland"; }; diff --git a/homes/x86_64-linux/cholli@yggdrasil/default.nix b/homes/x86_64-linux/cholli@yggdrasil/default.nix index cd0e3bb..ada786b 100644 --- a/homes/x86_64-linux/cholli@yggdrasil/default.nix +++ b/homes/x86_64-linux/cholli@yggdrasil/default.nix @@ -18,274 +18,4 @@ 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/services/factorio-server/default.nix b/modules/nixos/services/factorio-server/default.nix index 2ab4fd2..757ae1c 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": "Pyanodons Holli", + "name": "WarptorioHolli", "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 = "Pyanodons"; + saveName = "Warptorio"; admins = [ "daholli" "galbrain" diff --git a/modules/nixos/submodules/basics-wsl/default.nix b/modules/nixos/submodules/basics-wsl/default.nix index c2a0466..80ff534 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; [ - fastfetch + neofetch fd tree @@ -27,9 +27,6 @@ in wslu wsl-open - - zip - unzip ]; ${namespace} = { diff --git a/modules/nixos/submodules/basics/default.nix b/modules/nixos/submodules/basics/default.nix index 0878820..514b4cc 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; [ - fastfetch + neofetch fd tree @@ -30,9 +30,6 @@ in pciutils usbutils btop - - zip - unzip ]; ${namespace} = { diff --git a/modules/nixos/system/hardware/audio/default.nix b/modules/nixos/system/hardware/audio/default.nix index 5be469e..aa0e40a 100644 --- a/modules/nixos/system/hardware/audio/default.nix +++ b/modules/nixos/system/hardware/audio/default.nix @@ -18,10 +18,12 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ + noisetorch pavucontrol - easyeffects ]; + programs.noisetorch.enable = true; + services.pulseaudio = disabled; security.rtkit.enable = true;