mirror of
https://github.com/donovanglover/nix-config.git
synced 2025-05-30 06:29:03 +02:00
chore(nix): Inherit builtins at bottom
This commit is contained in:
parent
7b564db92d
commit
bfd55ef40a
@ -1,8 +1,8 @@
|
|||||||
{ nix-config, pkgs, lib, ... }:
|
{ nix-config, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (builtins) attrValues;
|
|
||||||
inherit (lib) singleton;
|
inherit (lib) singleton;
|
||||||
|
inherit (builtins) attrValues;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = attrValues {
|
imports = attrValues {
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (builtins) toJSON;
|
|
||||||
inherit (lib) singleton;
|
inherit (lib) singleton;
|
||||||
inherit (config.lib.stylix.colors) base00 base01 base04 base05 base09;
|
inherit (config.lib.stylix.colors) base00 base01 base04 base05 base09;
|
||||||
inherit (pkgs) ironbar inotify-tools;
|
inherit (pkgs) ironbar inotify-tools;
|
||||||
|
inherit (builtins) toJSON;
|
||||||
|
|
||||||
mullvadScript = "ironbar/mullvad.fish";
|
mullvadScript = "ironbar/mullvad.fish";
|
||||||
mullvadNotification = "ironbar/mullvad-notification.fish";
|
mullvadNotification = "ironbar/mullvad-notification.fish";
|
||||||
|
@ -5,9 +5,9 @@ let
|
|||||||
inherit (lib.types) str float int;
|
inherit (lib.types) str float int;
|
||||||
inherit (config.modules.system) username;
|
inherit (config.modules.system) username;
|
||||||
inherit (cfg) bloat gnome plasma container theme opacity fontSize;
|
inherit (cfg) bloat gnome plasma container theme opacity fontSize;
|
||||||
inherit (builtins) attrValues;
|
|
||||||
inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
|
inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
|
||||||
inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji;
|
inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji;
|
||||||
|
inherit (builtins) attrValues;
|
||||||
|
|
||||||
cfg = config.modules.desktop;
|
cfg = config.modules.desktop;
|
||||||
in
|
in
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{ pkgs, config, lib, ... }:
|
{ pkgs, config, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (builtins) toJSON;
|
|
||||||
inherit (lib) mkEnableOption mkIf getExe singleton;
|
inherit (lib) mkEnableOption mkIf getExe singleton;
|
||||||
inherit (pkgs) piper interception-tools;
|
inherit (pkgs) piper interception-tools;
|
||||||
inherit (pkgs.interception-tools-plugins) dual-function-keys;
|
inherit (pkgs.interception-tools-plugins) dual-function-keys;
|
||||||
inherit (cfg) mouseSettings disableLaptopKeyboard lidIgnore powerIgnore keyboardBinds;
|
inherit (cfg) mouseSettings disableLaptopKeyboard lidIgnore powerIgnore keyboardBinds;
|
||||||
|
inherit (builtins) toJSON;
|
||||||
|
|
||||||
dualFunctionKeysConfig = "dual-function-keys.yaml";
|
dualFunctionKeysConfig = "dual-function-keys.yaml";
|
||||||
|
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
let
|
let
|
||||||
inherit (pkgs) fish;
|
inherit (pkgs) fish;
|
||||||
inherit (lib) mkEnableOption mkIf mkMerge singleton;
|
inherit (lib) mkEnableOption mkIf mkMerge singleton;
|
||||||
inherit (builtins) attrValues;
|
|
||||||
inherit (cfg) postgres;
|
inherit (cfg) postgres;
|
||||||
inherit (config.modules.system) username;
|
inherit (config.modules.system) username;
|
||||||
|
inherit (builtins) attrValues;
|
||||||
|
|
||||||
cfg = config.modules.shell;
|
cfg = config.modules.shell;
|
||||||
in
|
in
|
||||||
|
Loading…
x
Reference in New Issue
Block a user