1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-27 18:17:44 +00:00

treewide: get rid of attrValues pattern because nixd doesn't support goto def on it

This commit is contained in:
RGBCube 2025-07-22 03:17:23 +03:00
parent 30d4b5e421
commit 372df8b48a
Signed by: RGBCube
SSH key fingerprint: SHA256:CzqbPcfwt+GxFYNnFVCqoN5Itn4YFrshg1TrnACpA5M
11 changed files with 160 additions and 196 deletions

View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: let
inherit (lib) attrValues disabled merge mkIf;
inherit (lib) disabled merge mkIf;
in merge
(mkIf config.isDesktop {
@ -9,17 +9,15 @@ in merge
packages = [ pkgs.terminus_font ];
};
fonts.packages = attrValues {
sans = config.theme.font.sans.package;
mono = config.theme.font.mono.package;
fonts.packages = [
config.theme.font.sans.package
config.theme.font.mono.package
inherit (pkgs)
noto-fonts
noto-fonts-cjk-sans
noto-fonts-lgc-plus
noto-fonts-emoji
;
};
pkgs.noto-fonts
pkgs.noto-fonts-cjk-sans
pkgs.noto-fonts-lgc-plus
pkgs.noto-fonts-emoji
];
})
(mkIf config.isServer {

View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }: let
inherit (lib) attrValues enabled merge mkIf flatten range;
inherit (lib) enabled merge mkIf flatten range;
in merge <| mkIf config.isDesktop {
hardware.graphics = enabled;
@ -19,20 +19,18 @@ in merge <| mkIf config.isDesktop {
programs.xwayland = enabled;
environment.systemPackages = attrValues {
inherit (pkgs)
brightnessctl
grim
hyprpicker
slurp
swappy
swaybg
wl-clipboard
wtype
xdg-utils
xwaylandvideobridge
;
};
environment.systemPackages = [
pkgs.brightnessctl
pkgs.grim
pkgs.hyprpicker
pkgs.slurp
pkgs.swappy
pkgs.swaybg
pkgs.wl-clipboard
pkgs.wtype
pkgs.xdg-utils
pkgs.xwaylandvideobridge
];
home-manager.sharedModules = [{
wayland.windowManager.hyprland = enabled {

View file

@ -1,25 +1,19 @@
{ config, lib, pkgs, ... }: let
inherit (lib) attrValues enabled merge mkIf;
inherit (lib) enabled merge mkIf;
in merge <| mkIf config.isDesktop {
programs.thunar = enabled {
plugins = attrValues {
inherit (pkgs.xfce)
thunar-archive-plugin
thunar-media-tags-plugin
thunar-volman
;
};
plugins = [
pkgs.xfce.thunar-archive-plugin
pkgs.xfce.thunar-media-tags-plugin
pkgs.xfce.thunar-volman
];
};
environment.systemPackages = attrValues {
inherit (pkgs)
ark
ffmpegthumbnailer
libgsf
;
environment.systemPackages = [
pkgs.ark
pkgs.ffmpegthumbnailer
pkgs.libgsf
inherit (pkgs.xfce)
tumbler
;
};
pkgs.xfce.tumbler
];
}