diff --git a/flake.lock b/flake.lock index 02a217e..1496ff9 100644 --- a/flake.lock +++ b/flake.lock @@ -111,11 +111,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763199681, - "narHash": "sha256-3c5oZigLzzQp13TnjwkOAT0QDaJjShQciIHMa1PFR+c=", + "lastModified": 1765855559, + "narHash": "sha256-AUT31hDJliW0fK9G7tfTEDD2me4rIXbBXPu1lf0mVHs=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "f1e67b6763e47794f1819eb9d55d95b839484bad", + "rev": "0eb86c42d1e33e8dbcf771cb67446319517a0a57", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1762356719, - "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", + "lastModified": 1765900596, + "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", + "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", "type": "github" }, "original": { @@ -301,17 +301,17 @@ "base16-fish_2": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -334,11 +334,11 @@ "base16-helix_2": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -567,11 +567,11 @@ "firefox-gnome-theme_2": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -630,11 +630,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -827,11 +827,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -1344,11 +1344,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -1477,11 +1477,11 @@ ] }, "locked": { - "lastModified": 1764007004, - "narHash": "sha256-OnonWWGrUGPc3y1TES/RVCe4Gd75YgdU8aIp07Au4lc=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "125e40fa68b340aee9d474a46b540907e2537b5c", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -1520,11 +1520,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1763589171, - "narHash": "sha256-3+k074XQ4quCWQ/WLEeYTTD+AlDlxtzKvH9gkWqn+8Y=", + "lastModified": 1766947518, + "narHash": "sha256-DbwPyVo9zoMMg0F3KkPalcLaGi5xyUsbc7Xg1kYHYxA=", "owner": "VirtCode", "repo": "hypr-dynamic-cursors", - "rev": "85e6a93f311132d775538c4a016b637b366d2a44", + "rev": "7e9b7bc9fbcbb2f7f8985ec1f435b43021609639", "type": "github" }, "original": { @@ -1659,11 +1659,11 @@ ] }, "locked": { - "lastModified": 1762462052, - "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", + "lastModified": 1763733840, + "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", + "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", "type": "github" }, "original": { @@ -1717,17 +1717,18 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1764015075, - "narHash": "sha256-ixmK7KVohYhFjiW6hZw0LhPJzV7CKyDL+eSLLbqzY8I=", + "lastModified": 1767282503, + "narHash": "sha256-AkfIH9C46l2NA5SR5zT8UJ545mh+yszzzsWWBvi6aRQ=", "ref": "refs/heads/main", - "rev": "3d7ea9c02face0d6c5d9963030a06705268979ba", - "revCount": 6644, + "rev": "9b93d621b1019e8378b8a902edb7ba8dd8baf204", + "revCount": 6765, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1771,11 +1772,11 @@ ] }, "locked": { - "lastModified": 1762755186, - "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", + "lastModified": 1765643131, + "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", + "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", "type": "github" }, "original": { @@ -1801,11 +1802,11 @@ ] }, "locked": { - "lastModified": 1763856454, - "narHash": "sha256-jlP442tr1Q7BynLKEb+L5lyGViJF5qUioymBCccV7/Y=", + "lastModified": 1767279506, + "narHash": "sha256-x60I9XSY5DJ+Oth/q08HTSxyCACYWVcWQcy2el6LOts=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "7ffc0b314e638ca4f8ce9cb1305951a47d107ade", + "rev": "c2fe049150f1110865553b585e8cdc3e9780020b", "type": "github" }, "original": { @@ -1862,11 +1863,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -2033,11 +2034,11 @@ ] }, "locked": { - "lastModified": 1763254292, - "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -2120,11 +2121,11 @@ ] }, "locked": { - "lastModified": 1762463729, - "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", "type": "github" }, "original": { @@ -2145,11 +2146,11 @@ ] }, "locked": { - "lastModified": 1763323331, - "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", + "lastModified": 1766160771, + "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0c6411851cc779d551edc89b83966696201611aa", + "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", "type": "github" }, "original": { @@ -2199,11 +2200,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -2241,6 +2242,35 @@ "type": "github" } }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1766253200, + "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "ixx": { "inputs": { "flake-utils": [ @@ -2330,11 +2360,11 @@ ] }, "locked": { - "lastModified": 1763984116, - "narHash": "sha256-moc1ykjdvF3LV1TXx7bUhYgpZJ0rD/IP9q7sW8nvqRg=", + "lastModified": 1767042222, + "narHash": "sha256-rqI8dljfih+lmtZWRICNQW0Lyolc03fic1xxY/LVHbw=", "owner": "melonDS-emu", "repo": "melonDS", - "rev": "c8c7983eaded808dc72cb2b1404ef19e11e1e1d3", + "rev": "8fa251f40ef40db3987bc4c5786e78ad9e5db294", "type": "github" }, "original": { @@ -2489,11 +2519,11 @@ ] }, "locked": { - "lastModified": 1763505477, - "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", + "lastModified": 1767028240, + "narHash": "sha256-0/fLUqwJ4Z774muguUyn5t8AQ6wyxlNbHexpje+5hRo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", + "rev": "c31afa6e76da9bbc7c9295e39c7de9fca1071ea1", "type": "github" }, "original": { @@ -2641,11 +2671,11 @@ ] }, "locked": { - "lastModified": 1763870992, - "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "d7423982c7a26586aa237d130b14c8b302c7a367", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -2805,11 +2835,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -2851,11 +2881,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1764019301, - "narHash": "sha256-UoDDNU3zsqBiL+oheRWFHNh5P2poc2JBUIyF5Kb3EhA=", + "lastModified": 1767286351, + "narHash": "sha256-hENfxG1zid4iEmoXmKmnBqFQsVrbBrqeOCp+7QJhv9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "86d1f98ec2b9f44b501726e20076ed111c4c46c2", + "rev": "bce9dc8c553c2a8e4e76f0cf5a87616310f44f53", "type": "github" }, "original": { @@ -2915,11 +2945,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763934636, - "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", + "lastModified": 1767242400, + "narHash": "sha256-knFaYjeg7swqG1dljj1hOxfg39zrIy8pfGuicjm9s+o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", + "rev": "c04833a1e584401bb63c1a63ddc51a71e6aa457a", "type": "github" }, "original": { @@ -3155,11 +3185,11 @@ }, "nixpkgs_22": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -3171,11 +3201,11 @@ }, "nixpkgs_23": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -3203,11 +3233,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -3219,11 +3249,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -3251,11 +3281,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -3464,11 +3494,11 @@ "nixpkgs": "nixpkgs_22" }, "locked": { - "lastModified": 1764018759, - "narHash": "sha256-Q7F5zsSmkQM2bsFlTNu8rxQwwELrYuNtF+AOzNxq3OM=", + "lastModified": 1767286707, + "narHash": "sha256-x6ZSzFz8oxLdQ8ILWGE4OssejqqTZVnPB+Ee9XDzlTA=", "owner": "nix-community", "repo": "nur", - "rev": "eeb2708c42964dadc2de8574289f5166c6da4c3f", + "rev": "14dff6c8b4c9d52640958e633c7fff8af1e84399", "type": "github" }, "original": { @@ -3489,11 +3519,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -3743,11 +3773,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -3952,11 +3982,11 @@ ] }, "locked": { - "lastModified": 1763870012, - "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", + "lastModified": 1766894905, + "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", + "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", "type": "github" }, "original": { @@ -3996,11 +4026,11 @@ "systems": "systems_21" }, "locked": { - "lastModified": 1763985453, - "narHash": "sha256-vUqODgLIjeyHN7DP8dVx7oH9yB/L8qcxpN//4EmMQcM=", + "lastModified": 1767195736, + "narHash": "sha256-0xvPSbhIGeJzsJXNTkgJ3PjwdVItKm85wzYKA9NmSzI=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "89cd40c646ec5b12e5c20c0e18f082e7629d4819", + "rev": "465adc0ab6ff0c4b9b1db1c6e7fd7eeb553b3261", "type": "github" }, "original": { @@ -4032,11 +4062,11 @@ "nixpkgs": "nixpkgs_23" }, "locked": { - "lastModified": 1762439397, - "narHash": "sha256-nYBc60mHTqnYU/RDUSC+onIUvpnda7NhejEEBpdl8Rc=", + "lastModified": 1764970642, + "narHash": "sha256-nPY9nFr65gezb0oK1kCM5suPkcrx6jXdIq4Xx7q0/fQ=", "ref": "refs/heads/main", - "rev": "110e114cc91d8537453a575db5ddba5a2f332267", - "revCount": 80, + "rev": "93ab88d9fb32f184c2a57a758bbc5c172d0ab70a", + "revCount": 94, "type": "git", "url": "https://code.thishorsie.rocks/ryze/stackpkgs" }, @@ -4102,11 +4132,11 @@ "tinted-zed": "tinted-zed_2" }, "locked": { - "lastModified": 1763845141, - "narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=", + "lastModified": 1766603026, + "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", "owner": "nix-community", "repo": "stylix", - "rev": "adc650610085adbe130b9860d5bdb869f96050af", + "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", "type": "github" }, "original": { @@ -4530,11 +4560,11 @@ "tinted-schemes_2": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -4562,11 +4592,11 @@ "tinted-tmux_2": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -4594,11 +4624,11 @@ "tinted-zed_2": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -4630,11 +4660,11 @@ "nixpkgs": "nixpkgs_24" }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1767122417, + "narHash": "sha256-yOt/FTB7oSEKQH9EZMFMeuldK1HGpQs2eAzdS9hNS/o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "dec15f37015ac2e774c84d0952d57fcdf169b54d", "type": "github" }, "original": { @@ -4814,17 +4844,17 @@ "vault_2": { "flake": false, "locked": { - "lastModified": 1763389251, - "narHash": "sha256-GZ9bYfHplaJNWP690Qn+KmPTSz4kjzDni+FtGPivCN8=", + "lastModified": 1767320123, + "narHash": "sha256-Tj57MikawBn38M7NVSGyM+dE02paJpbcnIvq2lZDR0Q=", "ref": "refs/heads/main", - "rev": "397b27cd20271b2221594af058ed46060a930b51", - "revCount": 42, + "rev": "b52df0c602f26667cb6151833f5c0fac8d4417bd", + "revCount": 44, "type": "git", - "url": "ssh://git@github.com/runarsf/vault" + "url": "ssh://git@github.com/Boiing587/vault" }, "original": { "type": "git", - "url": "ssh://git@github.com/runarsf/vault" + "url": "ssh://git@github.com/Boiing587/vault" } }, "wezterm": { @@ -4976,11 +5006,11 @@ ] }, "locked": { - "lastModified": 1763697957, - "narHash": "sha256-p6CTJoeM3EK9tcqm6lgnKZFVJiGHCzcCftkko4EpEb0=", + "lastModified": 1766377218, + "narHash": "sha256-y3g3OqPB0tmRjbHJNnJKivSQRtAJR+/9S1xbxBWEatg=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "9eb198a4d7ea4bd1284254780e3c22533f743d55", + "rev": "2f61341b32dd69c07e147188e67e09ba2bb99c33", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5947b57..52931b1 100644 --- a/flake.nix +++ b/flake.nix @@ -98,9 +98,11 @@ }; vault = { - url = "git+ssh://git@github.com/runarsf/vault"; + url = "git+ssh://git@github.com/Boiing587/vault"; flake = false; }; + + hytale-launcher.url = "github:JPyke3/hytale-launcher-nix"; }; outputs = inputs @ {self, ...}: let @@ -145,6 +147,12 @@ hostname = "toaster"; users = ["thomas"]; }; + + roomba = lib.mkHost { + system = "x86_64-linux"; + hostname = "roomba"; + users = ["majus"]; + }; }; homeConfigurations = { @@ -181,6 +189,14 @@ system = "x86_64-linux"; hostname = "toaster"; }; + + majus = lib.mkUser {username = "majus";}; + + "majus@roomba" = lib.mkUser { + username = "majus"; + system = "x86_64-linux"; + hostname = "roomba"; + }; }; formatter = inputs.flake-utils.eachDefaultSystem ( diff --git a/hosts/roomba/configuration.nix b/hosts/roomba/configuration.nix new file mode 100644 index 0000000..1b21a4e --- /dev/null +++ b/hosts/roomba/configuration.nix @@ -0,0 +1,24 @@ +_: { + imports = [ + ../../modules/linux/locales/norwegian.nix + ../../modules/linux/systemd-boot.nix + ../../modules/linux/thunderbolt.nix + ../../modules/linux/network.nix + ../../modules/linux/firewall.nix + ../../modules/linux/printing.nix + ]; + + services.libinput.enable = true; + services.xserver.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; + + system.stateVersion = "24.05"; + + boot.kernelParams = [ + "modset=1" + "fbdev=1" + "pcie_port_pm=off" + "pcie_aspm.policy=performance" + ]; +} diff --git a/hosts/roomba/hardware-configuration.nix b/hosts/roomba/hardware-configuration.nix new file mode 100644 index 0000000..7eb8c18 --- /dev/null +++ b/hosts/roomba/hardware-configuration.nix @@ -0,0 +1,31 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "thunderbolt" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/3efcf2fe-7c0f-4fc6-940f-fdc5c3b643a3"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/4D18-C912"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/linux/network.nix b/modules/linux/network.nix index 1a8227c..cbddee1 100644 --- a/modules/linux/network.nix +++ b/modules/linux/network.nix @@ -3,17 +3,17 @@ enable = true; plugins = with pkgs; [ networkmanager-openconnect - networkmanager-l2tp + # networkmanager-l2tp ]; }; programs.nm-applet.enable = true; # Required for Unify L2TP VPN, enable *only* MSCHAPv2 in networkmanager. - services.strongswan = { - enable = true; - secrets = [ - "ipsec.d/ipsec.nm-l2tp.secrets" - ]; - }; + # services.strongswan = { + # enable = true; + # secrets = [ + # "ipsec.d/ipsec.nm-l2tp.secrets" + # ]; + # }; } diff --git a/modules/users/development/javascript.nix b/modules/users/development/javascript.nix index 0b0bad8..cbb99ba 100644 --- a/modules/users/development/javascript.nix +++ b/modules/users/development/javascript.nix @@ -5,8 +5,10 @@ ... }: # TODO set node prefix to .local/share/npm and npm/bin to path -outputs.lib.mkModule config "dev.javascript" { - home.packages = with pkgs; [ - nodejs - ]; +outputs.lib.mkModule config ["dev" "javascript"] { + config = { + home.packages = with pkgs; [ + nodejs + ]; + }; } diff --git a/modules/users/development/qmk.nix b/modules/users/development/qmk.nix index 90805c0..0137bb8 100644 --- a/modules/users/development/qmk.nix +++ b/modules/users/development/qmk.nix @@ -7,20 +7,20 @@ outputs.lib.mkModule config "qmk" { nixos = { hardware.keyboard = { - zsa.enable = true; + # zsa.enable = true; qmk.enable = true; }; services.udev.packages = with pkgs; [ qmk-udev-rules - qmk - via - vial + # qmk + # via + # vial ]; environment.systemPackages = with pkgs; [ - qmk - via - vial - python313Packages.appdirs + # qmk + # via + # vial + # python313Packages.appdirs ]; }; diff --git a/modules/users/gaming/hytale.nix b/modules/users/gaming/hytale.nix new file mode 100644 index 0000000..29e5703 --- /dev/null +++ b/modules/users/gaming/hytale.nix @@ -0,0 +1,10 @@ +{ + config, + inputs, + outputs, + pkgs, + ... +}: +outputs.lib.mkDesktopModule config "hytale" { + home.packages = [inputs.hytale-launcher.packages.${pkgs.system}.default]; +} diff --git a/modules/users/hyprland/default.nix b/modules/users/hyprland/default.nix index db0d78f..e83892b 100644 --- a/modules/users/hyprland/default.nix +++ b/modules/users/hyprland/default.nix @@ -228,7 +228,6 @@ in enable_swallow = true; key_press_enables_dpms = true; render_unfocused_fps = 30; - new_window_takes_over_fullscreen = 1; allow_session_lock_restore = 1; swallow_regex = "^(Alacritty|kitty|org.wezfurlong.wezterm|com.mitchellh.ghostty)$"; animate_manual_resizes = config.modules.hyprland.animations; diff --git a/modules/users/streaming.nix b/modules/users/streaming.nix new file mode 100644 index 0000000..5572cbd --- /dev/null +++ b/modules/users/streaming.nix @@ -0,0 +1,11 @@ +{ + config, + pkgs, + outputs, + ... +}: +outputs.lib.mkDesktopModule config "streaming" { + home.packages = with pkgs; [ + obs-studio + ]; +} diff --git a/modules/users/wootility.nix b/modules/users/wootility.nix new file mode 100644 index 0000000..0279fb7 --- /dev/null +++ b/modules/users/wootility.nix @@ -0,0 +1,10 @@ +{ + config, + pkgs, + outputs, + ... +}: +outputs.lib.mkDesktopModule config "wootility" { + home.packages = with pkgs; [ wootility ]; + modules.udev.extraRules = [ ./wootility.rules ]; +} diff --git a/modules/users/wootility.rules b/modules/users/wootility.rules new file mode 100644 index 0000000..6154cdf --- /dev/null +++ b/modules/users/wootility.rules @@ -0,0 +1,35 @@ +# Wooting One Legacy +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input", TAG+="uaccess" +SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input", TAG+="uaccess" +# Wooting One update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0660", GROUP="input", TAG+="uaccess" + +# Wooting Two Legacy +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input", TAG+="uaccess" +SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input", TAG+="uaccess" +# Wooting Two update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input", TAG+="uaccess" + +# Generic Wootings +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", MODE:="0660", GROUP="input", TAG+="uaccess" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", MODE:="0660", GROUP="input", TAG+="uaccess" + +# Wooting One Legacy for snap Chromium (Ubuntu) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="snap_chromium_chromedriver" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="snap_chromium_chromium" + +# Wooting One update mode for snap Chromium (Ubuntu) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="snap_chromium_chromedriver" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="snap_chromium_chromium" + +# Wooting Two Legacy for snap Chromium (Ubuntu) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="snap_chromium_chromedriver" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="snap_chromium_chromium" + +# Wooting Two update mode for snap Chromium (Ubuntu) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="snap_chromium_chromedriver" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="snap_chromium_chromium" + +# Generic Wootings for snap Chromium (Ubuntu) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="snap_chromium_chromedriver" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="snap_chromium_chromium" diff --git a/users/majus/avatar.jpg b/users/majus/avatar.jpg new file mode 100644 index 0000000..668c0a0 Binary files /dev/null and b/users/majus/avatar.jpg differ diff --git a/users/majus/config/git.nix b/users/majus/config/git.nix new file mode 100644 index 0000000..2fe9b5c --- /dev/null +++ b/users/majus/config/git.nix @@ -0,0 +1,13 @@ +_: { + modules.git = { + enable = true; + emailSelector = { + enable = true; + }; + }; + + programs.git.settings = { + user.name = "Majus-Dev"; + user.email = "83781075+Majus-Dev@users.noreply.github.com"; + }; +} diff --git a/users/majus/default.nix b/users/majus/default.nix new file mode 100644 index 0000000..ed1a5aa --- /dev/null +++ b/users/majus/default.nix @@ -0,0 +1,288 @@ +{ + lib, + config, + inputs, + osConfig, + outputs, + system, + hostname, + name, + pkgs, + ... +}: let + ifIsDesktop = outputs.lib.optionals config.isDesktop; # (outputs.lib.isDesktop config hostname); +in + outputs.lib.mkFor system hostname { + common = { + imports = + outputs.lib.concatPaths {paths = ../../modules/users;} + ++ outputs.lib.concatPaths {paths = ./config;}; + + defaultTerminal = "wezterm"; + defaultBrowser = "zen"; + avatar = ./avatar.jpg; + + modules = + outputs.lib.enable [ + "neovim" + "zsh" + "nushell" + "gpg" + "keychain" + "nix" + "yazi" + ] + // { + wallpaper = ./wallpaper.jpg; + sops = { + enable = true; + ageKeys = ["${config.home.homeDirectory}/.ssh/id_nix"]; + privateKeys = [ + # "id_priv" + ]; + }; + ssh = { + enable = true; + keys = { + id_nix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDOLOJZh9s8msIwJvG8utSJ0R2OlrLOzY7YXGQS2HVj1 nix"; + id_priv = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJFuposVT3zCdJsOE36vhz0N5gVYj5rom+gu4/qnKBLa majus"; + }; + }; + }; + + wayland.windowManager.hyprland.settings.bind = [ ]; + }; + + systems = { + linux = { + modules = + outputs.lib.enable [ + "discord" + "fonts" + "vscode" + "hyprland" + "sops-fonts" + "bluetooth" + "gaming" + "zen" + "pipewire" + "mpv" + "camera" + "fastfetch" + ] + // { + spotify = { + enable = true; + spicetify = true; + }; + stylix = { + enable = true; + system-wide = true; + theme = "ayu-dark"; + }; + wezterm = { + enable = true; + bitmap = true; + }; + }; + + # home.packages = with pkgs; ifIsDesktop [inputs.openconnect-sso.packages."${pkgs.system}".default]; + + programs.fastfetch.settings.logo = { + source = + outputs.lib.mkForce + <| builtins.toFile "logo.txt" '' + ／|_ + ($2o o$1 / + |. ~. + じしf_,)ノ + ''; + padding.top = outputs.lib.mkForce 1; + }; + nixos = { + programs.zsh.enable = true; + users.users."${name}" = { + isNormalUser = true; + initialPassword = "changeme"; + description = "Majus"; + home = "/home/majus"; + shell = pkgs.zsh; + extraGroups = [ + "wheel" + "networkmanager" + "docker" + "audio" + "video" + "libvirtd" + "input" + "i2c" + ]; + }; + }; + }; + }; + + hosts = { + roomba = { + isDesktop = true; + + modules = + outputs.lib.enable [ + "japanese" + "steam" + "ffxiv" + "hytale" + "easyeffects" + "zed" + "kitty" + "logitech" + "wootility" + "streaming" + ] + // { + dev.javascript.enable = true; + }; + + programs.hyprpanel.settings.bar.layouts = { + "0" = lib.mkForce { + left = [ + "dashboard" + "workspaces" + "windowtitle" + "systray" + ]; + middle = ["media"]; + right = [ + "volume" + "bluetooth" + "hypridle" + "network" + "cpu" + "ram" + "clock" + "notifications" + ]; + }; + "1" = { + left = [ + "dashboard" + "workspaces" + "windowtitle" + ]; + middle = ["media"]; + right = [ + "clock" + "notifications" + ]; + }; + }; + + home.packages = with pkgs; [ + modrinth-app + r2modman + bitwarden-desktop + ]; + + nixos = { + services.flatpak.enable = true; + + environment.systemPackages = with pkgs; [amdgpu_top corectrl]; + hardware = { + amdgpu = { + initrd.enable = true; + }; + graphics = { + enable = true; + enable32Bit = true; + package = with pkgs.unstable; mesa; + # extraPackages = with pkgs.unstable; [ amdvlk mesa ]; + }; + + bluetooth.powerOnBoot = true; + }; + + services.xserver.videoDrivers = ["modesetting"]; + + # systemd.tmpfiles.rules = [ + # "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" + # ]; + + boot = { + kernelPackages = pkgs.linuxPackages_latest; + initrd.kernelModules = ["amdgpu"]; + # kernelParams = [ + # "radeon.si_support=0" + # "amdgpu.si_support=1" + # "amdgpu.dc=1" + # ]; + + kernel.sysctl = { + "fs.file-max" = 262144; + }; + }; + + security.pam.loginLimits = [ + { + domain = "*"; + item = "nofile"; + type = "-"; + value = "262144"; + } + { + domain = "*"; + item = "memlock"; + type = "-"; + value = "262144"; + } + ]; + systemd = { + user.extraConfig = "DefaultLimitNOFILE=262144"; + }; + }; + + wayland.windowManager.hyprland.settings = { + env = [ + "GDK_BACKEND,wayland,x11" + "SDL_VIDEODRIVER,wayland,x11" + "CLUTTER_BACKEND,wayland" + "MOZ_ENABLE_WAYLAND,1" + "MOZ_DISABLE_RDD_SANDBOX,1" + "_JAVA_AWT_WM_NONREPARENTING=1" + "QT_AUTO_SCREEN_SCALE_FACTOR,1" + "QT_QPA_PLATFORM,wayland" + # "LIBVA_DRIVER_NAME,nvidia" + # "GBM_BACKEND,nvidia-drm" + # "__GLX_VENDOR_LIBRARY_NAME,nvidia" + "WLR_NO_HARDWARE_CURSORS,1" + "__NV_PRIME_RENDER_OFFLOAD,1" + # "__VK_LAYER_NV_optimus,NVIDIA_only" + "PROTON_ENABLE_NGX_UPDATER,1" + "NVD_BACKEND,direct" + "__GL_GSYNC_ALLOWED,0" + "__GL_VRR_ALLOWED,0" + "WLR_EGL_NO_MODIFIERS,1" + # "WLR_DRM_NO_ATOMIC,1" + "WLR_USE_LIBINPUT,1" + # "XWAYLAND_NO_GLAMOR,1" # with this you'll need to use gamescope for gaming + "__GL_MaxFramesAllowed,1" + # "WLR_RENDERER_ALLOW_SOFTWARE,1" + ]; + + windowrule = [ + "workspace 5, match:class XIVLauncher.Core" + "workspace 5, match:class Ffxiv_dx11.exe" + ]; + + workspace = let + primary = "monitor:DP-2"; + secondary = "monitor:DP-3"; + in [ + "4, ${primary}" + "10, ${primary}" + "1, ${secondary}" + "2, ${secondary}" + ]; + }; + }; + }; + } diff --git a/users/majus/wallpaper.jpg b/users/majus/wallpaper.jpg new file mode 100644 index 0000000..4bf9367 Binary files /dev/null and b/users/majus/wallpaper.jpg differ diff --git a/users/runar/default.nix b/users/runar/default.nix index 3fb0a25..012f182 100644 --- a/users/runar/default.nix +++ b/users/runar/default.nix @@ -209,7 +209,6 @@ outputs.lib.mkFor system hostname { # FIXME Using dev.go and dev.go.ide in lib.enable breaks and neither get enabled modules = outputs.lib.enable [ - "ctf" "audiorelay" "kvm" "easyeffects"