From eacf17c44ab2e8647c682009cb119f659274b0a4 Mon Sep 17 00:00:00 2001 From: Sergei Bulavintsev Date: Mon, 19 Feb 2024 20:39:08 +0300 Subject: [PATCH] chore(nix): update flake --- nix/flake.lock | 30 ++++++++++++------------ nix/modules/nixos/system/xkb/default.nix | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/nix/flake.lock b/nix/flake.lock index eefbf63..51c26a9 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1706833576, - "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", + "lastModified": 1707707289, + "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", + "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1706798041, - "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", + "lastModified": 1707919853, + "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", + "rev": "043ba285c6dc20f36441d48525402bcb9743c498", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1706879948, - "narHash": "sha256-bMr/3iiTuG72bMrTmNTNTFhudMucDP9ndR07FErVkvQ=", + "lastModified": 1708006148, + "narHash": "sha256-F0zdLFOO9eS1+4Zrt1Ky/yMI+AtVCstc7q+K1aa57UQ=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "d216ceb851be55e9dfeb9d5b739d2e1f2a5d103a", + "rev": "b73151d7a801abbf39f849df56295fdc624195cd", "type": "github" }, "original": { @@ -209,11 +209,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1706880160, - "narHash": "sha256-OocK1RxG74yC2jWTbr8f7A33ABIiBjSFOLngsLPBiZc=", + "lastModified": 1708007398, + "narHash": "sha256-8JwdkXABxf1qvSOauleQESyetmggY8ZhiDxa7cxUD6k=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "e25e07f30fdb4075b08ff4bfe3fd92b1a1099d77", + "rev": "ec8d5a9c0aef774a1bf0331ce0ea84074e0ed8cb", "type": "github" }, "original": { @@ -292,11 +292,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1707863367, + "narHash": "sha256-LdBbCSSP7VHaHA4KXcPGKqkvsowT2+7W4jlEHJj6rPg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "35ff7e87ee05199a8003f438ec11a174bcbd98ea", "type": "github" }, "original": { diff --git a/nix/modules/nixos/system/xkb/default.nix b/nix/modules/nixos/system/xkb/default.nix index a2392e9..df5d3dc 100644 --- a/nix/modules/nixos/system/xkb/default.nix +++ b/nix/modules/nixos/system/xkb/default.nix @@ -14,10 +14,10 @@ in { config = mkIf cfg.enable { console.useXkbConfig = true; - services.xserver = { + services.xserver.xkb = { layout = "dh,ru"; # xkbOptions = "grp:shift_caps_toggle,grp_led:caps,terminate:ctrl_alt_bksp"; - xkbOptions = "terminate:ctrl_alt_bksp"; + options = "terminate:ctrl_alt_bksp"; extraLayouts.dh = { description = "Colemak-DH ergo"; languages = ["eng"];