diff --git a/flake.lock b/flake.lock index 457bdacc7ef29a8a19b24ca5c434f5e3c6d43188..14f9529f3ed1bee011eb19c9fe505ca13cfdd65a 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1767990299, - "narHash": "sha256-Jz+cp9Ln4++1XiKw9KvZEM2dJ9AdOvayk97ybi9g7zc=", + "lastModified": 1771360638, + "narHash": "sha256-s6dqFccvgDj5+q10/CroMzMzjMWWjEOiQsmi1CFeqiw=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "449f2cadee7cb7b665aea209a67f8ecf30176653", + "rev": "1a9b8a0d2950d9aedb788b74ebd60effae3a58a4", "type": "github" }, "original": { @@ -25,9 +25,7 @@ }, "apple-fonts": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "ny": "ny", "sf-arabic": "sf-arabic", "sf-armenian": "sf-armenian", @@ -38,52 +36,19 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1758228441, - "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=", - "owner": "Lyndeno", + "lastModified": 1770758542, + "narHash": "sha256-MhtCW601b9tAMP20FBToytRSUMoThtefJ3/7kCThwsE=", + "owner": "nmarks413", "repo": "apple-fonts.nix", - "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72", + "rev": "96173002252e90bac2a1f863d709508220cb5db7", "type": "github" }, "original": { - "owner": "Lyndeno", + "owner": "nmarks413", "repo": "apple-fonts.nix", "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1767024902, - "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -91,11 +56,11 @@ ] }, "locked": { - "lastModified": 1767718503, - "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", + "lastModified": 1771371916, + "narHash": "sha256-G14VTfmzzRYxAhtEBNanQgCNA++Cv0/9iV4h/lkqX9U=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", + "rev": "aff4c008cec17d6a6760949df641ca0ea9179cac", "type": "github" }, "original": { @@ -113,11 +78,11 @@ ] }, "locked": { - "lastModified": 1764011051, - "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=", + "lastModified": 1768818222, + "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", "owner": "numtide", "repo": "devshell", - "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071", + "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", "type": "github" }, "original": { @@ -127,22 +92,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1751685974, @@ -158,6 +107,22 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_3": { "flake": false, "locked": { @@ -174,22 +139,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -198,11 +147,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -231,7 +180,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -251,24 +200,6 @@ "inputs": { "systems": "systems_6" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_7" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -283,9 +214,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -302,28 +233,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "flake": false, "locked": { "lastModified": 1762808025, @@ -339,7 +248,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_2": { "inputs": { "nixpkgs": [ "zls", @@ -367,11 +276,11 @@ ] }, "locked": { - "lastModified": 1768018810, - "narHash": "sha256-WREj1ZQ2wSGtyPAhQJ3SX/7PJ29PNKv04h/7NgqUS+M=", + "lastModified": 1771269455, + "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c5d9345ad7cc38832cd4007f5cd03daad64d75b", + "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", "type": "github" }, "original": { @@ -381,325 +290,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1766946335, - "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "4af02a3925b454deb1c36603843da528b67ded6c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-guiutils": "hyprland-guiutils", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1768000181, - "narHash": "sha256-/E66+tcVBnvJcOFL/CjnjBfKew6A2e+28EZrcRHioBw=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "81e7498ec27156ee97aabba6fe4993412d98d1ab", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-guiutils": { - "inputs": { - "aquamarine": [ - "hyprland", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprtoolkit": "hyprtoolkit", - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1767023960, - "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1765214753, - "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprtoolkit": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland-guiutils", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland-guiutils", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland-guiutils", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-guiutils", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland-guiutils", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland-guiutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-guiutils", - "systems" - ] - }, - "locked": { - "lastModified": 1764592794, - "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1766253372, - "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwire": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1767473322, - "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", - "owner": "hyprwm", - "repo": "hyprwire", - "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwire", - "type": "github" - } - }, "langref": { "flake": false, "locked": { @@ -714,11 +304,11 @@ }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1770419553, + "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", "type": "github" }, "original": { @@ -734,11 +324,11 @@ ] }, "locked": { - "lastModified": 1765916709, - "narHash": "sha256-qc4m7v8hGOMb9BVLuiQZAbgzHoKfVwEY7HUl9fsY/hE=", + "lastModified": 1770835386, + "narHash": "sha256-Yp0ooU66hXjGq0cAG9WwhmLCfqCVzRxGXx7+nggPlqI=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "d0ad754cf0b9c5a34d7f69595f407c8199f988ce", + "rev": "6e0829e81d363e4ebb7c3f04601a50853f752c99", "type": "github" }, "original": { @@ -749,37 +339,26 @@ }, "ndg": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nvf", + "nixpkgs" + ] }, "locked": { - "lastModified": 1765435293, - "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "owner": "feel-co", "repo": "ndg", - "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { "owner": "feel-co", + "ref": "refs/tags/v2.6.0", "repo": "ndg", "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1693833173, - "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "ac030bd9ba98e318e1f4c4328d60766ade8ebe8b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -787,11 +366,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1771130777, + "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "type": "github" }, "original": { @@ -803,15 +382,15 @@ "nix-options-search": { "inputs": { "flake-utils": "flake-utils_2", - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1765642879, - "narHash": "sha256-LIKEZW++qgg8FSpJtAayv6yfIF3CO42GpryyeJ4pk7M=", + "lastModified": 1768731915, + "narHash": "sha256-5lMgfTfLpsqMMlbRbaQ0jZMsh764IocBsM3cbR0QvPU=", "owner": "madsbv", "repo": "nix-options-search", - "rev": "b91e3ad2b4f3afbf0ceadb140fb9a0d342733b2e", + "rev": "f8f48b94dd931eff54e17d2185ef310c02bfa0bb", "type": "github" }, "original": { @@ -822,15 +401,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", - "owner": "NixOS", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -854,11 +433,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1767966113, - "narHash": "sha256-mSTsvXa4WveSRJexsmCbm9dY17B1fKp7NLpJxllpQw4=", + "lastModified": 1771177547, + "narHash": "sha256-trTtk3WTOHz7hSw89xIIvahkgoFJYQ0G43IlqprFoMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f02c91314c8ba4afe83b256b023756412218535", + "rev": "ac055f38c798b0d87695240c7b761b82fc7e5bc2", "type": "github" }, "original": { @@ -868,22 +447,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1762111121, "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", @@ -899,23 +462,23 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1771043024, + "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_6": { - "locked": { - "lastModified": 1708161998, - "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "84d981bae8b5e783b3b548de505b22880559515f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1717696253, "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", @@ -933,26 +496,25 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "mnw": "mnw", "ndg": "ndg", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1765537745, - "narHash": "sha256-EaFYxx2aSuM2xx+l+E55YNMCJOoQBl2tJybxyF0pPqw=", + "lastModified": 1771331465, + "narHash": "sha256-lTWc6reKRLQfhh4uRsBWGbdwcHt5fQpOxt6jueHZ20c=", "owner": "notashelf", "repo": "nvf", - "rev": "8e031476d0d7f326b63c9c5522f840e2f8b724c0", + "rev": "0c650e0801aebbfc2817c11140c90768c178b13b", "type": "github" }, "original": { "owner": "notashelf", - "ref": "v0.8", "repo": "nvf", "type": "github" } @@ -969,43 +531,18 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767281941, - "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "android-nixpkgs": "android-nixpkgs", "apple-fonts": "apple-fonts", "darwin": "darwin", "home-manager": "home-manager", - "hyprland": "hyprland", "moonlight": "moonlight", "nix-index-database": "nix-index-database", "nix-options-search": "nix-options-search", "nixpkgs": "nixpkgs_3", "nvf": "nvf", "rust-overlay": "rust-overlay", - "split-monitor-workspaces": "split-monitor-workspaces", "vicinae": "vicinae", "zen-browser": "zen-browser", "zig": "zig", @@ -1019,11 +556,11 @@ ] }, "locked": { - "lastModified": 1768012928, - "narHash": "sha256-HFFVQaux1JoOjEvgBT0ASk1Je+jsipyO5c91FoLMed8=", + "lastModified": 1771384185, + "narHash": "sha256-KvmjUeA7uODwzbcQoN/B8DCZIbhT/Q/uErF1BBMcYnw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "312b4371e72f644ffcff25b23615195e3b390643", + "rev": "23dd7fa91602a68bd04847ac41bc10af1e6e2fd2", "type": "github" }, "original": { @@ -1059,7 +596,7 @@ "sf-compact": { "flake": false, "locked": { - "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=", + "narHash": "sha256-oLhkN4HYkU1Xjxk+xdmyxJmROSzo1qd/tafdxw7icxs=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" }, @@ -1107,7 +644,7 @@ "sf-pro": { "flake": false, "locked": { - "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=", + "narHash": "sha256-s42hsaUe0Vkaw5yw8G7G3W3AYJb2TPqSlMqPyY0e5WU=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" }, @@ -1116,27 +653,6 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" } }, - "split-monitor-workspaces": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nix-filter": "nix-filter" - }, - "locked": { - "lastModified": 1767711026, - "narHash": "sha256-yTuyde8TpBR3NhNnOcK4uOGukvMCwrH3otP8E04e9X0=", - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "rev": "764548c3aa22c9f4cb436ec7243d21795eb6ebec", - "type": "github" - }, - "original": { - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1154,16 +670,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1198,6 +714,7 @@ } }, "systems_5": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1242,32 +759,17 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "vicinae": { "inputs": { - "nixpkgs": "nixpkgs_5", - "systems": "systems_5" + "nixpkgs": "nixpkgs_4", + "systems": "systems_4" }, "locked": { - "lastModified": 1767958732, - "narHash": "sha256-Jy7Px8fWfZgRRWcv5d8XTddPDaHRJ1o4mG3yTlEkXTo=", + "lastModified": 1771257846, + "narHash": "sha256-2tz4RVC1IwSpQL/t0raRZ+ydHQje0QzN65rcJo+JjyQ=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "c80929ea3f44d540a5063ad1262799aa32a7929c", + "rev": "e9d804bfddad02ff80347401ae0d42ca8202519f", "type": "github" }, "original": { @@ -1276,47 +778,6 @@ "type": "github" } }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -1324,11 +785,11 @@ ] }, "locked": { - "lastModified": 1767618227, - "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=", + "lastModified": 1771303137, + "narHash": "sha256-CQ0j9kovzdO6pAjesebt6uxkcFsjbhENVrengRvKpUc=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "1586e49b3908b058e221f11d843eb46392dba17b", + "rev": "271488f067d8452dd0494b650e2e263ac4104e06", "type": "github" }, "original": { @@ -1339,16 +800,16 @@ }, "zig": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_6" + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_5", + "systems": "systems_5" }, "locked": { - "lastModified": 1767919086, - "narHash": "sha256-t9Z7r8yJDbRqoAhm7vsohHAhMGF373NCWt/XeHlZAWw=", + "lastModified": 1771352843, + "narHash": "sha256-AZ3TT5BWcdl/0eNCmUmJm8153YkBBpiSfuTyvxzCyjY=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "d7671671de8bd3afcabffefc77c75ed9777b249b", + "rev": "46010092e447ffc31d7e35d55b4fb466000f3f17", "type": "github" }, "original": { @@ -1359,8 +820,8 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "zls", "nixpkgs" @@ -1382,10 +843,10 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_4", - "gitignore": "gitignore_3", + "flake-utils": "flake-utils_3", + "gitignore": "gitignore_2", "langref": "langref", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index ffbf73ebbc250227200823d2e60c2cc4139855db..a9317dbb4bc952f69ece364e28d9b22184513ae5 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,9 @@ rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; - apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; - apple-fonts.inputs.nixpkgs.follows = "nixpkgs"; + apple-fonts.url = "github:nmarks413/apple-fonts.nix"; - nvf.url = "github:notashelf/nvf/v0.8"; + nvf.url = "github:notashelf/nvf"; nvf.inputs.nixpkgs.follows = "nixpkgs"; darwin.url = "github:lnl7/nix-darwin/master"; @@ -24,14 +23,6 @@ moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly. moonlight.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.url = "github:hyprwm/Hyprland"; - split-monitor-workspaces = { - url = "github:Duckonaut/split-monitor-workspaces"; - inputs.hyprland.follows = "hyprland"; - }; - - vicinae.url = "github:vicinaehq/vicinae"; - zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; @@ -43,6 +34,8 @@ }; + vicinae.url = "github:vicinaehq/vicinae"; + nix-options-search.url = "github:madsbv/nix-options-search"; nix-index-database.url = "github:nix-community/nix-index-database"; @@ -74,6 +67,27 @@ }; }); }) + # https://github.com/NixOS/nixpkgs/issues/476669#issuecomment-3707850520 + (_: prev: { + vesktop = prev.vesktop.overrideAttrs (_: { + preBuild = '' + cp -r ${prev.electron.dist} electron-dist + chmod -R u+w electron-dist + ''; + buildPhase = '' + runHook preBuild + + pnpm build + pnpm exec electron-builder \ + --dir \ + -c.asarUnpack="**/*.node" \ + -c.electronDist="electron-dist" \ + -c.electronVersion=${prev.electron.version} + + runHook postBuild + ''; + }); + }) # custom packages (_: pkgs: { @@ -158,17 +172,17 @@ }; # generate checks for "nix flake check --all-systems --no-build" - checks.aarch64-darwin = builtins.listToAttrs ( - builtins.map ( - name: - let - d = darwinConfigurations.${name}.system; - in - { - name = "darwinConfiguration-" + d.name; - value = d; - } - ) (builtins.attrNames darwinConfigurations) - ); + # checks.aarch64-darwin = builtins.listToAttrs ( + # builtins.map ( + # name: + # let + # d = darwinConfigurations.${name}.system; + # in + # { + # name = "darwinConfiguration-" + d.name; + # value = d; + # } + # ) (builtins.attrNames darwinConfigurations) + # ); }; } diff --git a/lib/mkNeovim.nix b/lib/mkNeovim.nix index d638598ee58e0b5d0d50fb7bed98c8a54181ff43..d22a809c0c461e5a1e88caf629f4edc76ca016e0 100644 --- a/lib/mkNeovim.nix +++ b/lib/mkNeovim.nix @@ -1,7 +1,7 @@ { self, inputs }: user: pkgs: let - darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.system; + darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system; host = { inherit darwin; diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index e87139d7b90a9538b6e437893ef4fc1a4adca585..10be462fb43b8c37da982f4fe3c96ce247a18626 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -84,14 +84,6 @@ treesitter = { enable = false; addDefaultGrammars = true; - # this is buggy and keybind.nix overwrites its keymaps anyways - incrementalSelection.enable = false; - mappings.incrementalSelection = { - decrementByNode = null; - incrementByNode = null; - incrementByScope = null; - init = null; - }; }; debugger.nvim-dap = { enable = true; @@ -111,13 +103,13 @@ html.enable = true; nix.enable = true; python.enable = true; + rust.extensions.crates-nvim.enable = true; rust.enable = true; ts.enable = true; zig.enable = true; # sort-lines: off nix.lsp.servers = [ "nixd" ]; - rust.extensions.crates-nvim.enable = true; }; filetree.neo-tree = { enable = true; diff --git a/modules/nixos/boot.nix b/modules/nixos/boot.nix index 9593a0cbcaa4203059e068af6c626f6f60e49fbc..ef79eb73e127d7c7a0442f093ec271dcbcc10d40 100644 --- a/modules/nixos/boot.nix +++ b/modules/nixos/boot.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { boot = { - kernelPackages = pkgs.linuxPackages_latest; # _zen, _hardened, _rt, _rt_latest, etc. + kernelPackages = pkgs.linuxPackages_6_18; # _zen, _hardened, _rt, _rt_latest, etc. loader = { efi = { canTouchEfiVariables = true; diff --git a/modules/nixos/ld.nix b/modules/nixos/ld.nix index cfbf4e05fed55f65b714cd31efa6fe21a2bcd3fb..3e2ac8af4295962ed08ccf1580bd3f0e37c20cec 100644 --- a/modules/nixos/ld.nix +++ b/modules/nixos/ld.nix @@ -9,25 +9,25 @@ libxcrypt # from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/games/steam/fhsenv.nix#L72-L79 - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes + libXcomposite + libXtst + libXrandr + libXext + libX11 + libXfixes libGL libva # from https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/games/steam/fhsenv.nix#L124-L136 fontconfig freetype - xorg.libXt - xorg.libXmu + libXt + libXmu libogg libvorbis SDL SDL2_image - glew110 + glew_1_10 libdrm libidn tbb @@ -68,20 +68,20 @@ stdenv.cc.cc systemd vulkan-loader - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.libxkbfile - xorg.libxshmfence + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxcb + libxkbfile + libxshmfence zlib libxslt @@ -90,6 +90,6 @@ gtk2 gtk2-x11 libsecret - xorg.libXinerama + libXinerama ]; } diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 88f2252341a33631e504018b8a531b7c1b32fec9..94b28809f6429dddccb19a9d0a347875f9dac027 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -4,7 +4,7 @@ ... }: let - nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.latest; + nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.stable; in { services.xserver.videoDrivers = [ @@ -76,7 +76,7 @@ in # #Fixes a glitch # nvidiaPersistenced = true; }; - nvidia-container-toolkit.enable = true; + nvidia-container-toolkit.enable = false; graphics = { enable = true; @@ -84,7 +84,7 @@ in enable32Bit = true; extraPackages = with pkgs; [ nvidia-vaapi-driver - vaapiVdpau + libva-vdpau-driver libvdpau-va-gl mesa egl-wayland @@ -104,7 +104,7 @@ in environment.systemPackages = with pkgs; [ vulkan-tools - glxinfo + mesa-demos libva-utils # VA-API debugging tools ]; } diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index 20314be33a994a99e64cfe4c4e0f5866b8d576ef..e88aa09662be4162c73b93fc07141ce8920c086a 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -76,5 +76,19 @@ X11Forwarding = true; }; }; + earlyoom = { + enable = true; + freeSwapThreshold = 2; + freeMemThreshold = 2; + + extraArgs = [ + "-g" + "--avoid" + "^(Xwayland|.cosmic*|ghostty|.vicinae*|.xdg*)$" + "--prefer" + "^(electron)$" + ]; + + }; }; } diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index d07ba84632ced91604678563ceaaa68c313fdc20..6b787e6697036d252808fbb0bb4a634c0a2d4de0 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -28,15 +28,12 @@ "https://nix-community.cachix.org" # For haskell "https://cache.iog.io" - #vicinae - "https://vicinae.cachix.org" + ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # For haskell "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" - #vicinae - "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ]; }; gc = { diff --git a/packages/autofmt/autofmt.js b/packages/autofmt/autofmt.js index ef74cbf9a340d1f69c3809cddfafd0a3e95d180e..8986cf9974c2abaa3f9b832f73b77d961d97e0eb 100755 --- a/packages/autofmt/autofmt.js +++ b/packages/autofmt/autofmt.js @@ -101,7 +101,7 @@ const formatters = { `--stdin-file-path=${file}`, ], }, - "nixfmt-rfc-style": { + "nixfmt": { languages: ["nix"], files: { "flake.nix": ({ text }) => text.includes("nixfmt"), diff --git a/packages/awakened_poe_trade/default.nix b/packages/awakened_poe_trade/default.nix index d72e45fdf84352955938190fe3a0b9d586eaa259..3ce10dea1fa25ea836e1d692cfcef74958a7446d 100644 --- a/packages/awakened_poe_trade/default.nix +++ b/packages/awakened_poe_trade/default.nix @@ -17,12 +17,12 @@ pkgs.appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/awakened-poe-trade.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U' + --replace 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { diff --git a/users/fish/cattop/hardware-configuration.nix b/users/fish/cattop/hardware-configuration.nix index b16ddcb14f7da7960d16b1feb84affeece222af5..3ba67c75dbb9e829ad076a7a30a6c0320fdc9ac6 100644 --- a/users/fish/cattop/hardware-configuration.nix +++ b/users/fish/cattop/hardware-configuration.nix @@ -1,32 +1,46 @@ # 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, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "vmd" + "nvme" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6"; + fsType = "ext4"; + }; - fileSystems."/boot/EFI" = - { device = "/dev/disk/by-uuid/473A-B8FD"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; } + fileSystems."/boot/EFI" = { + device = "/dev/disk/by-uuid/473A-B8FD"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/users/fish/vim/languages.nix b/users/fish/vim/languages.nix index 6c370854799533d6388b8eb992df055f6df93b7a..136faddae4bf3857ce6518307e5510e495d7c043 100644 --- a/users/fish/vim/languages.nix +++ b/users/fish/vim/languages.nix @@ -14,7 +14,7 @@ lua.lsp.enable = true; lua.lsp.lazydev.enable = true; python = { - format.type = "ruff"; + format.type = [ "ruff" ]; }; markdown = { enable = true; @@ -69,9 +69,6 @@ enable = true; fold = true; addDefaultGrammars = true; - highlight = { - additionalVimRegexHighlighting = true; - }; grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ markdown_inline diff --git a/users/natalie/configuration.nix b/users/natalie/configuration.nix index d15641a3c807b1615f9a971e92a0fa2e385b8d6a..625e8920549013d98afcb9560f443592ce2475e4 100644 --- a/users/natalie/configuration.nix +++ b/users/natalie/configuration.nix @@ -13,7 +13,7 @@ iosevka nerd-fonts.symbols-only nerd-fonts.iosevka - inputs.apple-fonts.packages.${pkgs.system}.sf-pro + inputs.apple-fonts.packages.${pkgs.stdenv.hostPlatform.system}.sf-pro sketchybar-app-font ]; diff --git a/users/natalie/desktop/configuration.nix b/users/natalie/desktop/configuration.nix index 4a872b330b4d5d554afffaff5293e37653e2d7c4..68f5d35069b919ea9778973afa0381f96fca74a3 100644 --- a/users/natalie/desktop/configuration.nix +++ b/users/natalie/desktop/configuration.nix @@ -12,17 +12,25 @@ documentation.man.generateCaches = false; services.displayManager = { enable = true; - sddm = { + cosmic-greeter.enable = true; + autoLogin = { enable = true; - wayland.enable = true; + user = user.username; }; }; + services.desktopManager = { + cosmic.enable = true; + }; + + # Slightly improves cosmic performances + services.system76-scheduler.enable = true; + programs = { - hyprland = { - enable = true; - withUWSM = true; - }; + # hyprland = { + # enable = true; + # withUWSM = true; + # }; gamemode.enable = true; _1password.enable = true; @@ -86,14 +94,23 @@ enable = true; xdgOpenUsePortal = true; config = { - common.default = [ "gtk" ]; - hyprland.default = [ - "gtk" - "hyprland" - ]; + common = { + default = [ + "cosmic" + "gtk" + ]; + + "org.freedesktop.impl.portal.Secret" = [ + "gnome-keyring" + ]; + }; + }; - extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-cosmic + ]; }; virtualisation = { waydroid.enable = true; diff --git a/users/natalie/desktop/home.nix b/users/natalie/desktop/home.nix index 65b4bcabdea99e9732feabd3f5c32a821af45c97..a0acfa33fe569f0b7e15a3a2ed30bf4a7dadc878 100644 --- a/users/natalie/desktop/home.nix +++ b/users/natalie/desktop/home.nix @@ -25,13 +25,12 @@ dxvk_2 steam-run vulkan-tools - path-of-building - wineWowPackages.stable + rusty-path-of-building + wineWow64Packages.stable winetricks (prismlauncher.override { gamemodeSupport = true; }) umu-launcher limo - nexusmods-app-unfree protontricks (pkgs.callPackage ../../../packages/exiled_exchange_2 { }) awakened_poe_trade @@ -39,7 +38,7 @@ #window manager stuff wofi - xorg.xauth + xauth #linux tools legcord pavucontrol @@ -55,7 +54,6 @@ mpv wireguard-tools signal-desktop - inputs.zls.packages.x86_64-linux.zls rust-bin.stable.latest.default inputs.zen-browser.packages.x86_64-linux.default ]; diff --git a/users/natalie/home/default.nix b/users/natalie/home/default.nix index 445c2f4561b6fe3a0a7c394810c132ce4da4e2e2..edf88865bb96fe788205d6663f8c186e0df37e6a 100644 --- a/users/natalie/home/default.nix +++ b/users/natalie/home/default.nix @@ -2,11 +2,11 @@ { imports = [ ./tmux.nix - ./hyprland + # ./hyprland ./vicinae.nix - ./swaync.nix - ./gtk.nix - ./waybar + # ./swaync.nix + # ./gtk.nix + # ./waybar ./scripts ]; } diff --git a/users/natalie/home/hyprland/exec-once.nix b/users/natalie/home/hyprland/exec-once.nix index 947de457ba8c0b7d42dbd3245fb63264244fed9b..ed8e42349e677086fc831ee06fc6ba60377df180 100644 --- a/users/natalie/home/hyprland/exec-once.nix +++ b/users/natalie/home/hyprland/exec-once.nix @@ -17,7 +17,7 @@ "${pkgs.wl-clipboard}/bin/wl-paste --watch cliphist store &" # "${pkgs.waybar}/bin/waybar &" "${pkgs.swaynotificationcenter}/bin/swaync &" - "${inputs.vicinae.packages.${currentSystem}.default}/bin/vicinae server &" + "${pkgs.vicinae}/bin/vicinae server &" "${pkgs.udiskie}/bin/udiskie --automount --notify --smart-tray &" "${pkgs.hyprland}/bin/hyprctl setcursor Bibata-Modern-Ice 24 &" "${pkgs.tmux}/bin/tmux setenv -g HYPRLAND_INSTANCE_SIGNATURE '$HYPRLAND_INSTANCE_SIGNATURE'" diff --git a/users/natalie/home/hyprland/hyprland.nix b/users/natalie/home/hyprland/hyprland.nix index 0cece8848cead1e0cc27c017d0ea3523983bf6d3..98e84788058905ca61a73eda081d45fe0b865cc2 100644 --- a/users/natalie/home/hyprland/hyprland.nix +++ b/users/natalie/home/hyprland/hyprland.nix @@ -1,4 +1,9 @@ -{ config, pkgs, ... }: +{ + inputs, + config, + pkgs, + ... +}: { home.packages = with pkgs; [ swww @@ -23,8 +28,10 @@ # ]; wayland.windowManager.hyprland = { enable = true; - package = null; - portalPackage = null; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + # make sure to also set the portal package, so that they are in sync + portalPackage = + inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; xwayland = { enable = true; diff --git a/users/natalie/home/hyprland/plugins.nix b/users/natalie/home/hyprland/plugins.nix index 32697739bb1b84b29123d72171c02687fe8b3acd..9c3b9f8ddc81f2e7f95e0651dd81e1027bb74e50 100644 --- a/users/natalie/home/hyprland/plugins.nix +++ b/users/natalie/home/hyprland/plugins.nix @@ -8,7 +8,6 @@ plugin = { split-monitor-workspaces = { count = 5; - keep_focused = 0; }; }; }; diff --git a/users/natalie/home/hyprland/settings.nix b/users/natalie/home/hyprland/settings.nix index 5a14c824e7f5c64c8078dbf4e48cbfb659b3affe..2052cf6bf89dc4f5ae2d0e3de961910b7bda2948 100644 --- a/users/natalie/home/hyprland/settings.nix +++ b/users/natalie/home/hyprland/settings.nix @@ -1,6 +1,7 @@ { ... }: { wayland.windowManager.hyprland.settings = { + "$mainMod" = "SUPER"; # see: https://wiki.hypr.land/Configuring/Variables/#input input = { kb_layout = "us"; @@ -9,9 +10,8 @@ }; # https://wiki.hypr.land/Configuring/Variables/#general general = { - "$mainMod" = "SUPER"; layout = "dwindle"; - no_border_on_floating = false; + #no_border_on_floating = false; }; # https://wiki.hypr.land/Configuring/Variables/#misc @@ -23,7 +23,7 @@ enable_swallow = true; swallow_regex = "^(ghostty)$"; focus_on_activate = true; - new_window_takes_over_fullscreen = 2; + on_focus_under_fullscreen = 2; middle_click_paste = false; }; diff --git a/users/natalie/home/hyprland/windowrules.nix b/users/natalie/home/hyprland/windowrules.nix index 9c9a2d248838f16e84f98e73bcf82c86dd046d94..9c32dd93f23d2fab815bd36f93b995b42d5a2076 100644 --- a/users/natalie/home/hyprland/windowrules.nix +++ b/users/natalie/home/hyprland/windowrules.nix @@ -3,29 +3,30 @@ wayland.windowManager.hyprland.settings = { # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules windowrule = [ - "float,class:^(mpv)$" - "pin,class:^(rofi)$" - "pin,class:^(waypaper)$" - "float,title:^(Volume Control)$" + # "float,class:^(mpv)$" + # "pin,class:^(rofi)$" + # "pin,class:^(waypaper)$" + "match:class ^(Volume Control)$, float on" + # "float,title:^(Volume Control)$" #awakened-poe-trade # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-2992606569 - "tag +apt, class:^(awakened-poe-trade)$" - "tag +apt, title:(Awakened PoE Trade)" - "float, tag:apt" - "noblur, tag:apt" - "nofocus, tag:apt" - "noshadow, tag:apt" - "noborder, tag:apt" - "pin, tag:apt" - "renderunfocused, tag:apt" - "size 100% 100%, tag:apt" - "center, tag:apt" - - #POE - "tag +poe, title:(Path of Exile)" - "tag +poe class:(steam_app_238960)" - "fullscreen, tag:poe$" + # "tag +apt, class:^(awakened-poe-trade)$" + # "tag +apt, title:(Awakened PoE Trade)" + # "float, tag:apt" + # "noblur, tag:apt" + # "nofocus, tag:apt" + # "noshadow, tag:apt" + # "noborder, tag:apt" + # "pin, tag:apt" + # "renderunfocused, tag:apt" + # "size 100% 100%, tag:apt" + # "center, tag:apt" + # + # #POE + # "tag +poe, title:(Path of Exile)" + # "tag +poe class:(steam_app_238960)" + # "fullscreen, tag:poe$" # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-3037816727 # "tag +fakefullscreen, title:(Path of Exile),class:(steam_app_238960)" # "tile, tag:fakefullscreen" @@ -97,9 +98,9 @@ # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules layerrule = [ - "blur, vicinae" - "ignorealpha 0, vicinae" - "noanim, vicinae" + "blur on, match:namespace vicinae" + "ignore_alpha 0, match:namespace vicinae" + "no_anim on, match:namespace vicinae" # "dimaround, rofi" # "dimaround, swaync-control-center" ]; diff --git a/users/natalie/home/vicinae.nix b/users/natalie/home/vicinae.nix index 5276e4bb4a02d62e5e02631b8317a8201c571e9d..132ed839a7ca552bb1923bc5f6dbbe537c05cf3e 100644 --- a/users/natalie/home/vicinae.nix +++ b/users/natalie/home/vicinae.nix @@ -2,7 +2,14 @@ { services.vicinae = { enable = true; - autoStart = false; + systemd = { + enable = true; + autoStart = true; + environment = { + USE_LAYER_SHELL = 0; + }; + + }; settings = { faviconService = "twenty"; # twenty | google | none font.size = 11; @@ -18,7 +25,7 @@ }; # extensions = [ - # (inputs.vicinae.mkVicinaeExtension.${pkgs.system} { + # (inputs.vicinae.mkVicinaeExtension.${pkgs.stdenv.hostPlatform.system} { # inherit pkgs; # name = "nixpkgs search"; # src = pkgs.fetchFromGithub { diff --git a/users/natalie/home/waybar/settings.nix b/users/natalie/home/waybar/settings.nix index 1a883448d70aaff7517c8e629760bab53e4ae430..2d0498d356b9ac6477c229e5174a1751b20b3a0a 100644 --- a/users/natalie/home/waybar/settings.nix +++ b/users/natalie/home/waybar/settings.nix @@ -145,7 +145,7 @@ in "custom/launcher" = { format = ""; on-click = "random-wallpaper"; - on-click-right = "${inputs.vicinae.packages.${currentSystem}.default}vicinae vicinae://toggle"; + on-click-right = "${pkgs.vicinae}/bin/vicinae vicinae://toggle"; tooltip = "true"; tooltip-format = "Random Wallpaper"; }; diff --git a/users/natalie/packages.nix b/users/natalie/packages.nix index 0cb6798189443f20949825e937b644c3939def79..20fcbfe321da738ab766cc45b41d97291a7d5b2e 100644 --- a/users/natalie/packages.nix +++ b/users/natalie/packages.nix @@ -34,6 +34,7 @@ with pkgs; anki-bin tailscale openconnect + zoom-us #nix tools direnv @@ -92,6 +93,7 @@ with pkgs; # nodePackages.npm go elan + zola #expo deps watchman diff --git a/users/natalie/vim/languages.nix b/users/natalie/vim/languages.nix index e3c5bc0c8862e72533b623da21c0efae46c77d66..c52155bf286ab57e4fb5792f81b304cfa5d366fb 100644 --- a/users/natalie/vim/languages.nix +++ b/users/natalie/vim/languages.nix @@ -14,7 +14,7 @@ lua.lsp.enable = true; lua.lsp.lazydev.enable = true; python = { - format.type = "ruff"; + format.type = [ "ruff" ]; }; markdown = { enable = true; @@ -69,9 +69,6 @@ enable = true; fold = true; addDefaultGrammars = true; - highlight = { - additionalVimRegexHighlighting = true; - }; grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ markdown_inline