Merge branch 'master' into drop-petalburg
Some checks failed
nix-build / default-build (push) Has been cancelled
nix-build / fallarbor-build (push) Has been cancelled
nix-build / lavaridge-build (push) Has been cancelled
nix-build / mauville-build (push) Has been cancelled
nix-build / pacifidlog-build (push) Has been cancelled
nix-build / rustboro-build (push) Has been cancelled
nix-build / slateport-build (push) Has been cancelled
nix-check / fmt-check (push) Has been cancelled
nix-check / eval-check (push) Has been cancelled

This commit is contained in:
Aly Raffauf 2024-10-16 19:57:21 -04:00 committed by GitHub
commit 0ea64c1707
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 603 additions and 20 deletions

View file

@ -140,7 +140,6 @@
default = import ./homeManagerModules self;
aly = import ./homes/aly self;
dustin = import ./homes/dustin self;
morgan = import ./homes/morgan self;
};
nixosModules = {

View file

@ -6,6 +6,7 @@
config = lib.mkIf config.ar.home.services.easyeffects.enable {
xdg.configFile = {
"easyeffects/output/framework13.json".source = ./framework13.json;
"easyeffects/output/fw13-autogain.json".source = ./fw13-autogain.json;
"easyeffects/output/fw13-easy-effects.json".source = ./framework13.json;
"easyeffects/output/LoudnessEqualizer.json".source = ./LoudnessEqualizer.json;
};

View file

@ -0,0 +1,570 @@
{
"output": {
"autogain#0": {
"bypass": false,
"input-gain": 0.0,
"maximum-history": 15,
"output-gain": 0.0,
"reference": "Geometric Mean (MSI)",
"silence-threshold": -70.0,
"target": -23.0
},
"blocklist": [],
"compressor#0": {
"attack": 130.0,
"boost-amount": 6.0,
"boost-threshold": -60.0,
"bypass": false,
"dry": -100.0,
"hpf-frequency": 10.0,
"hpf-mode": "off",
"input-gain": 0.0,
"knee": -24.0,
"lpf-frequency": 20000.0,
"lpf-mode": "off",
"makeup": 0.0,
"mode": "Upward",
"output-gain": 0.0,
"ratio": 5.0,
"release": 600.0,
"release-threshold": -100.0,
"sidechain": {
"lookahead": 0.0,
"mode": "RMS",
"preamp": 0.0,
"reactivity": 10.0,
"source": "Middle",
"stereo-split-source": "Left/Right",
"type": "Feed-forward"
},
"stereo-split": false,
"threshold": -10.0,
"wet": 0.0
},
"equalizer#0": {
"balance": 0.0,
"bypass": false,
"input-gain": 0.0,
"left": {
"band0": {
"frequency": 32.0,
"gain": 3.5,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band1": {
"frequency": 64.0,
"gain": 2.0,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band2": {
"frequency": 128.0,
"gain": 1.0,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band3": {
"frequency": 256.0,
"gain": 0.0,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band4": {
"frequency": 512.0,
"gain": -0.5,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band5": {
"frequency": 1024.0,
"gain": -1.5,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band6": {
"frequency": 2048.0,
"gain": -0.25,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band7": {
"frequency": 4096.0,
"gain": 1.25,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band8": {
"frequency": 8192.0,
"gain": 2.75,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band9": {
"frequency": 16384.0,
"gain": 3.0,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
}
},
"mode": "IIR",
"num-bands": 10,
"output-gain": 0.0,
"pitch-left": 0.0,
"pitch-right": 0.0,
"right": {
"band0": {
"frequency": 32.0,
"gain": 3.5,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band1": {
"frequency": 64.0,
"gain": 2.0,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band2": {
"frequency": 128.0,
"gain": 1.0,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band3": {
"frequency": 256.0,
"gain": 0.0,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band4": {
"frequency": 512.0,
"gain": -0.5,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band5": {
"frequency": 1024.0,
"gain": -1.5,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band6": {
"frequency": 2048.0,
"gain": -0.25,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band7": {
"frequency": 4096.0,
"gain": 1.25,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band8": {
"frequency": 8192.0,
"gain": 2.75,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
},
"band9": {
"frequency": 16384.0,
"gain": 3.0,
"mode": "RLC (BT)",
"mute": false,
"q": 1.6,
"slope": "x1",
"solo": false,
"type": "Bell",
"width": 4.0
}
},
"split-channels": false
},
"gate#0": {
"attack": 2000.0,
"bypass": false,
"curve-threshold": -40.0,
"curve-zone": -40.0,
"dry": -100.0,
"hpf-frequency": 10.0,
"hpf-mode": "off",
"hysteresis": false,
"hysteresis-threshold": -12.0,
"hysteresis-zone": -6.0,
"input-gain": 0.0,
"lpf-frequency": 20000.0,
"lpf-mode": "off",
"makeup": 0.0,
"output-gain": 0.0,
"reduction": -30.0,
"release": 2000.0,
"sidechain": {
"input": "Internal",
"lookahead": 0.0,
"mode": "Peak",
"preamp": 0.0,
"reactivity": 10.0,
"source": "Middle",
"stereo-split-source": "Left/Right"
},
"stereo-split": false,
"wet": 0.0
},
"limiter#0": {
"alr": false,
"alr-attack": 5.0,
"alr-knee": 0.0,
"alr-release": 50.0,
"attack": 5.0,
"bypass": false,
"dithering": "None",
"external-sidechain": false,
"gain-boost": false,
"input-gain": 0.0,
"lookahead": 5.0,
"mode": "Herm Thin",
"output-gain": 0.0,
"oversampling": "Half x4(3L)",
"release": 10.0,
"sidechain-preamp": 0.0,
"stereo-link": 100.0,
"threshold": -1.0
},
"multiband_compressor#0": {
"band0": {
"attack-threshold": -30.0,
"attack-time": 50.0,
"boost-amount": 6.0,
"boost-threshold": -72.0,
"compression-mode": "Downward",
"compressor-enable": true,
"external-sidechain": false,
"knee": -24.0,
"makeup": 0.0,
"mute": false,
"ratio": 1.7,
"release-threshold": -100.0,
"release-time": 600.0,
"sidechain-custom-highcut-filter": false,
"sidechain-custom-lowcut-filter": false,
"sidechain-highcut-frequency": 250.0,
"sidechain-lookahead": 0.0,
"sidechain-lowcut-frequency": 10.0,
"sidechain-mode": "RMS",
"sidechain-preamp": 0.0,
"sidechain-reactivity": 10.0,
"sidechain-source": "Middle",
"solo": false,
"stereo-split-source": "Left/Right"
},
"band1": {
"attack-threshold": -30.0,
"attack-time": 30.0,
"boost-amount": 6.0,
"boost-threshold": -72.0,
"compression-mode": "Downward",
"compressor-enable": true,
"enable-band": true,
"external-sidechain": false,
"knee": -24.0,
"makeup": 0.0,
"mute": false,
"ratio": 1.7,
"release-threshold": -100.0,
"release-time": 450.0,
"sidechain-custom-highcut-filter": false,
"sidechain-custom-lowcut-filter": false,
"sidechain-highcut-frequency": 1250.0,
"sidechain-lookahead": 0.0,
"sidechain-lowcut-frequency": 250.0,
"sidechain-mode": "RMS",
"sidechain-preamp": 0.0,
"sidechain-reactivity": 10.0,
"sidechain-source": "Middle",
"solo": false,
"split-frequency": 250.0,
"stereo-split-source": "Left/Right"
},
"band2": {
"attack-threshold": -30.0,
"attack-time": 10.0,
"boost-amount": 6.0,
"boost-threshold": -72.0,
"compression-mode": "Downward",
"compressor-enable": true,
"enable-band": true,
"external-sidechain": false,
"knee": -24.0,
"makeup": 0.0,
"mute": false,
"ratio": 1.7,
"release-threshold": -100.0,
"release-time": 250.0,
"sidechain-custom-highcut-filter": false,
"sidechain-custom-lowcut-filter": false,
"sidechain-highcut-frequency": 5000.0,
"sidechain-lookahead": 0.0,
"sidechain-lowcut-frequency": 1250.0,
"sidechain-mode": "RMS",
"sidechain-preamp": 0.0,
"sidechain-reactivity": 10.0,
"sidechain-source": "Middle",
"solo": false,
"split-frequency": 1250.0,
"stereo-split-source": "Left/Right"
},
"band3": {
"attack-threshold": -30.0,
"attack-time": 5.0,
"boost-amount": 6.0,
"boost-threshold": -72.0,
"compression-mode": "Downward",
"compressor-enable": true,
"enable-band": true,
"external-sidechain": false,
"knee": -24.0,
"makeup": 0.0,
"mute": false,
"ratio": 1.7,
"release-threshold": -100.0,
"release-time": 100.0,
"sidechain-custom-highcut-filter": false,
"sidechain-custom-lowcut-filter": false,
"sidechain-highcut-frequency": 20000.0,
"sidechain-lookahead": 0.0,
"sidechain-lowcut-frequency": 5000.0,
"sidechain-mode": "RMS",
"sidechain-preamp": 0.0,
"sidechain-reactivity": 10.0,
"sidechain-source": "Middle",
"solo": false,
"split-frequency": 5000.0,
"stereo-split-source": "Left/Right"
},
"band4": {
"attack-threshold": -12.0,
"attack-time": 20.0,
"boost-amount": 6.0,
"boost-threshold": -72.0,
"compression-mode": "Downward",
"compressor-enable": true,
"enable-band": false,
"external-sidechain": false,
"knee": -6.0,
"makeup": 0.0,
"mute": false,
"ratio": 1.0,
"release-threshold": -100.0,
"release-time": 100.0,
"sidechain-custom-highcut-filter": false,
"sidechain-custom-lowcut-filter": false,
"sidechain-highcut-frequency": 8000.0,
"sidechain-lookahead": 0.0,
"sidechain-lowcut-frequency": 4000.0,
"sidechain-mode": "RMS",
"sidechain-preamp": 0.0,
"sidechain-reactivity": 10.0,
"sidechain-source": "Middle",
"solo": false,
"split-frequency": 4000.0,
"stereo-split-source": "Left/Right"
},
"band5": {
"attack-threshold": -12.0,
"attack-time": 20.0,
"boost-amount": 6.0,
"boost-threshold": -72.0,
"compression-mode": "Downward",
"compressor-enable": true,
"enable-band": false,
"external-sidechain": false,
"knee": -6.0,
"makeup": 0.0,
"mute": false,
"ratio": 1.0,
"release-threshold": -100.0,
"release-time": 100.0,
"sidechain-custom-highcut-filter": false,
"sidechain-custom-lowcut-filter": false,
"sidechain-highcut-frequency": 12000.0,
"sidechain-lookahead": 0.0,
"sidechain-lowcut-frequency": 8000.0,
"sidechain-mode": "RMS",
"sidechain-preamp": 0.0,
"sidechain-reactivity": 10.0,
"sidechain-source": "Middle",
"solo": false,
"split-frequency": 8000.0,
"stereo-split-source": "Left/Right"
},
"band6": {
"attack-threshold": -12.0,
"attack-time": 20.0,
"boost-amount": 6.0,
"boost-threshold": -72.0,
"compression-mode": "Downward",
"compressor-enable": true,
"enable-band": false,
"external-sidechain": false,
"knee": -6.0,
"makeup": 0.0,
"mute": false,
"ratio": 1.0,
"release-threshold": -100.0,
"release-time": 100.0,
"sidechain-custom-highcut-filter": false,
"sidechain-custom-lowcut-filter": false,
"sidechain-highcut-frequency": 16000.0,
"sidechain-lookahead": 0.0,
"sidechain-lowcut-frequency": 12000.0,
"sidechain-mode": "RMS",
"sidechain-preamp": 0.0,
"sidechain-reactivity": 10.0,
"sidechain-source": "Middle",
"solo": false,
"split-frequency": 12000.0,
"stereo-split-source": "Left/Right"
},
"band7": {
"attack-threshold": -12.0,
"attack-time": 20.0,
"boost-amount": 6.0,
"boost-threshold": -72.0,
"compression-mode": "Downward",
"compressor-enable": true,
"enable-band": false,
"external-sidechain": false,
"knee": -6.0,
"makeup": 0.0,
"mute": false,
"ratio": 1.0,
"release-threshold": -100.0,
"release-time": 100.0,
"sidechain-custom-highcut-filter": false,
"sidechain-custom-lowcut-filter": false,
"sidechain-highcut-frequency": 20000.0,
"sidechain-lookahead": 0.0,
"sidechain-lowcut-frequency": 16000.0,
"sidechain-mode": "RMS",
"sidechain-preamp": 0.0,
"sidechain-reactivity": 10.0,
"sidechain-source": "Middle",
"solo": false,
"split-frequency": 16000.0,
"stereo-split-source": "Left/Right"
},
"bypass": false,
"compressor-mode": "Modern",
"dry": -100.0,
"envelope-boost": "None",
"input-gain": 0.0,
"output-gain": 0.0,
"stereo-split": false,
"wet": 0.0
},
"plugins_order": [
"gate#0",
"compressor#0",
"multiband_compressor#0",
"equalizer#0",
"autogain#0",
"limiter#0"
]
}
}

View file

@ -2,6 +2,7 @@
{
config,
lib,
pkgs,
self,
...
}: {
@ -38,6 +39,31 @@
environment.variables.GDK_SCALE = "2";
networking.hostName = "lavaridge";
services.udev.extraRules = let
hyprlandDynamicRes = pkgs.writeShellScript "hyprland-dynamic-resolution" ''
MON="eDP-1"
RES="2880x1920"
for dir in /run/user/*; do
for hypr_dir in "$dir/hypr/"*/; do
socket="''${hypr_dir}.socket.sock"
if [[ -S $socket ]]; then
monitor_info=$(echo -e "monitors" | ${lib.getExe pkgs.socat} - UNIX-CONNECT:"$socket")
if echo "$monitor_info" | grep -q "$MON"; then
echo -e "keyword monitor $MON, $RES@$1, 0x0, 2, vrr, $2" | ${lib.getExe pkgs.socat} - UNIX-CONNECT:"$socket"
fi
fi
done
done
'';
in ''
SUBSYSTEM=="power_supply", ATTR{online}=="1", ACTION=="change", RUN+="${hyprlandDynamicRes} 120 1"
SUBSYSTEM=="power_supply", ATTR{online}=="0", ACTION=="change", RUN+="${hyprlandDynamicRes} 60 0"
'';
system.stateVersion = "24.05";
ar = {

View file

@ -15,7 +15,7 @@
services = {
easyeffects = {
enable = true;
preset = "fw13-easy-effects";
preset = "fw13-autogain";
};
};
};

View file

@ -15,7 +15,6 @@
openssh.authorizedKeys = {
keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG0HAmaMTAvrFrinB+b83c8hq6PyjmxRHg1IxR2GH6RN u0_a344@localhost" # termux on wallace
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGcJBb7+ZxkDdk06A0csNsbgT9kARUN185M8k3Lq7E/d u0_a336@localhost" # termux on winona
];

View file

@ -24,16 +24,15 @@ in {
};
devices = {
"brawly" = {id = "BBIBWMR-CN4CFC4-2XMPLII-XFWXBT5-EPCZCAF-JOWAX5J-DHIGNM4-O3XQ4Q3";}; # Pixel 6a
"fallarbor" = {id = "P4URLH4-YWLMO6J-W62ET7H-TQAO3Y6-T2FAYOY-C2VTI65-VQXHVGG-NQ76PAZ";}; # Framework 13 Intel 11th gen
"gsgmba" = {id = "V2YCZSL-XY7H72L-FGJFWP2-JNYX72O-OJ5V2HY-V4SSSJM-77A7E3Z-7EJFAAV";}; # Work Macbook Air
"iphone12" = {id = "SBQNUXS-H4XDJ3E-RBHJPT5-45WDJJA-2U43M4P-23XGUJ7-E3CNNKZ-BXSGIA3";}; # iPhone 12 Pro Max
"lavaridge" = {id = "TMMSCVA-MDJTDPC-PC47NUA-2VPLAIB-6S6MEU7-KALIGUJ-AWDUOUU-XD73MAY";}; # Framework 13 AMD
"mauville" = {id = "52MTCMC-PKEWSAU-HADMTZU-DY5EKFO-B323P7V-OBXLNTQ-EJY7F7Y-EUWFBQX";}; # Desktop/homelab
"norman" = {id = "IVFUFD4-LUQMX5V-FMUZQD2-EP6GOGQ-LPGYF5M-GFQDTNL-DVNQEA7-WWSWEQL";}; # Pixel 8a
"pacifidlog" = {id = "6EBVXYI-HZW4LQI-T6L3TTI-DZEBXJM-RP3DW7N-BCAG6FC-G2654DN-XJFSLQD";}; # Lenovo Legion Go
"rustboro" = {id = "7CXGPQN-7DYDYJN-DKELOR3-RD4HZUW-SSUDGLZ-WVXYFUT-DPT2MGD-6PO5BQF";}; # Thinkpad t440p
"slateport" = {id = "MDJFDUG-UJAXQXI-AMEF2AR-PBMD5QK-Z5ZG6AA-RCJCU3M-GZHQQEA-X2JGOAK";}; # homelab a
"wallace" = {id = "X55NQL2-H3TEJ5U-EXZPBKQ-LI6BMB4-W2ULDIJ-YNIHJHB-4ISCOJB-UHNLYAX";}; # Samsung a35
"slateport" = {id = "MDJFDUG-UJAXQXI-AMEF2AR-PBMD5QK-Z5ZG6AA-RCJCU3M-GZHQQEA-X2JGOAK";}; # homelab
"winona" = {id = "IGAW5SS-WY2QN6J-5TF74YZ-6XPNPTC-RCH3HIT-ZZQKCAI-6L54IS2-SNRIMA2";}; # Pixel Tablet
};
@ -42,7 +41,7 @@ in {
"sync" = {
id = "default";
path = "/home/aly/sync";
devices = ["brawly" "fallarbor" "gsgmba" "iphone12" "lavaridge" "mauville" "pacifidlog" "rustboro" "slateport" "wallace" "winona"];
devices = ["fallarbor" "gsgmba" "iphone12" "lavaridge" "mauville" "norman" "pacifidlog" "rustboro" "slateport" "winona"];
versioning = {
type = "staggered";
params = {
@ -52,20 +51,10 @@ in {
};
};
"camera" = {
id = "fcsgh-dlxys";
path = "/home/aly/pics/camera";
devices = ["brawly" "fallarbor" "lavaridge" "mauville" "rustboro" "slateport" "wallace" "winona"];
versioning = {
params.cleanoutDays = "5";
type = "trashcan";
};
};
"screenshots" = {
id = "screenshots";
path = "/home/aly/pics/screenshots";
devices = ["brawly" "fallarbor" "lavaridge" "mauville" "rustboro" "slateport" "wallace" "winona"];
devices = ["fallarbor" "lavaridge" "mauville" "norman" "rustboro" "slateport" "winona"];
versioning = {
params.cleanoutDays = "5";
type = "trashcan";
@ -76,7 +65,7 @@ in {
"music" = {
id = "6nzmu-z9der";
path = config.ar.users.aly.syncthing.musicPath;
devices = ["lavaridge" "mauville" "rustboro" "wallace"];
devices = ["lavaridge" "mauville" "rustboro"];
};
};
};

View file

@ -11,7 +11,6 @@ self: {
mutableUsers = false;
users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG0HAmaMTAvrFrinB+b83c8hq6PyjmxRHg1IxR2GH6RN u0_a344@localhost" # termux on wallace
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGcJBb7+ZxkDdk06A0csNsbgT9kARUN185M8k3Lq7E/d u0_a336@localhost" # termux on winona
(builtins.readFile ../secrets/publicKeys/aly_lavaridge.pub)
(builtins.readFile ../secrets/publicKeys/aly_mauville.pub)