diff --git a/flake.lock b/flake.lock index 6301011..e89b846 100644 --- a/flake.lock +++ b/flake.lock @@ -125,11 +125,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1785627969, - "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", + "lastModified": 1787559586, + "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", + "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", "type": "github" }, "original": { @@ -194,25 +194,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_7" - }, - "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" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -759,22 +741,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1786719841, "narHash": "sha256-QcpQOT0NQEFkI77t+YXPZqDJc35iIodG7zinieOwFUg=", @@ -790,7 +756,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1781577229, "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", @@ -872,11 +838,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1787042014, - "narHash": "sha256-lgnV/xeEatfEnPZG0RrXS0fhcr63p3tsVvL1GdaVkJQ=", + "lastModified": 1787414105, + "narHash": "sha256-WncT27+3BOkgTaJZLnCsf3LcYf9RXMuR9ONSN4rzQ7s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c69ae8fb8faeb3472fd11234ba55a70ac3601f9b", + "rev": "a9e6d84f9c2f9012f5fe7d964a7851352300e61a", "type": "github" }, "original": { @@ -1008,11 +974,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1783875707, - "narHash": "sha256-Ryg3PqFcGydelQpgPF0j8GMaXaGDrNTSesEy6fDw/eg=", + "lastModified": 1787483422, + "narHash": "sha256-/1dN67dKM0CGRgtq0n1k/SDDB4Agaf10eFSohzY8teE=", "owner": "kuokuo123", "repo": "otter-launcher", - "rev": "242e5da4f0acc0b4301be7b4546f5afb3e4b23d6", + "rev": "4a7e85fcea777012cf14acb1f4a57fd221f0378c", "type": "github" }, "original": { @@ -1073,40 +1039,21 @@ "otter-launcher": "otter-launcher_2", "quickshell": "quickshell", "sls-steam": "sls-steam", - "weylus": "weylus", "woomer": "woomer_2", "wrappers": "wrappers_3", "wshowkeys": "wshowkeys_2" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": "nixpkgs_10" - }, - "locked": { - "lastModified": 1784438913, - "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sls-steam": { "inputs": { "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1786818912, - "narHash": "sha256-GFRGB8n84MuixVcyKnLRfGKO0YajxOjiEH/a5lixg1Q=", + "lastModified": 1787209025, + "narHash": "sha256-kwuUKqjRSTaOyYVe5ENmczFcga8krq5+/nqbjz5EujE=", "owner": "AceSLS", "repo": "SLSsteam", - "rev": "01a3b1ed08bc8f33fc25ee12d2b6e191a9963b38", + "rev": "65b6ee1ba262fa47eca538cf9892503dc205d65b", "type": "github" }, "original": { @@ -1235,21 +1182,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems" @@ -1268,28 +1200,6 @@ "type": "github" } }, - "weylus": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1784471251, - "narHash": "sha256-07//RRO1xhgR4lKyq460+iOEDHUw21rJRi59fMUhLfM=", - "owner": "voidarclabs", - "repo": "WeylusCommunityEdition", - "rev": "bcf34c2a2c9d3cbac00ca0d3e6ede5b3bbc6a18c", - "type": "github" - }, - "original": { - "owner": "voidarclabs", - "repo": "WeylusCommunityEdition", - "type": "github" - } - }, "woomer": { "inputs": { "crane": "crane", @@ -1316,7 +1226,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1782685056, @@ -1370,14 +1280,14 @@ }, "wrappers_3": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1786998037, - "narHash": "sha256-QJ8QmuqmiOiHCT0HidqwlRpejNfCVcizLmLtzRWHWeQ=", + "lastModified": 1787531025, + "narHash": "sha256-PbDBQ714Ua/FFpfWVNa8wLEgLeSxidQintFM8VF4p+w=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "780954265c11444ed0c9e164115360f4f5d24d0b", + "rev": "f4e8db680592dbdd729d776e87c6278423d70a1d", "type": "github" }, "original": { @@ -1410,19 +1320,19 @@ }, "wshowkeys_2": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1781708685, - "narHash": "sha256-NH5b736WoI9LodJKPlonO1X+Lxg8URMLLRkT5to61Zg=", - "owner": "voidarclabs", + "lastModified": 1785224811, + "narHash": "sha256-8upkB3179A8wP5Hph0EanE0VuIxe7VsmsqzcRaOq5y0=", + "owner": "DreamMaoMao", "repo": "wshowkeys", - "rev": "47dfb7a0237acbf847ca28cbb88000b33929f50a", + "rev": "35d70762ab9af4ea301853e79b3b925d5fe9e920", "type": "github" }, "original": { - "owner": "voidarclabs", + "owner": "DreamMaoMao", "repo": "wshowkeys", "type": "github" } diff --git a/flake.nix b/flake.nix index 64c94e0..ca71eb6 100644 --- a/flake.nix +++ b/flake.nix @@ -32,11 +32,7 @@ url = "github:coffeeispower/woomer"; inputs.nixpkgs.follows = "nixpkgs"; }; - wshowkeys.url = "github:voidarclabs/wshowkeys"; - weylus = { - url = "github:voidarclabs/WeylusCommunityEdition"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + wshowkeys.url = "github:DreamMaoMao/wshowkeys"; # Flake parts flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/modules/features/weylus/default.nix b/modules/features/weylus/default.nix deleted file mode 100644 index ccb6552..0000000 --- a/modules/features/weylus/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{moduleWithSystem, ...}: { - flake.nixosModules.weylus = moduleWithSystem ({inputs', ...}: { - programs.weylus = { - enable = true; - package = inputs'.weylus.packages.default; - users = ["user01"]; - }; - }); -}