voidarc/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wshowkeys setuid problems

Browse Source
This commit is contained in:
voidarc
2026-07-11 20:30:07 +01:00
parent 0c8cd3dd3d
commit 0920cf080d
2 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/features/hyprland/default.nix
View File

@@ -8,33 +8,34 @@
self', self',
pkgs, pkgs,
... ...
}: let }: {config, ...}: let
modules = with self.nixosModules; [ modules = with self.nixosModules; [
audio audio
systemTheme systemTheme
]; ];
runtimePkgs = self'.packages.hyprland.passthru.runtimePackages; runtimePkgs = self'.packages.hyprland.passthru.runtimePackages;
lib = pkgs.lib; lib = pkgs.lib;
runtimeTarget = name: pkg:
if config.security.wrappers ? ${name}
then "/run/wrappers/bin/${name}"
else lib.getExe pkg;
in { in {
imports = modules; imports = modules;
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
package = self'.packages.hyprland; package = self'.packages.hyprland;
}; };
services.xserver.enable = true; services.xserver.enable = true;
security.polkit.enable = true; security.polkit.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
hyprlock hyprlock
gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
system.activationScripts.hyprRuntimeEnv = lib.stringAfter ["specialfs"] '' system.activationScripts.hyprRuntimeEnv = lib.stringAfter ["specialfs"] ''
mkdir -p /run/hypr-runtime-env/bin mkdir -p /run/hypr-runtime-env/bin
${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: pkg: '' ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: pkg: ''
ln -sfn ${lib.getExe pkg} /run/hypr-runtime-env/bin/${name} ln -sfn ${runtimeTarget name pkg} /run/hypr-runtime-env/bin/${name}
'') '')
runtimePkgs)} runtimePkgs)}
''; '';
@@ -55,6 +56,7 @@
gotify-desktop = self'.packages.gotify-desktop; gotify-desktop = self'.packages.gotify-desktop;
otter-launcher = self'.packages.otter-launcher; otter-launcher = self'.packages.otter-launcher;
quickshell = self'.packages.quickshell; quickshell = self'.packages.quickshell;
wshowkeys = self'.packages.wshowkeys;
waybar = self'.packages.waybar; waybar = self'.packages.waybar;
wlogout = self'.packages.wlogout; wlogout = self'.packages.wlogout;
way-edges = self'.packages.way-edges; way-edges = self'.packages.way-edges;

37
modules/features/wshowkeys/default.nix
View File

@@ -1,32 +1,17 @@
{ {moduleWithSystem, ...}: {
inputs, flake.nixosModules.wshowkeys = moduleWithSystem ({
moduleWithSystem, self',
... pkgs,
}: { ...
flake.nixosModules.wshowkeys = moduleWithSystem ({inputs', ...}: { }: let
lib = pkgs.lib;
in {
programs.wshowkeys = { programs.wshowkeys = {
enable = true; enable = true;
package = inputs'.wshowkeys.packages.default; package = self'.packages.wshowkeys;
}; };
}); });
perSystem = { perSystem = {inputs', ...}: {
pkgs, packages.wshowkeys = inputs'.wshowkeys.packages.default;
inputs',
...
}: {
packages.wshowkeys = inputs.wrappers.lib.wrapPackage ({...}: {
inherit pkgs;
package = inputs'.wshowkeys.packages.default;
flags = {
"-a" = ["right" "top"];
"-F" = "'FiraMono Nerd Font 35'";
"-s" = "'#cba6f7ff'";
"-f" = " '#cdd6f4ff'";
"-b" = "'#45475a99'";
"-m" = "70";
"-l" = "60";
"-t" = "1000";
};
});
}; };
} }