diff --git a/configuration.nix b/configuration.nix index d12e96e..7f94db2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -240,6 +240,68 @@ in alsa.support32Bit = true; pulse.enable = true; }; + + # Disable unneeded PipeWire devices and rename the ones I use to more recognizable names + environment.etc."wireplumber/main.lua.d/51-device-rename.lua".text = '' + table.insert(alsa_monitor.rules, { + matches = { + { + { "node.name", "equals", "alsa_output.usb-Audioengine_LLC_Audioengine_2__AE202010001A2002-00.analog-stereo" }, + }, + }, + apply_properties = { + ["node.description"] = "Speakers", + ["node.nick"] = "Speakers", + }, + }) + table.insert(alsa_monitor.rules, { + matches = { + { + { "node.name", "equals", "alsa_output.usb-SteelSeries_SteelSeries_Arctis_5_00000000-00.analog-chat" }, + }, + }, + apply_properties = { + ["node.description"] = "Headphones", + ["node.nick"] = "Headphones", + }, + }) + table.insert(alsa_monitor.rules, { + matches = { + { + { "node.name", "equals", "alsa_input.usb-SteelSeries_SteelSeries_Arctis_5_00000000-00.analog-chat" }, + }, + }, + apply_properties = { + ["node.description"] = "Headphone Mic", + ["node.nick"] = "Headphone Mic", + }, + }) + table.insert(alsa_monitor.rules, { + matches = { + {{ "node.name", "equals", "alsa_output.usb-SteelSeries_SteelSeries_Arctis_5_00000000-00.analog-game" },}, + }, + apply_properties = { + ["node.disabled"] = true, + }, + }) + table.insert(alsa_monitor.rules, { + matches = { + {{ "node.name", "equals", "alsa_output.pci-0000_14_00.1.hdmi-stereo" },}, + }, + apply_properties = { + ["node.disabled"] = true, + }, + }) + table.insert(alsa_monitor.rules, { + matches = { + {{ "node.name", "equals", "alsa_input.usb-MACROSILICON_USB_Video-02.analog-stereo" },}, + }, + apply_properties = { + ["node.disabled"] = true, + }, + }) + ''; + services.dbus.enable = true; services.greetd = { @@ -595,9 +657,11 @@ in pkgs.android-udev-rules ]; #udevadm info --query=all --name=/dev/sda1 | grep ID_SERIAL - services.udev.extraRules = '' - ACTION=="add", SUBSYSTEMS=="usb", SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="filesystem", ENV{ID_SERIAL_SHORT}=="Hidizs_AP80PRO", RUN{program}+="${pkgs.systemd}/bin/systemd-mount --owner knazarov --no-block --automount=yes --collect $devnode /media" -''; + services.udev.extraRules = + ''ACTION=="add", SUBSYSTEMS=="usb", SUBSYSTEM=="block", '' + + ''ENV{ID_FS_USAGE}=="filesystem", ENV{ID_SERIAL_SHORT}=="Hidizs_AP80PRO", '' + + ''RUN{program}+="${pkgs.systemd}/bin/systemd-mount --owner knazarov '' + + ''--no-block --automount=yes --collect $devnode /media"''; systemd.timers."git_plan" = { wantedBy = [ "timers.target" ]; diff --git a/flake.lock b/flake.lock index fcfe14c..8006298 100755 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1691958887, - "narHash": "sha256-6/0Wt+svfioYXPSmEznVk91yDQCMi4SKyfV2B3CiNjU=", + "lastModified": 1692134489, + "narHash": "sha256-H8JdaDt9Rr6UQyvMV3x9w6q4+zfsUIq6UzH+0WunRM8=", "owner": "~knazarov", "repo": "knazarov.com", - "rev": "84eb860d09c485d8c24ec24bb02049596f497d02", + "rev": "5dabc8308507257d84adf5f54e372931cf7be305", "type": "sourcehut" }, "original": { diff --git a/nodes/knazarovcom/configuration.nix b/nodes/knazarovcom/configuration.nix index e042e7b..928dd55 100644 --- a/nodes/knazarovcom/configuration.nix +++ b/nodes/knazarovcom/configuration.nix @@ -41,7 +41,8 @@ map $http_user_agent $limit_bots { default 0; ~*(AhrefsBot|PetalBot|bingbot|gptbot|ZoominfoBot|BLEXBot|Bytespider) 1; - ~*(DecompilationBot|Amazonbot|Barkrowler|SeznamBot) 1; + ~*(DecompilationBot|Amazonbot|Barkrowler|SeznamBot|SemrushBot) 1; + ~*(MJ12bot) 1; } ''; virtualHosts = { diff --git a/secrets.yaml b/secrets.yaml index 8f723d0..c7558a3 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -2,7 +2,7 @@ hello: ENC[AES256_GCM,data:+LPt8J+Ks1m10+zZ2Q96r3K2W6Yeng7M7+c2TYDQ+/4AJl6Xc6hVn fastmail_password: ENC[AES256_GCM,data:tHr8PqIg9DigRBu2bgjUeg==,iv:NI9bENFPuKcOt1cd2kg2DKU22J1dJ+3mK7UoceZagR4=,tag:oEgeQb1iLKisOqHi9Ds7xg==,type:str] github_token: ENC[AES256_GCM,data:E1+wrI5VUlnsqfKNH6fY7IXqHIiagAByLYCfIfdd2+HcvniAvZzaIyKB3nma5eks3csN5A9XgYXRb09lELroW00obmIWbWZPdFhDccHRtVOqFq/r+x27O/3MAkDqID5mc8xD8SqWUibr9UZfXjFcXC4bx7+a4pyy45akz9RLIJRVKDzxMBGmZ/wQcuFS9uy2Pv2yWRL7q4olzvc/kzNFRWCLU7ThIAJSIx//NluOE8xjsA==,iv:Cdc2wwGdXprch1hHd0CwJM6vUAYmfhI4FpcKjcoIZYY=,tag:so8BJtjHGcGzayPqMwy43A==,type:str] mullvad_account: ENC[AES256_GCM,data:CO4wl2vNAMEC9oy37nIrpw==,iv:a3w64u8XQ/tihIDxIPPtdZ6F7dldLPvRzGUs1MpVe4M=,tag:HQxJVuGEvI0fVj8yGptbdA==,type:str] -git_plan_config: ENC[AES256_GCM,data:45B89I6+mK4GkgeitNiizLmJUyIsOBNbmTPKOSIbMgpbqgR1QjuRNaJViOkQKFS8oZXFIEPbnoub1mDkMzMTB8KOvqnxUE4vnKwCzudepaO7f3WAJC8VlUORn6tX/Ujs4HeD4P8ozoh4bbAm8iT3VCiHZ28TurBqOtA3G/LVxtZ9NB87/BIu8/e8S10aZ2MGNORdEW2Rtbl0Tn0JjEiDZp8jrUm+pWQHhDdcvMtxyzoBqQsTU5eiea0qZOJP4Z5XK6/iWYss/vlGDwjD6S3rHFrHIJ22kq3pRezA0U42i6Uq8eTcVkzXlO7XvWsyA5CPsNbiEbbBvVkPvE4SUN3xVEpPHsSO0a/q3/0C2G1txvP9dd4CcVeuwqznBt25EYG9O3TQHt4h6GmjsgIWZaS7bSCmgANJTGmamFMJ4SdXzjTxXBXuTa64JceMQjmlykDwABJhThPRzMxMT1NFeHrc2OjuZ0NJHa28S/eoLUUq50QsiUD5E+wwkuxgXt9/DsBeirXf9dNjA58Z24nbxSQvq24Lp7Zlb15VP9FpoZIZb88kxNiJwT/4Uj4Px4pFdFVBZmCGiSXnBSxbypFapA+6AQ89z5ZMxdH6FP7EvsF7aDToLa0Q2Xovzd8Nt57w2j4YkS3Mc067KXkusbCzZ8C9DzkiYUDM9+ouSjIgXHL1JEBX+B4z17UTcSgNpsSztCScnjESaaI1xZ8JCKU9Zq53yiwRtYbhTTrpmA3xPI2Un3kvGCxYNtO5sWcLvzRKs6JP4o2WN40DvVJ7SgbSWWOA6cXMxLifEuiX8olgjsKP4tmaxXpiLE5b8xnXSHjzce23cEt9uN8R1hGdJak7iQWp/KZXov7fSA==,iv:Qdjmv27fsSXAQ6LCXdZtNVTbZlU9zFsRLor1BKJNHNE=,tag:5G5gk8JEHRx0CY48al5rvA==,type:str] +git_plan_config: ENC[AES256_GCM,data:eN0UvSiZfgC/B/wVG58YzPJdFTCPFBwObc9wwazbSR41R03pR26sEVvm25pySXKU6Q/hO5NB71GlkB4dkMKrQKN1FKDxgM32iocx2gWtW+iHms+MYZ6XAzaR1rm2IfRK4kSAHHMY9fE6GZ16CisBihowBp60lDGLFh/5dn7cZzmZcokPN+tcNUxgRHHToa69ImCpPR3l7OpKfv3JDkc5VulmzTSeiVky1xDeBi+snAGM+rMirdwPdCeqTLAZCjGhWEtphcymlXm6VNaH5hJV0XGtTWUaaMR9iTjnvE9gFkqO7fI+PX/cKaHSvoko3LSomeEmlIsh1gdtyBvkOiyICJf+AEDTDzF5jREl65PyEXpm6OWFJ2i+wFGzDuSPpSIvTlgu/8GH5PdNSUN6qRNKjfc/MiR7SaZp+fiNJtziAHlY7nC5kVCVrKwCIR7bpCsftoeSk548th8y1IArINgvCQa6UFOAhkhSE7derUfOsbpLwOhSM0YBYKR5GkzuaptUsR5EFaK8q5KvqA1jKciUZMQ3KUHs7QToprmva9uShVkqATg7+Z5uGqh0kmSHI70FfyOE1CTKLQVvOI+UAjkZYxe4RvDfzke4Qn+w1K2jeZWsxMVI2NBbEJQ6TilaDFQz2KwWwSsC5g1PDWr3Qj+bZWI4Q/MG3lICsv3PIYqH9UsGZQ4ZfOwPY8chYDNHRT5nw33ZJ2hefpDbUJbObGPxYmKdJIAwZHJ0ZI8C1kQp2qUqnTL07XyPczZkbv4zuU0/uS/odj5uNm/B+Of7tAIfKpa5UhLZOmIdILg+lc6fdaszlcXKpftD69Hs/LVV2P6n1aZ+x4QOFliymYdRl+vqbfgo0akhPa12j2n+gNs8NFWAFZsMY/V9w3T6A2f5+enMXp+C+jU5JKqhCU8OM9E7FV4ZSjNMbpcIBrgsX/Gk4Q==,iv:+hcn1x6A6nS2wk53pc3rkAz1RbxcHsJ7yA0UnQOqZ+c=,tag:KG1RWvsWXHFRt7zgzZSCfQ==,type:str] git_plan_credentials: ENC[AES256_GCM,data:d4egK2w4TGIDNaI2Wc3ViOBnH7/WpdeS1EoYe4/oaM4iayBXOEQMvT9qIgu/Hml34gvbBN9lRmlNkESVh7YpwO5wACkkRcO/0ZTyP8XzFUUo0IfUh1iHPjEQOF7vygW/woqBiQgFPRws9F+g6BW8aSQrBgvBF5IeNLhFBvSJUvTft1xEsNwFnkWnfZ2JWmYqLjEggoUEqtXMRw9KKcqm4DNXIzxmA8wSzDriIzeCVuSEV8sJD21saFPPaLw/jupLTLdWp5F8rAxLGa6e9coCNu8vSuqUgfv0jFET71bNw28xPrN38A/PIlUcR9MXe1SGqKAFxEv134ZkJr78g1PIWNoVDrmIlMpV6dYRLKM1FOcpAhJorIXooIl6quCdg2/U5onP8cQ7lt2LsEG5APKj7pz7huatdwM/CgxrcqPVb0E2Lk5c+wi3Rf9/Jz3BqcWQm3bwkHwivWyCD1Nw+qRXLFSfXGTovSBsxX0j4LbdP0o4iPuj068DGawpYC/AfcKfOCmh8aInQhGCQtIq14QGffU9GbW37gHu,iv:ZzOUYu3s+kfwbKajA+6fdu2EysipjoKD49muLNFBZ58=,tag:e0RI7rA8eLQI8h5L4pvS1A==,type:str] sops: kms: [] @@ -28,8 +28,8 @@ sops: U3loV2xDMkM5SWNXRDJobDloL0FVUUkK3OP7KvcKkE8mJ880dm6LMFZUxELjl8/P 6+q8qAYiAvl0Cbd4GzkNpUuBbLlFFWfFmC0vbgg8gyZ6xI5AFhHAPw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-08-14T22:29:46Z" - mac: ENC[AES256_GCM,data:RrVV1xSuXU9cm1dja2EBQFU4FxyU1agGNCDuCbWNxD/xJo4U6e2Zg74rNfc8BrFatnCp47eMM37eGy2PKScbit05R3+CGdCpGlqb/6ULQNUC/rxWKavhoGnF9WaWQEDsKAP1zEVDgWtZFWkocWJAmB0KNQhSiBXxy/fwZv+eQAM=,iv:X39LvJ15Hl+scJyF19vnTGTRImPf1JLepFdamL0Cz/I=,tag:8d6v6ZiZiPukmbUOi3NOrQ==,type:str] + lastmodified: "2023-08-16T08:55:30Z" + mac: ENC[AES256_GCM,data:YTmecy8ikC9a2oHOcBMcFfAkYzCBjPhQZewRdSDfyg5Z2b7p4M7KVPV3oyBNaZb9UHSz4/eONNh8hTTXqnPiKeaDtd8vUqxRTdbbLddF48l/MYBaKgSq8aLn/rm98afEr09FIxzu5TtMYJu/w2XinsCdllE8T7iA8rB/dJmLuEQ=,iv:O/GJ7pQFX7KrnL8mARkAFs3USa07o2+e1bmTXZrjp1Q=,tag:r/piFEQFym3lAf+hyIZe3w==,type:str] pgp: - created_at: "2023-06-10T01:03:11Z" enc: |-