From 9deeeaabce9abf6df1ae68d2fb06bbe1ef50c291 Mon Sep 17 00:00:00 2001 From: Lucy von Overheidt Date: Tue, 9 Sep 2025 18:49:48 +0200 Subject: [PATCH] meow --- modules/alacritty.nix | 56 ++++++++++++++++++++++--------------------- modules/helix.nix | 29 ++++++++++++++-------- 2 files changed, 48 insertions(+), 37 deletions(-) diff --git a/modules/alacritty.nix b/modules/alacritty.nix index 1d544a2..8e64dae 100644 --- a/modules/alacritty.nix +++ b/modules/alacritty.nix @@ -2,34 +2,36 @@ { programs.alacritty.enable = true; programs.alacritty.settings = { - window.opacity = 0.8; - colors.bright = { - black = lib.mkDefault "#444b6a"; - blue = lib.mkDefault "#7da6ff"; - cyan = "#0db9d7"; - green = "#b9f27c"; - magenta = "#bb9af7"; - red = "#ff7a93"; - white = "#acb0d0"; - yellow = "#ff9e64"; - }; - colors.normal = { - black = "#32344a"; - blue = "#7aa2f7"; - cyan = "#449dab"; - green = "#9ece6a"; - magenta = "#ad8ee6"; - red = "#f7768e"; - white = "#787c99"; - yellow = "#e0af68"; - }; - colors.primary = { - background = "#1a1b26"; - foreground = "#a9b1d6"; - }; + window.opacity = lib.mkDefault 0.8; + /* + colors.bright = { + black = "#444b6a"; + blue = "#7da6ff"; + cyan = "#0db9d7"; + green = "#b9f27c"; + magenta = "#bb9af7"; + red = "#ff7a93"; + white = "#acb0d0"; + yellow = "#ff9e64"; + }; + colors.normal = { + black = "#32344a"; + blue = "#7aa2f7"; + cyan = "#449dab"; + green = "#9ece6a"; + magenta = "#ad8ee6"; + red = "#f7768e"; + white = "#787c99"; + yellow = "#e0af68"; + }; + colors.primary = { + background = "#1a1b26"; + foreground = "#a9b1d6"; + }; + */ font = { normal = { - family = "Iosevka"; + family = lib.mkDefault "Iosevka"; style = "Regular"; }; bold = { @@ -44,7 +46,7 @@ family = "Iosevka"; style = "Bold Italic"; }; - size = 18.0; # Adjust the font size as needed + size = lib.mkDefault 18.0; # Adjust the font size as needed }; }; } diff --git a/modules/helix.nix b/modules/helix.nix index 239c194..6e048d7 100644 --- a/modules/helix.nix +++ b/modules/helix.nix @@ -1,8 +1,9 @@ -{ lib, pkgs, ... }: { +{ lib, pkgs, ... }: +{ programs.helix = { enable = true; settings = { - theme = "autumn_night_transparent"; + theme = lib.mkDefault "autumn_night_transparent"; editor.cursor-shape = { normal = "block"; insert = "bar"; @@ -10,13 +11,17 @@ }; }; languages = { - language = [{ - name = "nix"; - auto-format = true; - formatter.command = "${pkgs.nixfmt}/bin/nixfmt"; - language-servers = [ "nixd" ]; - }]; - language-server.nixd = { command = lib.getExe pkgs.nixd; }; + language = [ + { + name = "nix"; + auto-format = true; + formatter.command = "${pkgs.nixfmt}/bin/nixfmt"; + language-servers = [ "nixd" ]; + } + ]; + language-server.nixd = { + command = lib.getExe pkgs.nixd; + }; }; themes = { autumn_night_transparent = { @@ -24,7 +29,11 @@ "ui.background" = { }; }; }; - extraPackages = with pkgs; [ nil rust-analyzer gopls ]; + extraPackages = with pkgs; [ + nil + rust-analyzer + gopls + ]; }; }