From 35aa6456d54c5263413eb1f5bf727174b750ca30 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Tue, 2 Sep 2025 10:06:05 +0200 Subject: [PATCH] Clipboard history, brightness control, eu layout --- .../kylekrein/niri/desktopShell.nix | 1 + homes/x86_64-linux/kylekrein/niri/niri.nix | 50 ++++++++++++++++--- modules/nixos/presets/default/default.nix | 4 +- .../kylekrein-framework12/default.nix | 2 + 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix index 21a43f2..9599ac9 100644 --- a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix +++ b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix @@ -54,6 +54,7 @@ in settings = { spawn-at-startup = [ {command = ["qs" "-c" "DankMaterialShell"];} + {command = ["wl-paste" "--watch" "cliphist" "store"];} ]; }; }; diff --git a/homes/x86_64-linux/kylekrein/niri/niri.nix b/homes/x86_64-linux/kylekrein/niri/niri.nix index 264d2eb..6416705 100644 --- a/homes/x86_64-linux/kylekrein/niri/niri.nix +++ b/homes/x86_64-linux/kylekrein/niri/niri.nix @@ -205,13 +205,49 @@ in ]; }; - "XF86MonBrightnessUp".action = sh "brightnessctl set 10%+"; - "XF86MonBrightnessDown".action = sh "brightnessctl set 10%-"; + "XF86MonBrightnessUp" = { + allow-when-locked = true; + action.spawn = [ + "qs" + "-c" + "DankMaterialShell" + "ipc" + "call" + "brightness" + "increment" + "5" + ]; + }; + "XF86MonBrightnessDown" = { + allow-when-locked = true; + action.spawn = [ + "qs" + "-c" + "DankMaterialShell" + "ipc" + "call" + "brightness" + "decrement" + "5" + ]; + }; - "XF86AudioNext".action = sh "playerctl next"; - "XF86AudioPause".action = sh "playerctl play-pause"; - "XF86AudioPlay".action = sh "playerctl play-pause"; - "XF86AudioPrev".action = sh "playerctl previous"; + "XF86AudioNext" = { + allow-when-locked = true; + action = sh "playerctl next"; + }; + "XF86AudioPause" = { + allow-when-locked = true; + action = sh "playerctl play-pause"; + }; + "XF86AudioPlay" = { + allow-when-locked = true; + action = sh "playerctl play-pause"; + }; + "XF86AudioPrev" = { + allow-when-locked = true; + action = sh "playerctl previous"; + }; #"Mod+Tab".action = focus-window-down-or-column-right; #"Mod+Shift+Tab".action = focus-window-up-or-column-left; "Mod+Tab".action = toggle-overview; @@ -223,7 +259,7 @@ in }; warp-mouse-to-focus.enable = true; keyboard = { - xkb.layout = "us, ru, de"; + xkb.layout = "eu, ru"; xkb.options = "grp:lctrl_toggle, ctrl:nocaps"; track-layout = "window"; numlock = true; diff --git a/modules/nixos/presets/default/default.nix b/modules/nixos/presets/default/default.nix index e9c1693..fdedc69 100644 --- a/modules/nixos/presets/default/default.nix +++ b/modules/nixos/presets/default/default.nix @@ -68,11 +68,11 @@ in { }; # Configure keymap in X11 services.xserver.xkb = { - layout = "us,ru"; + layout = "eu,ru"; variant = ""; options = "grp:caps_toggle"; }; - console.keyMap = "us"; + console.keyMap = "eu"; nix = { settings = { experimental-features = [ diff --git a/systems/x86_64-linux/kylekrein-framework12/default.nix b/systems/x86_64-linux/kylekrein-framework12/default.nix index 957c3e4..369c9be 100644 --- a/systems/x86_64-linux/kylekrein-framework12/default.nix +++ b/systems/x86_64-linux/kylekrein-framework12/default.nix @@ -60,6 +60,8 @@ in blender video-downloader ]; + services.power-profiles-daemon.enable = true; + services.tlp.enable = false; #Chat host networking.firewall.allowedTCPPorts = [80 443 22 8448 9993 8081];