diff --git a/flake.lock b/flake.lock index f7ec999..fd1417c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,39 +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" - } - }, - "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" - } - }, "cerulean": { "inputs": { "deploy-rs": "deploy-rs", @@ -48,37 +14,20 @@ ] }, "locked": { - "lastModified": 1772954046, - "narHash": "sha256-yCTjpnXhx44tsuOW9VolMiP/ckQNwO6wQST5vmXE7ig=", + "lastModified": 1774498035, + "narHash": "sha256-7TS/1kjtiVYx9tfzMi5s01Zfc8GloygBVihEaU5+wDs=", "owner": "cry128", "repo": "cerulean", - "rev": "6c7f335fbde5b6f1931d79d287bf03ee642ba7f5", + "rev": "22c31ad331145a25125c165d96bd898ae9f3c916", "type": "github" }, "original": { "owner": "cry128", - "ref": "v0.2.5-alpha", + "ref": "refactor/snowflake", "repo": "cerulean", "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" - } - }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat", @@ -89,11 +38,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1766051518, - "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", + "lastModified": 1770019181, + "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", + "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", "type": "github" }, "original": { @@ -141,20 +90,43 @@ "type": "github" } }, - "fmt-src": { - "flake": false, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, "locked": { - "lastModified": 1758127535, - "narHash": "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g=", - "owner": "fmtlib", - "repo": "fmt", - "rev": "e424e3f2e607da02742f73db84873b8084fc714c", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { - "owner": "fmtlib", - "ref": "12.0.0", - "repo": "fmt", + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": [ + "mango", + "scenefx", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, @@ -165,11 +137,11 @@ ] }, "locked": { - "lastModified": 1775598298, - "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", + "lastModified": 1784913159, + "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", + "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", "type": "github" }, "original": { @@ -178,88 +150,25 @@ "type": "github" } }, - "incbin-src": { - "flake": false, + "mango": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "scenefx": "scenefx" + }, "locked": { - "lastModified": 1748303270, - "narHash": "sha256-vgOfViZnWTKpBB6vDNDJSB3YuuGGVhg++zsi9Ubatno=", - "owner": "graphitemaster", - "repo": "incbin", - "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", + "lastModified": 1785033711, + "narHash": "sha256-8NLTWtOMa9FUjEPguV8eHL8fLuNRsY1lAM4uBNZGK+Y=", + "owner": "mangowm", + "repo": "mango", + "rev": "1b6e01d72c1985024235be044ad8799ed0f8326a", "type": "github" }, "original": { - "owner": "graphitemaster", - "repo": "incbin", - "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", - "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" - } - }, - "libgit2-src": { - "flake": false, - "locked": { - "lastModified": 1749227175, - "narHash": "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "0060d9cf5666f015b1067129bd874c6cc4c9c7ac", - "type": "github" - }, - "original": { - "owner": "libgit2", - "ref": "v1.9.1", - "repo": "libgit2", - "type": "github" - } - }, - "luajit-src": { - "flake": false, - "locked": { - "lastModified": 1763177035, - "narHash": "sha256-oYD86MqmlJpiCuEs4LwVtxvarPtz1RPWm8nJqNE0sBs=", - "owner": "SteamClientHomebrew", - "repo": "LuaJIT", - "rev": "89550023569c3e195e75e12951c067fe5591e0d2", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "ref": "v2.1", - "repo": "LuaJIT", - "type": "github" - } - }, - "luajson-src": { - "flake": false, - "locked": { - "lastModified": 1763065879, - "narHash": "sha256-5Mdp4jp+rqz2ufkBa1gMfd8nep+Um+mBdr6+Ut6yz9I=", - "owner": "SteamClientHomebrew", - "repo": "LuaJSON", - "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "repo": "LuaJSON", - "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", + "owner": "mangowm", + "repo": "mango", "type": "github" } }, @@ -272,11 +181,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1771365290, - "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", + "lastModified": 1773018425, + "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", + "rev": "25ebda3c558e923720c965832dc9a04f559a055c", "type": "github" }, "original": { @@ -287,33 +196,18 @@ }, "millennium": { "inputs": { - "abseil-src": "abseil-src", - "asio-src": "asio-src", - "curl-src": "curl-src", - "fmt-src": "fmt-src", - "incbin-src": "incbin-src", - "json-src": "json-src", - "libgit2-src": "libgit2-src", - "luajit-src": "luajit-src", - "luajson-src": "luajson-src", "millennium-src": "millennium-src", - "minhook-src": "minhook-src", - "mini-src": "mini-src", - "minizip-src": "minizip-src", "nixpkgs": [ "nixpkgs-unstable" - ], - "re2-src": "re2-src", - "websocketpp-src": "websocketpp-src", - "zlib-src": "zlib-src" + ] }, "locked": { "dir": "packages/nix", - "lastModified": 1774491538, - "narHash": "sha256-11rgTocaXAIFYVEcbb6ju/sDN6sZpxjneXj9FSbgwrA=", + "lastModified": 1784860807, + "narHash": "sha256-nznQFS9H8er9bTwxKG4LSa2D0lGsxIPUqDuWa1rbJkA=", "owner": "SteamClientHomebrew", "repo": "millennium", - "rev": "bf8b0cd016fcc4168c4e348cbcbfd237de4c01c8", + "rev": "266e41ea8924c41e51145ae986a9bdf68f9415d9", "type": "github" }, "original": { @@ -326,68 +220,17 @@ "millennium-src": { "flake": false, "locked": { - "lastModified": 1770463863, - "narHash": "sha256-MceGTpXobCAh5Ll/1iTWcEf6/nHY3Ll1t06JxbYc+Co=", + "lastModified": 1783268941, + "narHash": "sha256-MJLJ0I48HXgfOpISTAbDMYMUdWj9A6M+jGQz4uAvwyw=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", + "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", "type": "github" }, "original": { "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", - "type": "github" - } - }, - "minhook-src": { - "flake": false, - "locked": { - "lastModified": 1743163800, - "narHash": "sha256-0eGFfg365bb4zic1WTHMvKHbxuhhGp72/clu8OklHXs=", - "owner": "TsudaKageyu", - "repo": "minhook", - "rev": "c3fcafdc10146beb5919319d0683e44e3c30d537", - "type": "github" - }, - "original": { - "owner": "TsudaKageyu", - "ref": "v1.3.4", - "repo": "minhook", - "type": "github" - } - }, - "mini-src": { - "flake": false, - "locked": { - "lastModified": 1743356736, - "narHash": "sha256-zBFFOlECbie7+62fTGf+NP4gNmfv2Qddw3ys6xn7o9U=", - "owner": "metayeti", - "repo": "mINI", - "rev": "52b66e987cb56171dc91d96115cdf094b6e4d7a0", - "type": "github" - }, - "original": { - "owner": "metayeti", - "ref": "0.9.18", - "repo": "mINI", - "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": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", "type": "github" } }, @@ -457,11 +300,11 @@ }, "nixcats": { "locked": { - "lastModified": 1774835836, - "narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=", + "lastModified": 1777273601, + "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d", + "rev": "f69ea013e328841a7def7037ed59788a76be8816", "type": "github" }, "original": { @@ -486,13 +329,28 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1784796856, + "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "type": "github" }, "original": { @@ -504,11 +362,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1775608838, - "narHash": "sha256-2ySoGH+SAi34U0PeuQgABC0WiH9LQ3tkyHTiE93KUeg=", + "lastModified": 1785030361, + "narHash": "sha256-CzyekASpsH73NBvS2IQxyDd3Se0RiX4u6tqMBhiIEFU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a01fad67a57e44e1b3e1d905c6881bcfb209e8a", + "rev": "c19bef392dec3a8bfd60dbd1f4013233b8af9cf5", "type": "github" }, "original": { @@ -524,11 +382,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770975056, - "narHash": "sha256-ZXTz/P3zUbbM6lNXzt91u8EwfNqhXpYMu8+wvFZqQHE=", + "lastModified": 1773738366, + "narHash": "sha256-oH22HyNHEdCoCQo734sQCHUr6C0jmGQJMZ13dsgEHkk=", "owner": "cry128", "repo": "nt", - "rev": "f42dcdd49a7921a7f433512e83d5f93696632412", + "rev": "f32c3a726a3d608d30aaaa1df2301c1eaf5ef8f4", "type": "github" }, "original": { @@ -547,11 +405,11 @@ ] }, "locked": { - "lastModified": 1774915545, - "narHash": "sha256-COT4l/+ZddGBvrDVfPf7MEOJxV8EDKame6/aRnNIKcY=", + "lastModified": 1783574839, + "narHash": "sha256-ICof1tV4/9XheBLBGf7dhMhfMq4dOs1zwTHrr7zGFlA=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "f3177b3c69fb3f03201098d7fe8ab6422cce7fc1", + "rev": "c551f0687658e4bb699cfff6015436ad7ee57a0d", "type": "github" }, "original": { @@ -560,37 +418,65 @@ "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": { "cerulean": "cerulean", "home-manager-unstable": "home-manager-unstable", + "mango": "mango", "millennium": "millennium", "nix-flatpak": "nix-flatpak", "nixcats": "nixcats", "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", - "systems": "systems_3", + "sddm-silent": "sddm-silent", + "systems": "systems_4", "zen-browser": "zen-browser" } }, + "scenefx": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "mango", + "nixpkgs" + ], + "systems": "systems_3" + }, + "locked": { + "lastModified": 1782624992, + "narHash": "sha256-vUjLG6eubEhJJVa9LPygIcVmNoHwYbSUTJcWEcbxnU4=", + "owner": "wlrfx", + "repo": "scenefx", + "rev": "37ccd723bef49e6891156ffafce8f549f01446cc", + "type": "github" + }, + "original": { + "owner": "wlrfx", + "repo": "scenefx", + "type": "github" + } + }, + "sddm-silent": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1785015872, + "narHash": "sha256-7dTNd8o3xInMXSBRkRCkHAGQc+e0mrlljDGTXKhk6I0=", + "owner": "uiriansan", + "repo": "SilentSDDM", + "rev": "da69191d32721c1f093d13bfd803e8d8000bd712", + "type": "github" + }, + "original": { + "owner": "uiriansan", + "repo": "SilentSDDM", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -599,11 +485,11 @@ ] }, "locked": { - "lastModified": 1775365543, - "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=", + "lastModified": 1773096132, + "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f", + "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784", "type": "github" }, "original": { @@ -615,11 +501,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1759482047, - "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=", + "lastModified": 1772189877, + "narHash": "sha256-i1p90Rgssb//aNiTDFq46ZG/fk3LmyRLChtp/9lddyA=", "ref": "refs/heads/main", - "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9", - "revCount": 996, + "rev": "fe39e122d898f66e89ffa17d4f4209989ccb5358", + "revCount": 1255, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -673,6 +559,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -714,23 +615,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" - } - }, "zen-browser": { "inputs": { "home-manager": [ @@ -741,11 +625,11 @@ ] }, "locked": { - "lastModified": 1775453133, - "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=", + "lastModified": 1784985989, + "narHash": "sha256-Mz4G81HXJlUtHoJtA31D+Ob7uma2BX7E/y7F9QazuFc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8d0508ffceba8ad785ae442591dd115080a55142", + "rev": "a8f9b6d014c9cfe0615dccb2bc7808713f6e62c2", "type": "github" }, "original": { @@ -753,23 +637,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/flake.nix b/flake.nix index 2479289..3268352 100644 --- a/flake.nix +++ b/flake.nix @@ -9,30 +9,40 @@ home-manager-unstable.url = "github:nix-community/home-manager"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; - cerulean.url = "github:cry128/cerulean/v0.2.5-alpha"; + cerulean.url = "github:cry128/cerulean/refactor/snowflake"; cerulean.inputs.systems.follows = "systems"; cerulean.inputs.nixpkgs.follows = "nixpkgs-unstable"; + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.home-manager.follows = "home-manager-unstable"; + }; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; nixcats.url = "github:BirdeeHub/nixCats-nvim"; + millennium = { + url = "github:SteamClientHomebrew/millennium?dir=packages/nix"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + plasma-manager = { url = "github:nix-community/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.home-manager.follows = "home-manager-unstable"; }; - millennium = { - url = "github:SteamClientHomebrew/millennium?dir=packages/nix"; + mango = { + url = "github:mangowm/mango"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - zen-browser = { - url = "github:0xc000022070/zen-browser-flake"; + sddm-silent = { + url = "github:uiriansan/SilentSDDM"; inputs.nixpkgs.follows = "nixpkgs-unstable"; - inputs.home-manager.follows = "home-manager-unstable"; }; - }; +}; nixConfig = { extra-experimental-features = "pipe-operators"; diff --git a/groups/yezelhlev/default.nix b/groups/yezelhlev/default.nix index e257e3b..0a16c0f 100644 --- a/groups/yezelhlev/default.nix +++ b/groups/yezelhlev/default.nix @@ -1,6 +1,7 @@ { pkgs, root, + lib, # temp call for services.displayManager.sddm.wayland.enable ... }: { imports = [ @@ -15,7 +16,11 @@ variant = ""; }; # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; + services.displayManager.sddm = { + enable = true; + wayland.enable = lib.mkDefault true; + }; + services.desktopManager.plasma6.enable = true; # Enable CUPS to print documents. @@ -64,6 +69,15 @@ flake = "/home/dea/dea-files"; # sets NH_OS_FLAKE variable for you }; + programs.mango = { + enable = false; # TODO: enable mango after configuring + }; + + programs.silentSDDM = { + enable = true; + theme = "default"; + }; + users.users.dea = { description = "dea"; isNormalUser = true; diff --git a/groups/yezelhlev/programs.nix b/groups/yezelhlev/programs.nix index e47ac0e..8172e93 100644 --- a/groups/yezelhlev/programs.nix +++ b/groups/yezelhlev/programs.nix @@ -12,19 +12,23 @@ environment.systemPackages = with upkgs; [ # CLI tools git + lazygit wget unzip p7zip kitty # terminal starship # shell customizer + tree btop-cuda # system monitoring croc # e2ee file transfer chawan # tui browser cha shellcheck # sh warning calcure # calendar app TODO: remove & fork calendar.vim + + # fonts + nerd-fonts.droid-sans-mono # editors - #lunarvim vscode # languages @@ -36,6 +40,8 @@ # window management wayland + waywall + pipewire # programs vivaldi # TODO: switch to zen later @@ -52,10 +58,10 @@ bottles # windows emulation # dependencies - qt5.qtbase # vivaldi + others + libsForQt5.qtbase # vivaldi + others libsForQt5.qtstyleplugin-kvantum # libs for Qt5 libsForQt5.qt5ct - libsForQt5.qt5.qtbase + qt5.qtbase hunspell # spellcheck for libreoffice hunspellDicts.uk_UA diff --git a/homes/dea/default.nix b/homes/dea/default.nix index e3595dc..0a41632 100644 --- a/homes/dea/default.nix +++ b/homes/dea/default.nix @@ -7,11 +7,13 @@ imports = [ inputs.plasma-manager.homeModules.plasma-manager # + #/${root}/homes/modules/shell /${root}/homes/modules/bash /${root}/homes/modules/starship /${root}/homes/modules/vim /${root}/homes/modules/mpv /${root}/homes/modules/zen + /${root}/homes/modules/wm ]; home.username = "dea"; diff --git a/homes/modules/wm/default.nix b/homes/modules/wm/default.nix new file mode 100644 index 0000000..85a8041 --- /dev/null +++ b/homes/modules/wm/default.nix @@ -0,0 +1,14 @@ +{ lib, ... }: + +{ + options = { + deaFiles.wm = lib.mkOption { + type = lib.types.enum [(lib.listDir ./. |> builtins.toString)]; + default = null; + }; + }; + + config = { + deaFiles.wm = "mangowc"; + }; +} diff --git a/homes/modules/wm/mango.conf b/homes/modules/wm/mango.conf new file mode 100644 index 0000000..ab4bd54 --- /dev/null +++ b/homes/modules/wm/mango.conf @@ -0,0 +1,39 @@ +# Monitors +# main monitor +# monitorrule = name: + +# Startup +# exec-once waybar +# exec-once awww-daemon + +exec-once = playerctld daemon + +exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=wlroots PATH + +# Keyboard/mouse +repeat_rate = 20 +repeat_delay = 200 + +xkb_rules_layout = us +xkb_rules_variant = basic + +trackpad_natural_scrolling = 0 +scroll_method = 1 +disable_while_typing = 0 + +mouse_natural_scrolling = 0 +accel_profile = 0 + +# https://github.com/fcitx/fcitx5 (chinese pinyin) +env=GTK_IM_MODULE,fcitx +env=QT_IM_MODULE,fcitx +env=QT_IM_MODULES,wayland;fcitx +env=SDL_IM_MODULE,fcitx +env=XMODIFIERS,@im=fcitx +env=GLFW_IM_MODULE,ibus + +# Screenshare +# TODO: pipewire, pipewire-pulse, xdg-desktop-portal-wlr +# +# #source= + diff --git a/homes/modules/wm/mangowc/default.nix b/homes/modules/wm/mangowc/default.nix new file mode 100644 index 0000000..d5928f6 --- /dev/null +++ b/homes/modules/wm/mangowc/default.nix @@ -0,0 +1,14 @@ +{ inputs, ... }: + +{ + wayland.windowManager.mango = { + enable = true; + }; + + systemd = { + enable = true; + xdgAutostart = true; + }; + + settings = builtins.readFile ./mango.conf; +} diff --git a/hosts/nahemah/default.nix b/hosts/nahemah/default.nix index 2e29aba..97a6981 100644 --- a/hosts/nahemah/default.nix +++ b/hosts/nahemah/default.nix @@ -1,7 +1,76 @@ -{...}: { +{ + root, + ... +}: { imports = [ ./hardware-configuration.nix ]; networking.hostName = "nahemah"; + + # lock screen theming + programs.silentSDDM = { + backgrounds.dea = /${root}/assets/wallpapers/lantern.png; + profileIcons.dea = /${root}/assets/pfps/happy.jpg; + settings = { + "General" = { + background-fill-mode = "fill"; + }; + "LockScreen" = { + background = "lantern.png"; + blur = 0; + }; + "LockScreen.Clock" = { + position = "center-right"; + align = "center"; + font = "DroidSansM Nerd Font"; + font-size = 160; + }; + "LockScreen.Date" = { + display = false; + }; + "LockScreen.Message" = { + display = true; + position = "bottom-center"; + align = "center"; + text = "Have a maimai day :3"; + font-family = "DroidSansM Nerd Font"; + display-icon = false; + }; + "LoginScreen" = { + background = "lantern.png"; + }; + "LoginScreen.LoginArea" = { + position = "right"; + margin = 96; + }; + "LoginScreen.LoginArea.Avatar" = { + shape = "square"; + active-border-color = "#c4c4f1"; + active-border-size = 4; + }; + "LoginScreen.LoginArea.Username" = { + font-family = "DroidSansM Nerd Font"; + }; + "LoginScreen.LoginArea.PasswordInput" = { + font-family = "DroidSansM Nerd Font"; + width = 216; + }; + "LoginScreen.LoginArea.Spinner" = { + font-family = "DroidSansM Nerd Font"; + }; + "LoginScreen.LoginArea.WarningMessage" = { + font-family = "DroidSansM Nerd Font"; + }; + "LoginScreen.MenuArea.Buttons" = { + font-family = "DroidSansM Nerd Font"; + }; + "LoginScreen.MenuArea.Popups" = { + font-family = "DroidSansM Nerd Font"; + }; + "Tooltips" = { + font-family = "DroidSansM Nerd Font"; + }; + }; + }; } diff --git a/hosts/sandalphon/default.nix b/hosts/sandalphon/default.nix index 6c5ff1d..e29adb7 100644 --- a/hosts/sandalphon/default.nix +++ b/hosts/sandalphon/default.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + root, + ... +}: { imports = [ ./hardware-configuration.nix ./games.nix @@ -19,6 +23,72 @@ powerManagement.finegrained = false; }; + # lock screen theming + programs.silentSDDM = { + backgrounds.dea = /${root}/assets/wallpapers/lock.png; + profileIcons.dea = /${root}/assets/pfps/happy.jpg; + settings = { + "General" = { + background-fill-mode = "fill"; + }; + "LockScreen" = { + background = "lock.png"; + blur = 0; + }; + "LockScreen.Clock" = { + position = "center-left"; + align = "center"; + font = "DroidSansM Nerd Font"; + font-size = 160; + }; + "LockScreen.Date" = { + display = false; + }; + "LockScreen.Message" = { + display = true; + position = "bottom-center"; + align = "center"; + text = "Have a maimai day :3"; + font-family = "DroidSansM Nerd Font"; + display-icon = false; + }; + "LoginScreen" = { + background = "lock.png"; + }; + "LoginScreen.LoginArea" = { + position = "left"; + margin = 96; + }; + "LoginScreen.LoginArea.Avatar" = { + shape = "square"; + active-border-color = "#c4c4f1"; + active-border-size = 4; + }; + "LoginScreen.LoginArea.Username" = { + font-family = "DroidSansM Nerd Font"; + }; + "LoginScreen.LoginArea.PasswordInput" = { + font-family = "DroidSansM Nerd Font"; + width = 216; + }; + "LoginScreen.LoginArea.Spinner" = { + font-family = "DroidSansM Nerd Font"; + }; + "LoginScreen.LoginArea.WarningMessage" = { + font-family = "DroidSansM Nerd Font"; + }; + "LoginScreen.MenuArea.Buttons" = { + font-family = "DroidSansM Nerd Font"; + }; + "LoginScreen.MenuArea.Popups" = { + font-family = "DroidSansM Nerd Font"; + }; + "Tooltips" = { + font-family = "DroidSansM Nerd Font"; + }; + }; + }; + services.flatpak = { enable = true; packages = [ diff --git a/hosts/sandalphon/games.nix b/hosts/sandalphon/games.nix index 187240d..2550cdb 100644 --- a/hosts/sandalphon/games.nix +++ b/hosts/sandalphon/games.nix @@ -7,7 +7,7 @@ environment.systemPackages = with upkgs; [ prismlauncher # minecraft r2modman - # osu-lazer-bin + osu-lazer-bin waywall glfw3-minecraft ]; diff --git a/hosts/sandalphon/mcsr/ninjabrain.nix b/hosts/sandalphon/mcsr/ninjabrain.nix index be14045..cfb94f6 100644 --- a/hosts/sandalphon/mcsr/ninjabrain.nix +++ b/hosts/sandalphon/mcsr/ninjabrain.nix @@ -11,11 +11,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "ninjabrain-bot"; - version = "1.5.2"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/Ninjabrain1/Ninjabrain-Bot/releases/download/${finalAttrs.version}/Ninjabrain-Bot-${finalAttrs.version}.jar"; - hash = "sha256-mAmfYyGpDUrOwTQA6G0F96+NYOVjnC84Qn6WjccUUP8="; + hash = "sha256-Rxu9A2EiTr69fLBUImRv+RLC2LmosawIDyDPIaRcrdw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/hosts/sandalphon/mcsr/waywall.lua b/hosts/sandalphon/mcsr/waywall.lua index 1297ea3..aae7329 100644 --- a/hosts/sandalphon/mcsr/waywall.lua +++ b/hosts/sandalphon/mcsr/waywall.lua @@ -33,7 +33,7 @@ local mc_eye_y = (tall_h - mc_eye_h) / 2 -- https://github.com/Esensats/mcsr-calcsens local normal_sens = 4.699455756166794 local tall_sens = 0.31702247418659996 --- 0.0229116492 + local left_middle = (resolution.w - thin_w) / 4 scene:register("e_counter", { diff --git a/nixpkgs.nix b/nixpkgs.nix index 46b6e92..3f92124 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -2,10 +2,13 @@ inputs, system, ... -} @ args: { - nixpkgs.channels = { - default = { +}@args: +{ + nixpkgs.channels = rec { + base = spkgs; + spkgs = { inherit system; + source = inputs.nixpkgs; overlays = [ (import ./overlays args) ]; diff --git a/snow.nix b/snow.nix index f132e1a..6687cea 100644 --- a/snow.nix +++ b/snow.nix @@ -6,6 +6,8 @@ args = {inherit inputs;}; modules = [ inputs.nix-flatpak.nixosModules.nix-flatpak + inputs.sddm-silent.nixosModules.default + inputs.mango.nixosModules.mango ]; groups = {