From 11aeef9dd627bbec806d78ec968ceb6a698b84d3 Mon Sep 17 00:00:00 2001 From: Kenryu Shibata Date: Wed, 23 Sep 2026 17:34:48 +0900 Subject: [PATCH] made esc avail again, mod home for shorter switch --- assets/xkb/symbols/my-sym | 2 +- assets/xkb/symbols/my-sym-dvp | 2 +- flake.lock | 26 +++++++++++++------------- home/default.nix | 2 +- home/i3.nix | 4 ++-- home/media.nix | 3 --- profiles/base.nix | 1 + 7 files changed, 19 insertions(+), 21 deletions(-) diff --git a/assets/xkb/symbols/my-sym b/assets/xkb/symbols/my-sym index 47dd13a..9ca3132 100644 --- a/assets/xkb/symbols/my-sym +++ b/assets/xkb/symbols/my-sym @@ -8,7 +8,7 @@ xkb_symbols "my-sym" { key {[ Escape ], type[group1] = "ONE_LEVEL" }; key { [ F13, Delete ], type[group1] = "TWO_LEVEL" }; key { [ F14, Insert ], type[group1] = "TWO_LEVEL" }; - key {[ F15 ]}; + key {[ Escape, F15 ]}; key {[ Control_R ], type[group1] = "ONE_LEVEL" }; replace key {[ Control_L ], type[group1] = "ONE_LEVEL" }; diff --git a/assets/xkb/symbols/my-sym-dvp b/assets/xkb/symbols/my-sym-dvp index 310eed1..f9a4496 100644 --- a/assets/xkb/symbols/my-sym-dvp +++ b/assets/xkb/symbols/my-sym-dvp @@ -55,7 +55,7 @@ xkb_symbols "my-sym-dvp" { key {[ Escape ], type[group1] = "ONE_LEVEL" }; key { [ F13, Delete ], type[group1] = "TWO_LEVEL" }; key { [ F14, Insert ], type[group1] = "TWO_LEVEL" }; - key {[ F15 ]}; + key {[ Escape, F15 ]}; key {[ Control_R ], type[group1] = "ONE_LEVEL" }; replace key {[ Control_L ], type[group1] = "ONE_LEVEL" }; diff --git a/flake.lock b/flake.lock index 661433e..9ca4be1 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1789417814, - "narHash": "sha256-xV9fcqtH6jJLVBF3ocqBBwZkPKEke+BujhEwT4Ye9Tc=", + "lastModified": 1789978172, + "narHash": "sha256-FIRXajv1pPZ+l6On6ekkmcQ6le0Zi0ncRUoR3nB0vKA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d40fd26f323c898b0c195d41aa5efadd85f57832", + "rev": "9ebcb7766700d7e006d9505247bd7ce0426f4232", "type": "github" }, "original": { @@ -95,11 +95,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "lastModified": 1789546076, + "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -123,11 +123,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1789286504, - "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", + "lastModified": 1789921291, + "narHash": "sha256-Ft/BRnIqw1MywFoXydKobjjWmDFgDdYtSpJliE8+yUw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", + "rev": "44a91898084f46797b5fac650c7e8c9ac38c43d4", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1789344334, - "narHash": "sha256-vdhpDJ3Lr24lkZ+fDCjmBRRtw9/vcSzkqGJOJyF5h2U=", + "lastModified": 1789998861, + "narHash": "sha256-62XMQD4WLdMAfdT0/8gJmPH2dKeTw908ryNloAplTr8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3eea5b2156db11c7eeeada3dc737711255b253e", + "rev": "1e8bc658fc985ef27ccd66d107d767b32bb7ef98", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 3f7734a..f055290 100644 --- a/home/default.nix +++ b/home/default.nix @@ -6,7 +6,7 @@ in imports = [ ./alacritty.nix ./browser.nix - ./cads.nix + #./cads.nix ./cmd_tools.nix ./i3.nix ./i3status.nix diff --git a/home/i3.nix b/home/i3.nix index a4d4b91..2332185 100644 --- a/home/i3.nix +++ b/home/i3.nix @@ -93,8 +93,8 @@ in "XF86AudioMute" = ''exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle''; "XF86MonBrightnessUp" = ''exec --no-startup-id brightnessctl set 5%+''; "XF86MonBrightnessDown" = ''exec --no-startup-id brightnessctl set 5%-''; - "F15" = ''exec --no-startup-id setxkbmap -layout my-sym''; - "Shift+F15" = ''exec --no-startup-id setxkbmap -layout my-sym-dvp''; + "F13" = ''exec --no-startup-id setxkbmap -layout my-sym''; + "F14" = ''exec --no-startup-id setxkbmap -layout my-sym-dvp''; }; }; }; diff --git a/home/media.nix b/home/media.nix index dea8cdf..505bb5c 100644 --- a/home/media.nix +++ b/home/media.nix @@ -2,11 +2,8 @@ { home.packages = with pkgs; [ mpv - vlc ffmpeg - kdePackages.kdenlive gimp inkscape - obs-studio ]; } diff --git a/profiles/base.nix b/profiles/base.nix index 0bc149b..32326d5 100644 --- a/profiles/base.nix +++ b/profiles/base.nix @@ -50,6 +50,7 @@ services.pipewire = { enable = true; pulse.enable = true; + package = pkgs.unstable.pipewire; }; services.openssh = {