diff --git a/options/custom/desktops/hyprland/rules.nix b/options/custom/desktops/hyprland/rules.nix index 9cdf0b0..b90643c 100644 --- a/options/custom/desktops/hyprland/rules.nix +++ b/options/custom/desktops/hyprland/rules.nix @@ -158,7 +158,7 @@ in { merge = field: expr: rules: map ( rule: - if builtins.isAttrs field + if isAttrs field then "${rule}, ${lib.concatStringsSep ", " (lib.mapAttrsToList (f: e: format f e) field)}" else "${rule}, ${format field expr}" ) diff --git a/options/custom/programs/walker/default.nix b/options/custom/programs/walker/default.nix index 386436f..5fcfc0f 100644 --- a/options/custom/programs/walker/default.nix +++ b/options/custom/programs/walker/default.nix @@ -122,7 +122,7 @@ in { src = "${pkgs.writeShellApplication { name = "search"; - text = builtins.readFile ./search.sh; + text = readFile ./search.sh; runtimeInputs = with pkgs; [ coreutils @@ -145,7 +145,7 @@ in { font: larger ${config.custom.font.monospace}; } - ${builtins.readFile ./style.css} + ${readFile ./style.css} ''; #!! Inherit from default layout diff --git a/options/custom/programs/wezterm/default.nix b/options/custom/programs/wezterm/default.nix index 4a65764..e261137 100644 --- a/options/custom/programs/wezterm/default.nix +++ b/options/custom/programs/wezterm/default.nix @@ -26,7 +26,7 @@ in { -- # TODO: Remove when using Wayland config.font_size = ${toString (14 * config.custom.scale)} - ${builtins.readFile ./config.lua} + ${readFile ./config.lua} return config ''; diff --git a/options/custom/scripts/default.nix b/options/custom/scripts/default.nix index 5924c4b..dd18841 100644 --- a/options/custom/scripts/default.nix +++ b/options/custom/scripts/default.nix @@ -25,7 +25,7 @@ in { #// excludeShellChecks = ["SC2154"]; # argc evaluates variables at runtime runtimeInputs = dependencies; - text = builtins.readFile ./${name}.sh; + text = readFile ./${name}.sh; } + "/bin/${name}"; }; @@ -38,7 +38,7 @@ in { pkgs.writers.writePython3Bin name {libraries = dependencies;} # Disable linting # https://flake8.pycqa.org/en/3.1.1/user/ignoring-errors.html#ignoring-entire-files - ("# flake8: noqa\n" + builtins.readFile ./${name}.py) + ("# flake8: noqa\n" + readFile ./${name}.py) + "/bin/${name}"; }; in diff --git a/options/custom/settings/gtk/default.nix b/options/custom/settings/gtk/default.nix index 81ac88b..d73194a 100644 --- a/options/custom/settings/gtk/default.nix +++ b/options/custom/settings/gtk/default.nix @@ -17,13 +17,15 @@ in { package = pkgs.google-cursor; }; - gtk = { + gtk = let + css = readFile ./style.css; + in { enable = true; - gtk3.extraCss = builtins.readFile ./style.css; + gtk3.extraCss = css; gtk4 = { extraConfig.gtk-hint-font-metrics = 1; # Fix blurry fonts - extraCss = builtins.readFile ./style.css; + extraCss = css; }; font = {