Compare commits
2 commits
1fb54d67ae
...
4ce7b95d1b
Author | SHA1 | Date | |
---|---|---|---|
4ce7b95d1b | |||
4303182418 |
5 changed files with 9 additions and 28 deletions
2
Justfile
2
Justfile
|
@ -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)"
|
||||||
|
|
|
@ -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
|
||||||
]
|
]
|
||||||
|
|
|
@ -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")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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()
|
|
||||||
'';
|
|
||||||
}
|
|
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue