summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--programs/hypr/hyprlock.nix4
-rw-r--r--system/default.nix38
3 files changed, 22 insertions, 22 deletions
diff --git a/flake.nix b/flake.nix
index ad039f4..bbf4f94 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,7 +29,7 @@
unofficial-homestuck-collection.url = "git+https://g.freya.cat/freya/unofficial-homestuck-collection-nix";
unofficial-homestuck-collection.inputs.nixpkgs.follows = "nixpkgs";
# apple-fonts
- apple-fonts.url= "github:Lyndeno/apple-fonts.nix";
+ apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
apple-fonts.inputs.nixpkgs.follows = "nixpkgs";
};
diff --git a/programs/hypr/hyprlock.nix b/programs/hypr/hyprlock.nix
index 6dc5181..130f379 100644
--- a/programs/hypr/hyprlock.nix
+++ b/programs/hypr/hyprlock.nix
@@ -2,9 +2,7 @@
config,
lib,
...
-}:
-
-let
+}: let
fg = "rgb(${config.theme.colors.fg})";
bg = "rgb(${config.theme.colors.bg})";
error = "rgb(${config.theme.colors.error})";
diff --git a/system/default.nix b/system/default.nix
index 6cf0e9d..49aa0cd 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -146,24 +146,26 @@
];
# fonts
- fonts.packages = (with pkgs; [
- corefonts
- dejavu_fonts
- fira-code
- fira-code-symbols
- jetbrains-mono
- material-icons
- nerd-fonts.fira-code
- noto-fonts
- noto-fonts-cjk-sans
- noto-fonts-emoji
- twemoji-color-font
- vistafonts
- ]) ++ (with inputs.apple-fonts.packages.${pkgs.system}; [
- sf-pro
- sf-mono
- sf-compact
- ]);
+ fonts.packages =
+ (with pkgs; [
+ corefonts
+ dejavu_fonts
+ fira-code
+ fira-code-symbols
+ jetbrains-mono
+ material-icons
+ nerd-fonts.fira-code
+ noto-fonts
+ noto-fonts-cjk-sans
+ noto-fonts-emoji
+ twemoji-color-font
+ vistafonts
+ ])
+ ++ (with inputs.apple-fonts.packages.${pkgs.system}; [
+ sf-pro
+ sf-mono
+ sf-compact
+ ]);
fonts.fontconfig = {
enable = true;