From 416df2f687e4ee4fff1e809271d2190552ca5ce5 Mon Sep 17 00:00:00 2001 From: cnst Date: Fri, 11 Jul 2025 19:08:13 +0200 Subject: [PATCH] fixing passivevly active xserver --- flake.lock | 136 +++++++++------------ modules/nixos/services/xserver/default.nix | 5 +- 2 files changed, 59 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index ab87630b..80e13e0a 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1752002093, - "narHash": "sha256-RXXq7mUhnZy923CfbUKrn67b8+tYL/uXLy5j1ahzEFg=", + "lastModified": 1752227802, + "narHash": "sha256-5Nr80lTZJ8ewuxIzRHc6E8L4LW4rdGZukiZyL7nOVSE=", "owner": "aylur", "repo": "astal", - "rev": "57e7efe06b0374907fc8329ca314a76122b17008", + "rev": "81eb3770965190024803ed6dd0fe35318da64831", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1751984126, - "narHash": "sha256-PrNg+sypyNMU0dHLbfVFQx58NEnS59DUIu0SZSq3DSk=", + "lastModified": 1752141190, + "narHash": "sha256-RHNq77Z84BtLTwyRtrBffm5V9006Dqw4vh3vrvULlxM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "8feb220c99c94c4957d37253eff6100cc33d7e8a", + "rev": "ef0794b8e94eea166407141f7e92da75f6df925a", "type": "github" }, "original": { @@ -203,11 +203,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1752129689, - "narHash": "sha256-0Xq5tZbvgZvxbbxv6kRHFuZE4Tq2za016NXh32nX0+Q=", + "lastModified": 1752216262, + "narHash": "sha256-OO7SPN6DfXK8TG62AKWHUYc6D8kVNaKgAStGhDBEcBc=", "owner": "nix-community", "repo": "fenix", - "rev": "70bb04a7de606a75ba0a2ee9d47b99802780b35d", + "rev": "1b96480284e9b3f76fb1f68dc2be246c8ae90e13", "type": "github" }, "original": { @@ -328,7 +328,10 @@ }, "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nvf", + "nixpkgs" + ] }, "locked": { "lastModified": 1749398372, @@ -399,7 +402,10 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": [ + "nvf", + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -417,7 +423,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -459,11 +465,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1752124526, - "narHash": "sha256-iNT4PDvLAsfNq5Xp6MpGkEPJkOMOskwCxfIUzp6LIUs=", + "lastModified": 1752207706, + "narHash": "sha256-6Fiy+icid2rKXL9oKcRd3zuITSwtdnShqCPp0Evt3fM=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "1de35bbcb958f49a08605d31df0d51b2d8774114", + "rev": "4aa28988a6ddd9aa8b3402e4bab05ad02a0c12c6", "type": "github" }, "original": { @@ -570,11 +576,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1752015948, - "narHash": "sha256-PRtz78Je1kD9PiVaJD8qeIEjWWmfaqJ77Z92e9g4TA8=", + "lastModified": 1752196485, + "narHash": "sha256-lZfS2eNoykbgNzv/bbp1JCed5YucBKjif4df5nTZt6M=", "owner": "helix-editor", "repo": "helix", - "rev": "16d06643a4444ee297058e608c1de1a5bd8db083", + "rev": "ba04f538300735d267cbf7ec1a225abcdac3c724", "type": "github" }, "original": { @@ -590,11 +596,11 @@ ] }, "locked": { - "lastModified": 1752093218, - "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", + "lastModified": 1752202894, + "narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=", "owner": "nix-community", "repo": "home-manager", - "rev": "206ed3c71418b52e176f16f58805c96e84555320", + "rev": "fab659b346c0d4252208434c3c4b3983a4b38fec", "type": "github" }, "original": { @@ -754,11 +760,11 @@ ] }, "locked": { - "lastModified": 1750503503, - "narHash": "sha256-UWxbL6a81GWBg990pcct1dzm4HuWIEd1Q6mpV7bHrnM=", + "lastModified": 1752164251, + "narHash": "sha256-v/FnmgSkOypGkpDHQW8KK0uVIyh2njVgEa7hOpWW9ZM=", "owner": "hyprwm", "repo": "hypridle", - "rev": "25578b71370d1ba7bf08127ca4b0959452df4d04", + "rev": "dda793b66a79e5602675fa370dd9a93f1d70a60e", "type": "github" }, "original": { @@ -783,11 +789,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1752070437, - "narHash": "sha256-zuDkrUTqT1MUfe/bNM3jBLPT0FIIhTJ2s+M59zKI2rs=", + "lastModified": 1752149340, + "narHash": "sha256-DJc2ROpttbP6FHcXwWpmK7EB2cpVsP/LmXjEr8RWcO8=", "owner": "hyprwm", "repo": "hyprland", - "rev": "6375e471f33bf1a008a005e963c57a12c7ff0e94", + "rev": "b5433bb75324a95dd27eb5492141565466c2cdd6", "type": "github" }, "original": { @@ -986,11 +992,11 @@ ] }, "locked": { - "lastModified": 1751139849, - "narHash": "sha256-S4WaVk8tR6svR+L8y4VUjFPSYhsUvA9Oc6zYYELTPY0=", + "lastModified": 1752218742, + "narHash": "sha256-GTJDHmzaeNlsUU0P03q0zHLfOAGtGQCf/oYn2SRPWKE=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "fee04f640676868fe343bd3ffd0b81b22bd032ee", + "rev": "17fefce86e6e857783aef38257af7a18be76323a", "type": "github" }, "original": { @@ -1267,11 +1273,11 @@ ] }, "locked": { - "lastModified": 1752137032, - "narHash": "sha256-+vIBaUg9XysV2eUTEwLAJQSSLEZHnguHCfS1SHrFYuQ=", + "lastModified": 1752199489, + "narHash": "sha256-p2zkn8fdLvZ19MgAA5CdiuQWQ/gE3YNg1Nhbm4EAflI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "7bd0cbccbb3a1c0d407b189c6b3cf1243a5c2b40", + "rev": "62f976ed47de88323770646a9a92e4912d33585f", "type": "github" }, "original": { @@ -1319,21 +1325,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs_10": { "locked": { "lastModified": 1751984180, @@ -1400,11 +1391,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -1496,14 +1487,14 @@ "flake-utils": "flake-utils_2", "mnw": "mnw", "nixpkgs": "nixpkgs_11", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { - "lastModified": 1752075018, - "narHash": "sha256-RJnQJooI1Jc7U4gvEKErbiIcgqGtEeUWddvxIjQfP58=", + "lastModified": 1752180730, + "narHash": "sha256-aSmib/P5DWXrpOdwFOo+lxuupUlNTGUDsLVSxJwWfUg=", "owner": "notashelf", "repo": "nvf", - "rev": "9aa90885640d19b1375e6dec75c6cb125ac0f0c2", + "rev": "8ea010d7e3bf00c2a1f24d52da88afaed87d96f5", "type": "github" }, "original": { @@ -1584,7 +1575,7 @@ "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_10", "nvf": "nvf", - "systems": "systems_7", + "systems": "systems_6", "tuirun": "tuirun", "wezterm": "wezterm", "zen-browser": "zen-browser" @@ -1593,11 +1584,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1752086493, - "narHash": "sha256-USpVUdiWXDfPoh+agbvoBQaBhg3ZdKZgHXo/HikMfVo=", + "lastModified": 1752182378, + "narHash": "sha256-bKzsGh+1AWSpL2Q2/0FKgNchTJOmYpQH2BS9dCyKXaI=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "6e3abe164b9036048dce1a3aa65a7e7e5200c0d3", + "rev": "e2c8cefa63bd4cafb66978867c0f1ec2ba14bb03", "type": "github" }, "original": { @@ -1768,16 +1759,16 @@ }, "systems_6": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1797,21 +1788,6 @@ } }, "systems_8": { - "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" - } - }, - "systems_9": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1832,7 +1808,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1735478319, diff --git a/modules/nixos/services/xserver/default.nix b/modules/nixos/services/xserver/default.nix index 44fa5169..bfd647f8 100644 --- a/modules/nixos/services/xserver/default.nix +++ b/modules/nixos/services/xserver/default.nix @@ -3,11 +3,12 @@ lib, ... }: let - inherit (lib) mkOption types; + inherit (lib) mkIf mkOption types mkEnableOption; cfg = config.nixos.services.xserver; in { options = { nixos.services.xserver = { + enable = mkEnableOption "Enables xserver"; videoDrivers = mkOption { type = types.listOf (types.enum ["amdgpu" "nvidia"]); default = ["amdgpu"]; @@ -20,7 +21,7 @@ in { }; }; }; - config = { + config = mkIf cfg.enable { services.xserver = { enable = true; videoDrivers = cfg.videoDrivers;