Compare commits

...

2 commits

Author SHA1 Message Date
4ce7b95d1b
feat(starship): Starship fixes
Some checks are pending
CI / Format Nix files (push) Waiting to run
CI / Test Modules (push) Waiting to run
CI / Validate sources (push) Waiting to run
Release / Make release (push) Waiting to run
Release / Publish to Flake registries (push) Blocked by required conditions
Build & deploy website / Build site (push) Waiting to run
Build & deploy website / Deploy website (push) Blocked by required conditions
2024-11-02 19:39:55 -07:00
4303182418
chore(wezterm): Too complicated to configure
Revert " test(wezterm): Add to testing"

This reverts commit 1fb54d67ae.
2024-11-02 16:30:01 -07:00
5 changed files with 9 additions and 28 deletions

View file

@ -2,4 +2,4 @@ test:
nix run \ nix run \
--inputs-from "./dev" "github:Mic92/nix-fast-build" -- \ --inputs-from "./dev" "github:Mic92/nix-fast-build" -- \
--no-nom \ --no-nom \
--flake "./dev#checks$(nix eval --raw --impure --expr builtins.currentSystem)" --flake "./dev#checks.$(nix eval --raw --impure --expr builtins.currentSystem)"

View file

@ -25,7 +25,6 @@
./sway.nix ./sway.nix
./tmux.nix ./tmux.nix
./waybar.nix ./waybar.nix
./wezterm.nix
./zathura.nix ./zathura.nix
./zellij.nix ./zellij.nix
] ]

View file

@ -2,20 +2,19 @@
config, config,
lib, lib,
... ...
}: let }:
let
inherit (config.rose-pine) sources; inherit (config.rose-pine) sources;
cfg = config.programs.starship.rose-pine; cfg = config.programs.starship.rose-pine;
enable = cfg.enable && config.programs.starship.enable; enable = cfg.enable && config.programs.starship.enable;
themeName = themeName = if (cfg.flavor == "main") then "rose-pine" else "rose-pine-${cfg.flavor}";
if (cfg.flavor == "main") in
then "rose-pine" {
else "rose-pine-${cfg.flavor}"; options.programs.starship.rose-pine = lib.rp.mkRosePineOpt { name = "starship"; };
in {
options.programs.starship.rose-pine = lib.rp.mkRosePineOpt {name = "starship";};
config.programs.starship.settings = lib.mkIf enable ( config.programs.starship.settings = lib.mkIf enable (
lib.importTOML "${sources.starship}/${themeName}.toml" lib.mkDefault (lib.importTOML "${sources.starship}/${themeName}.toml")
); );
} }

View file

@ -1,15 +0,0 @@
{ config, lib, ... }:
let
cfg = config.programs.wezterm.rose-pine;
enable = cfg.enable && config.programs.wezterm.enable;
in
{
options.programs.wezterm.rose-pine = lib.rp.mkRosePineOpt { name = "wezterm"; };
config.programs.wezterm.extraConfig = lib.mkIf enable ''
local theme = wezterm.plugin.require('https://github.com/neapsix/wezterm').${cfg.flavor}
config.colors = theme.colors()
config.window_frame = theme.window_frame()
'';
}

View file

@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
imports = [ imports = [
../modules/home-manager ../modules/home-manager
./common.nix ./common.nix
@ -34,7 +33,6 @@
swaylock.enable = true; swaylock.enable = true;
tmux.enable = true; tmux.enable = true;
waybar.enable = true; waybar.enable = true;
wezterm.enable = true;
zathura.enable = true; zathura.enable = true;
zellij.enable = true; zellij.enable = true;
}; };