From 096502a3d3e316fdeec357230b11b1ce38a40ffe Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 9 Sep 2024 08:19:36 -0600 Subject: [PATCH] configs: remove alacritty and fix smug eval issue Both smug and alacritty configs were causing an eval issue with `nix flake check --no-build`. To fix we basically just remove alacritty and the etc entry for smug stuff (which isn't used anyway). --- configs/alacritty.nix | 30 ------------------------------ configs/default.nix | 1 - configs/smug.nix | 21 ++++++++++++--------- 3 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 configs/alacritty.nix diff --git a/configs/alacritty.nix b/configs/alacritty.nix deleted file mode 100644 index 678c978..0000000 --- a/configs/alacritty.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, ... }: -let - settings = { - font = { - normal = { - family = "Go Mono"; - }; - size = 6; - }; - - colors = { - primary = { - background = "#ffffea"; - foreground = "#000000"; - }; - }; - }; - settingsFormat = pkgs.formats.toml { }; - settingsFile = settingsFormat.generate "alacritty.toml" settings; -in -{ - config = { - environment = { - etc = { - "xdg/alacritty/alacritty.toml".text = builtins.readFile settingsFile; - }; - }; - fonts = { packages = with pkgs; [ go-font ]; }; - }; -} diff --git a/configs/default.nix b/configs/default.nix index 7c29ae4..3ef5fc1 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -1,6 +1,5 @@ { ... }: { imports = [ - ./alacritty.nix ./ca.nix ./ci.nix ./colemak.nix diff --git a/configs/smug.nix b/configs/smug.nix index 1b4ef79..ba794c7 100644 --- a/configs/smug.nix +++ b/configs/smug.nix @@ -4,15 +4,18 @@ let tmuxFormat = pkgs.formats.yaml { }; mkSmugEntry = name: cfg: { - environment = { - systemPackages = [ - (pkgs.writeScriptBin name '' - ${pkgs.smug}/bin/smug -f /etc/smug/${name}.yml start - '') - ]; - etc."smug/${name}.yml".text = builtins.readFile - (tmuxFormat.generate "${name}.yml" cfg); - }; + environment = + let + yamlFile = tmuxFormat.generate "${name}.yml" cfg; + startScript = pkgs.writeScriptBin name '' + ${pkgs.smug}/bin/smug -f ${yamlFile} start + ''; + in + { + systemPackages = [ + startScript + ]; + }; }; in {