unexplrd/nixos-blueprint
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flake.lock: bump

Browse Source 
flake.nix: add niri and xwst
niri: move to flake packages

Signed-off-by: unexplrd <unexplrd@linerds.us>
This commit is contained in:
unexplrd
2025-07-29 14:12:04 +03:00
parent 34e5cb884e
commit 241b7565cb
6 changed files with 253 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/home/desktop/niri/default.nix
View File

@@ -3,7 +3,7 @@
inputs,
lib,
osConfig,
# perSystem,
perSystem,
pkgs,
...
}: let
@@ -15,7 +15,7 @@
ifLaptop = mkIf (hostName != "dunamis");
commonArgs = {
inherit config inputs lib osConfig pkgs;
inherit config inputs lib osConfig perSystem pkgs;
launcher = getExe pkgs.walker;
lockscreen = getExe pkgs.gtklock;
};
@@ -126,9 +126,9 @@ in {
};
};
systemd.user = {
settings.Manager.DefaultEnvironment = {
DISPLAY = ":123";
};
# settings.Manager.DefaultEnvironment = {
# DISPLAY = ":123";
# };
targets.tray.Unit.Description = "Home Manager System Tray"; # workaround for udiskie
services = let
mkGraphicalService = config: lib.attrsets.recursiveUpdate graphicalService config;
@@ -159,12 +159,12 @@ in {
Service.TimeoutStopSec = mkForce "1";
Service.Restart = mkForce "always";
};
xwayland-satellite = mkGraphicalService {
Service = {
Type = "simple";
ExecStart = getExe pkgs.xwayland-satellite + " :123";
};
};
# xwayland-satellite = mkGraphicalService {
# Service = {
# Type = "simple";
# ExecStart = getExe pkgs.xwayland-satellite + " :123";
# };
# };
# gnome-polkit-agent = mkGraphicalService {
# Service = {
# Type = "simple";

13
modules/home/desktop/niri/niri.nix
View File

@@ -1,6 +1,9 @@
{
config,
lib,
osConfig,
perSystem,
# pkgs,
launcher,
lockscreen,
...
@@ -92,7 +95,6 @@ in {
'';
in ''
environment {
DISPLAY ":123"
CLUTTER_BACKEND "wayland"
GDK_BACKEND "wayland"
MOZ_ENABLE_WAYLAND "1"
@@ -138,6 +140,14 @@ in {
skip-at-startup
}
xwayland-satellite {
path "${lib.getExe perSystem.xwst.xwayland-satellite}"
}
clipboard {
disable-primary
}
prefer-no-csd
screenshot-path "${xdgPics}/screenshots/screenshot-%Y-%m-%d-%H-%M-%S.png"
@@ -315,6 +325,7 @@ in {
XF86AudioRaiseVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "raise"; }
XF86AudioLowerVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "lower"; }
XF86AudioMute allow-when-locked=true { spawn "swayosd-client" "--output-volume" "mute-toggle"; }
Shift+XF86AudioMute allow-when-locked=true { spawn "swayosd-client" "--input-volume" "mute-toggle"; }
XF86AudioMicMute allow-when-locked=true { spawn "swayosd-client" "--input-volume" "mute-toggle"; }
XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; }
XF86AudioPause allow-when-locked=true { spawn "playerctl" "pause"; }