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

desktop/niri: hotfix for other desktops

Browse Source 
Signed-off-by: unexplrd <unexplrd@linerds.us>
This commit is contained in:
unexplrd
2025-05-27 22:16:49 +03:00
parent d81c644665
commit 8ae65a6752
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,12 +2,14 @@
perSystem, perSystem,
osConfig, osConfig,
config, config,
inputs,
pkgs, pkgs,
lib, lib,
... ...
}: let }: let
# inherit (lib.strings) removeSuffix; # inherit (lib.strings) removeSuffix;
inherit (lib) mkIf mkEnableOption mkDefault mkForce getExe; inherit (lib) mkIf mkEnableOption mkDefault mkForce getExe;
inherit (config.lib.stylix) colors;
# inherit (osConfig.module.stylix) theme; # inherit (osConfig.module.stylix) theme;
inherit (osConfig.networking) hostName; inherit (osConfig.networking) hostName;
cfg = config.desktop.niri; cfg = config.desktop.niri;
@ -15,8 +17,8 @@
launcher = getExe pkgs.walker; launcher = getExe pkgs.walker;
lockscreen = getExe pkgs.gtklock; lockscreen = getExe pkgs.gtklock;
in { in {
imports = [ imports = with inputs; [
./programs walker.homeManagerModules.default
]; ];
options = { options = {
desktop.niri.enable = desktop.niri.enable =
@ -62,6 +64,8 @@ in {
platformTheme.name = "gtk3"; platformTheme.name = "gtk3";
}; };
programs.walker = import ./programs/walker {inherit config inputs pkgs;};
programs.waybar = import ./programs/waybar {inherit config colors getExe ifLaptop pkgs;};
xdg.configFile.niri = import ./niri.nix {inherit config hostName launcher lockscreen;}; xdg.configFile.niri = import ./niri.nix {inherit config hostName launcher lockscreen;};
services = import ./services {inherit pkgs lockscreen getExe perSystem;}; services = import ./services {inherit pkgs lockscreen getExe perSystem;};
@ -162,6 +166,7 @@ in {
Service = Service =
mkDefault graphicalService.Service; mkDefault graphicalService.Service;
}; };
walker = mkGraphicalService {};
# gnome-polkit-agent = mkGraphicalService { # gnome-polkit-agent = mkGraphicalService {
# Service = # Service =
# graphicalService.Service # graphicalService.Service

2
modules/home/desktop/niri/programs/default.nix
View File

@ -14,7 +14,9 @@ in {
imports = with inputs; [ imports = with inputs; [
walker.homeManagerModules.default walker.homeManagerModules.default
]; ];
options = config.desktop.niri.enable {
# programs.fuzzel = import ./fuzzel {inherit config mkDefault;}; # programs.fuzzel = import ./fuzzel {inherit config mkDefault;};
programs.walker = import ./walker {inherit config inputs pkgs;}; programs.walker = import ./walker {inherit config inputs pkgs;};
programs.waybar = import ./waybar {inherit colors config getExe ifLaptop pkgs;}; programs.waybar = import ./waybar {inherit colors config getExe ifLaptop pkgs;};
};
} }