From 3cef7e2f49a33ca28ea5353938805cae60f2f2df Mon Sep 17 00:00:00 2001 From: Joshua Elmasri Date: Tue, 19 May 2026 14:30:03 -0500 Subject: [PATCH] wiefjiwef --- flake.lock | 250 +++++++------------------------- hosts/desktop/configuration.nix | 39 ++++- 2 files changed, 90 insertions(+), 199 deletions(-) diff --git a/flake.lock b/flake.lock index 8f15d31..4a9ba5f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "abseil-src": { - "flake": false, - "locked": { - "lastModified": 1722535511, - "narHash": "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=", - "owner": "abseil", - "repo": "abseil-cpp", - "rev": "4447c7562e3bc702ade25105912dce503f0c4010", - "type": "github" - }, - "original": { - "owner": "abseil", - "ref": "20240722.0", - "repo": "abseil-cpp", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -50,23 +33,6 @@ "type": "github" } }, - "asio-src": { - "flake": false, - "locked": { - "lastModified": 1702548444, - "narHash": "sha256-8Xo6J6+dTvDtsthjbLMMTInHMDnMMM0rQwzbZu70J/s=", - "owner": "chriskohlhoff", - "repo": "asio", - "rev": "22ccfc94fc77356f7820601f9f33b9129a337d2d", - "type": "github" - }, - "original": { - "owner": "chriskohlhoff", - "ref": "asio-1-30-0", - "repo": "asio", - "type": "github" - } - }, "astal": { "inputs": { "nixpkgs": [ @@ -74,11 +40,11 @@ ] }, "locked": { - "lastModified": 1777578913, - "narHash": "sha256-2Hzr8T4oUtw2q0ZYxrgDB8kvy85QawlhpiQDk4eGOHQ=", + "lastModified": 1778793456, + "narHash": "sha256-Co2YsBBPAbblOSq7QnsYa9MWE61JsmE4ccbax3KGj1I=", "owner": "aylur", "repo": "astal", - "rev": "67ddc83e0bdbda6de7f6f15e4fbc5d6b9d2d1b18", + "rev": "a1fbc4a1d6c6aec9b940f275dd91bdb52888d911", "type": "github" }, "original": { @@ -158,11 +124,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1778508626, - "narHash": "sha256-MEHRxqvVViefoknfTz3umavP1qoMj8Dji04vBgCsQ1k=", + "lastModified": 1778649404, + "narHash": "sha256-LwRT4Wn48IPn674TMnrckayCioF0iMGYqE7bi/256/k=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "132e992bc6690b74976a2a609d571d59b35503a1", + "rev": "6544eeb1694d6790292156dc300f149d14bc5210", "type": "github" }, "original": { @@ -174,11 +140,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1778483010, - "narHash": "sha256-cVrxiMpdZWFbveWUKAQoO6UDEvOvINnSnW43eyg3g+Q=", + "lastModified": 1778649239, + "narHash": "sha256-dNaGAK1lcop+yLsJzjlzSEF2YqBQYvIAKMxhaSqtxB0=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "f0501e46e937b433d3153a090626d340fa0c04fe", + "rev": "ba7b8b92f1906de3742dadcbe2d032b5275da891", "type": "github" }, "original": { @@ -187,23 +153,6 @@ "type": "github" } }, - "curl-src": { - "flake": false, - "locked": { - "lastModified": 1743572790, - "narHash": "sha256-huAGWNm2rYBmgzUuYQ21IYp2skyQECelEkXPMBJY3cE=", - "owner": "curl", - "repo": "curl", - "rev": "1c3149881769e7bd79b072e48374e4c2b3678b2f", - "type": "github" - }, - "original": { - "owner": "curl", - "ref": "curl-8_13_0", - "repo": "curl", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -288,11 +237,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1777988971, - "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -443,11 +392,11 @@ ] }, "locked": { - "lastModified": 1778059517, - "narHash": "sha256-EaficK/DCUgnUQAqTvvRLZqVjFf+nOwSFnilYa0Axdc=", + "lastModified": 1778793197, + "narHash": "sha256-8LCG0dpEUHLnBRp3bplUeYVq99ffxCaZyPdaBd+Z0wY=", "owner": "AlvaroParker", "repo": "helium-nix", - "rev": "1f78b1a3b123e8f98296abcb3772dbc5b2eb574d", + "rev": "bc9d6046d947cf1ee72f0bc0a10a483d606e46ac", "type": "github" }, "original": { @@ -463,11 +412,11 @@ ] }, "locked": { - "lastModified": 1778681890, - "narHash": "sha256-RK4sTgei29wBzLu+e4ljeixKutWhbMygFsdxdFKpZOU=", + "lastModified": 1778876681, + "narHash": "sha256-9XOIxYLBp+sJsPWNnNyk1aVfYXuuRJZ4Anpplm9Tn8g=", "owner": "nix-community", "repo": "home-manager", - "rev": "7654d90b94bab7eba3a52fd6f73b3f5a4c544fa2", + "rev": "c7fad8197070948d8aa02cb8922240ee129cab2e", "type": "github" }, "original": { @@ -551,11 +500,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1778683849, - "narHash": "sha256-fKMHYZexPtUUVVvGRake8HE0qXxSdKCtUGdNYqRFNec=", + "lastModified": 1778886962, + "narHash": "sha256-e6PbS5lXPfRWJ0mJAi0oZGrOmyO/Ng4dJFoFWhMe35w=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "998d3af07f57603710674e7cb337b0814d925caf", + "rev": "614671e4e3adde95097d544021a1253070bbc7cd", "type": "github" }, "original": { @@ -825,23 +774,6 @@ "type": "github" } }, - "json-src": { - "flake": false, - "locked": { - "lastModified": 1744360948, - "narHash": "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=", - "owner": "nlohmann", - "repo": "json", - "rev": "55f93686c01528224f448c19128836e7df245f72", - "type": "github" - }, - "original": { - "owner": "nlohmann", - "ref": "v3.12.0", - "repo": "json", - "type": "github" - } - }, "luajit-src": { "flake": false, "locked": { @@ -861,11 +793,11 @@ }, "master": { "locked": { - "lastModified": 1778694342, - "narHash": "sha256-TpMoRzd/5VC2SFCLS3IT4s450po0LYGhzP06LLN4RA0=", + "lastModified": 1778886648, + "narHash": "sha256-ULyOrZobLyvnPwsR1N+I4dv1KvUdhZTAbIsaNRpPDR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33598be40fff8361187d7dac2bd5ae07f3a2924e", + "rev": "7361c416d37dda18faa9960e53c3a41cfbffac6f", "type": "github" }, "original": { @@ -877,25 +809,17 @@ }, "millennium": { "inputs": { - "abseil-src": "abseil-src", - "asio-src": "asio-src", - "curl-src": "curl-src", - "json-src": "json-src", "luajit-src": "luajit-src", "millennium-src": "millennium-src", - "minizip-src": "minizip-src", - "nixpkgs": "nixpkgs_2", - "re2-src": "re2-src", - "websocketpp-src": "websocketpp-src", - "zlib-src": "zlib-src" + "nixpkgs": "nixpkgs_2" }, "locked": { "dir": "packages/nix", - "lastModified": 1778645687, - "narHash": "sha256-PPdpCg/mv2+NwmYwzwIlMdrA8UD5VgG8glLrFb4/OcA=", + "lastModified": 1778870989, + "narHash": "sha256-0GHc0BjLwPIqJxlD8SrG2baM1nXdIt/yc8UbQvyh/Go=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "0e209621f181b5b26a0940414c2830710efd37ff", + "rev": "b59659da33ee5094cdbff6adb0b71c25bbb335ed", "type": "github" }, "original": { @@ -908,34 +832,17 @@ "millennium-src": { "flake": false, "locked": { - "lastModified": 1770463863, - "narHash": "sha256-MceGTpXobCAh5Ll/1iTWcEf6/nHY3Ll1t06JxbYc+Co=", + "lastModified": 1778867291, + "narHash": "sha256-NAnUiDGX+dHSj6OgmJgTEnNHyL8WkOGxxt3T3NDoI/Q=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", + "rev": "233f417dd99b3ece34d15b75e7cf5fd9d4487f15", "type": "github" }, "original": { "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", - "type": "github" - } - }, - "minizip-src": { - "flake": false, - "locked": { - "lastModified": 1746408966, - "narHash": "sha256-I3CZwtfJMsZYQOMdGhooUN8vssnQj6rCzv8F+rne3vg=", - "owner": "zlib-ng", - "repo": "minizip-ng", - "rev": "f3ed731e27a97e30dffe076ed5e0537daae5c1bd", - "type": "github" - }, - "original": { - "owner": "zlib-ng", - "ref": "4.0.10", - "repo": "minizip-ng", + "rev": "233f417dd99b3ece34d15b75e7cf5fd9d4487f15", "type": "github" } }, @@ -969,11 +876,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1778613686, - "narHash": "sha256-3rEqWQNGwoZ6ux3trcjne9aHBEENrY4m3+HJFFt0Hnw=", + "lastModified": 1778786644, + "narHash": "sha256-Nmacd0dSaHA6L35fTa6aXXoQUhoFa7+Z1k13Y9G3DPY=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "863075d77217033287b266055400535f00d9c92d", + "rev": "f2004296fc7cf75fccfa1028a6253dd5f42456a8", "type": "github" }, "original": { @@ -1051,11 +958,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1778586796, - "narHash": "sha256-/WuJBhnL6LLlXto4Pa2w5FGcmwIVZIN0PA7tY/RLEU8=", + "lastModified": 1778729098, + "narHash": "sha256-17SbusskVZng4nwevRqsWNJf27nMG7UczvtgWTUJttg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b25e938b89759b5f9466fc53c4a970244f84dc39", + "rev": "39ea44cddd5060b8cd413ed5e13c6af61f302283", "type": "github" }, "original": { @@ -1135,11 +1042,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1778682931, - "narHash": "sha256-6pfRbQfEBwFEkpm3ZDSi73xugqU55Ebvkt1cptJGmJk=", + "lastModified": 1778844351, + "narHash": "sha256-qcxIr5tIeDh5pV9xI5X8Je4ZpHQCbClUp5wlo5FaPFA=", "owner": "nix-community", "repo": "nixvim", - "rev": "9ad88c3f9778cd6d16fc85a80f3045b45af749e7", + "rev": "40baf3664b73c1cdde67d46a462bed9d60d8d5b3", "type": "github" }, "original": { @@ -1156,11 +1063,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1778694748, - "narHash": "sha256-rnz+rUI1a+oJ+XiSohOCJwUkydiadlFyl1J+kHubxuc=", + "lastModified": 1778830602, + "narHash": "sha256-5HKL37GkJNRHsU8GS38UshBY7UyvTOQim2L4quSYGfE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "56084c6a08d19cf456fcb8888948cd2a99c68ef1", + "rev": "13964255121d100a7306e76a28010f19e8b33a1a", "type": "github" }, "original": { @@ -1240,23 +1147,6 @@ "type": "github" } }, - "re2-src": { - "flake": false, - "locked": { - "lastModified": 1762353507, - "narHash": "sha256-0J1HVk+eR7VN0ymucW9dNlT36j16XIfCzcs1EVyEIEU=", - "owner": "google", - "repo": "re2", - "rev": "927f5d53caf8111721e734cf24724686bb745f55", - "type": "github" - }, - "original": { - "owner": "google", - "ref": "2025-11-05", - "repo": "re2", - "type": "github" - } - }, "root": { "inputs": { "astal": "astal", @@ -1297,11 +1187,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1778680030, - "narHash": "sha256-1TY2s0CWtT0gl7bQmZUPEA6pmRBPCfPj7DNzHIXydG0=", + "lastModified": 1778776709, + "narHash": "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo=", "owner": "nix-community", "repo": "stylix", - "rev": "3401cf7a7d2ce7a3e3180ed4e7225056e7a05c7d", + "rev": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819", "type": "github" }, "original": { @@ -1315,11 +1205,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1778580393, - "narHash": "sha256-cV0exYktVyef+YHE6w5RYwQu4zL8pxC0f6yb7wMsNOA=", + "lastModified": 1778699370, + "narHash": "sha256-BujR2VXTz3wlj8HFwxLFfkVTC+PRChnZtN8yoLRhv9c=", "owner": "MattiaPun", "repo": "SubTUI", - "rev": "ae70dba27ded35a503c0637d61e2247d7ee7263c", + "rev": "29066c199fbcd7b948b59205a82763a3d4deb3e7", "type": "github" }, "original": { @@ -1504,23 +1394,6 @@ "type": "github" } }, - "websocketpp-src": { - "flake": false, - "locked": { - "lastModified": 1587320717, - "narHash": "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=", - "owner": "zaphoyd", - "repo": "websocketpp", - "rev": "56123c87598f8b1dd471be83ca841ceae07f95ba", - "type": "github" - }, - "original": { - "owner": "zaphoyd", - "ref": "0.8.2", - "repo": "websocketpp", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1572,11 +1445,11 @@ ] }, "locked": { - "lastModified": 1778585655, - "narHash": "sha256-yfxy9aTlIgU2Z36H8cJURgYLgjT4qvFeOzoAC/HXcKM=", + "lastModified": 1778846616, + "narHash": "sha256-cqNwCnEdzUlUgNk9c3bVkXnEfmhzHvHre2Nr2C0sIfo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "42f41abcef13dc81c85407b57aa1fd1bde46e46c", + "rev": "3e3671b5f0e7c60e8f10bdf8667598603203546a", "type": "github" }, "original": { @@ -1584,23 +1457,6 @@ "repo": "zen-browser-flake", "type": "github" } - }, - "zlib-src": { - "flake": false, - "locked": { - "lastModified": 1754565515, - "narHash": "sha256-c2RYqHi3hj/ViBzJcYWoNib27GAbq/B1SJUfvG7CPG4=", - "owner": "zlib-ng", - "repo": "zlib-ng", - "rev": "425439062b114a0f6cf625022c41d929c7e879f9", - "type": "github" - }, - "original": { - "owner": "zlib-ng", - "ref": "2.2.5", - "repo": "zlib-ng", - "type": "github" - } } }, "root": "root", diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 52a1f47..fb96c6a 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -92,8 +92,39 @@ boot = { }; services.udev.extraRules = '' - SUBSYSTEM=="tty", KERNEL=="ttyACM*", ATTRS{idVendor}=="346e", ACTION=="add", MODE="0666", TAG+="uaccess" - ''; +# This rule was added by Solaar. +# +# Allows non-root users to have raw access to Logitech devices. +# Allowing users to write to the device is potentially dangerous +# because they could perform firmware updates. + +ACTION == "remove", GOTO="solaar_end" +SUBSYSTEM != "hidraw", GOTO="solaar_end" + +# USB-connected Logitech receivers and devices +ATTRS{idVendor}=="046d", GOTO="solaar_apply" + +# Lenovo nano receiver +ATTRS{idVendor}=="17ef", ATTRS{idProduct}=="6042", GOTO="solaar_apply" + +# Bluetooth-connected Logitech devices +KERNELS == "0005:046D:*", GOTO="solaar_apply" + +GOTO="solaar_end" + +LABEL="solaar_apply" + +# Allow any seated user to access the receiver. +# uaccess: modern ACL-enabled udev +TAG+="uaccess" + +# Grant members of the "plugdev" group access to receiver (useful for SSH users) +#MODE="0660", GROUP="plugdev" + +LABEL="solaar_end" +# vim: ft=udevrules + ''; + boot.extraModulePackages = with config.boot.kernelPackages; [ universal-pidff xpadneo ]; @@ -321,6 +352,7 @@ services.pulseaudio.extraConfig = '' killall usbutils mangohud + solaar ffmpeg linux-wallpaperengine oversteer @@ -387,6 +419,9 @@ services.pulseaudio.extraConfig = '' remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server #package = pkgs.millennium-steam; + extraPackages = [ + pkgs.hidapi + ]; }; hardware.steam-hardware.enable=true; services.monado = {