style: format with nixpkgs-fmt
This commit is contained in:
parent
a8981723bb
commit
27683fd6b8
11 changed files with 94 additions and 75 deletions
|
@ -8,12 +8,14 @@ in {
|
||||||
with lib;
|
with lib;
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let
|
let
|
||||||
file = fetchFromGitHub {
|
file = fetchFromGitHub
|
||||||
|
{
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "alacritty";
|
repo = "alacritty";
|
||||||
rev = "3c808cbb4f9c87be43ba5241bc57373c793d2f17";
|
rev = "3c808cbb4f9c87be43ba5241bc57373c793d2f17";
|
||||||
sha256 = "sha256-w9XVtEe7TqzxxGUCDUR9BFkzLZjG8XrplXJ3lX6f+x0=";
|
sha256 = "sha256-w9XVtEe7TqzxxGUCDUR9BFkzLZjG8XrplXJ3lX6f+x0=";
|
||||||
} + "/catppuccin-${cfg.flavour}.yml";
|
} + "/catppuccin-${cfg.flavour}.yml";
|
||||||
|
|
||||||
in mkIf cfg.enable (ctp.fromYaml pkgs file);
|
in
|
||||||
|
mkIf cfg.enable (ctp.fromYaml pkgs file);
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,8 @@ in {
|
||||||
config.programs.bottom.settings = with builtins;
|
config.programs.bottom.settings = with builtins;
|
||||||
with lib;
|
with lib;
|
||||||
with pkgs;
|
with pkgs;
|
||||||
mkIf cfg.enable (fromTOML (readFile (fetchFromGitHub {
|
mkIf cfg.enable (fromTOML (readFile (fetchFromGitHub
|
||||||
|
{
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "bottom";
|
repo = "bottom";
|
||||||
rev = "c0efe9025f62f618a407999d89b04a231ba99c92";
|
rev = "c0efe9025f62f618a407999d89b04a231ba99c92";
|
||||||
|
|
|
@ -2,13 +2,15 @@
|
||||||
let
|
let
|
||||||
cfg = config.programs.btop.catppuccin;
|
cfg = config.programs.btop.catppuccin;
|
||||||
themePath = "/themes/catppuccin_${cfg.flavour}.theme";
|
themePath = "/themes/catppuccin_${cfg.flavour}.theme";
|
||||||
theme = pkgs.fetchFromGitHub {
|
theme = pkgs.fetchFromGitHub
|
||||||
|
{
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "btop";
|
repo = "btop";
|
||||||
rev = "7109eac2884e9ca1dae431c0d7b8bc2a7ce54e54";
|
rev = "7109eac2884e9ca1dae431c0d7b8bc2a7ce54e54";
|
||||||
sha256 = "sha256-QoPPx4AzxJMYo/prqmWD/CM7e5vn/ueyx+XQ5+YfHF8=";
|
sha256 = "sha256-QoPPx4AzxJMYo/prqmWD/CM7e5vn/ueyx+XQ5+YfHF8=";
|
||||||
} + themePath;
|
} + themePath;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.programs.btop.catppuccin =
|
options.programs.btop.catppuccin =
|
||||||
lib.ctp.mkCatppuccinOpt "btop" config;
|
lib.ctp.mkCatppuccinOpt "btop" config;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
{ config, pkgs, lib, ... }: let
|
{ config, pkgs, lib, ... }:
|
||||||
|
let
|
||||||
extendedLib = import ../lib/mkExtLib.nix lib;
|
extendedLib = import ../lib/mkExtLib.nix lib;
|
||||||
in {
|
in
|
||||||
imports = let
|
{
|
||||||
|
imports =
|
||||||
|
let
|
||||||
files = [
|
files = [
|
||||||
./alacritty.nix
|
./alacritty.nix
|
||||||
./bat.nix
|
./bat.nix
|
||||||
|
@ -16,7 +19,8 @@ in {
|
||||||
./sway.nix
|
./sway.nix
|
||||||
./tmux.nix
|
./tmux.nix
|
||||||
];
|
];
|
||||||
in extendedLib.ctp.mapModules config pkgs extendedLib files;
|
in
|
||||||
|
extendedLib.ctp.mapModules config pkgs extendedLib files;
|
||||||
|
|
||||||
options.catppuccin = with extendedLib; {
|
options.catppuccin = with extendedLib; {
|
||||||
flavour = mkOption {
|
flavour = mkOption {
|
||||||
|
|
|
@ -26,7 +26,8 @@ in {
|
||||||
# use the light gtk theme for latte
|
# use the light gtk theme for latte
|
||||||
gtkTheme = if cfg.flavour == "latte" then "Light" else "Dark";
|
gtkTheme = if cfg.flavour == "latte" then "Light" else "Dark";
|
||||||
|
|
||||||
in mkIf cfg.enable {
|
in
|
||||||
|
mkIf cfg.enable {
|
||||||
name =
|
name =
|
||||||
"Catppuccin-${flavourUpper}-${sizeUpper}-${accentUpper}-${gtkTheme}";
|
"Catppuccin-${flavourUpper}-${sizeUpper}-${accentUpper}-${gtkTheme}";
|
||||||
package = pkgs.catppuccin-gtk.override {
|
package = pkgs.catppuccin-gtk.override {
|
||||||
|
|
|
@ -15,7 +15,8 @@ in {
|
||||||
theme = "catppuccin-${cfg.flavour}";
|
theme = "catppuccin-${cfg.flavour}";
|
||||||
editor.color-modes = mkDefault true;
|
editor.color-modes = mkDefault true;
|
||||||
};
|
};
|
||||||
themes."catppuccin-${cfg.flavour}" = fromTOML (readFile (fetchFromGitHub {
|
themes."catppuccin-${cfg.flavour}" = fromTOML (readFile (fetchFromGitHub
|
||||||
|
{
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "helix";
|
repo = "helix";
|
||||||
rev = "5677c16dc95297a804caea9161072ff174018fdd";
|
rev = "5677c16dc95297a804caea9161072ff174018fdd";
|
||||||
|
|
|
@ -7,7 +7,8 @@ in {
|
||||||
config.services.polybar.extraConfig = with builtins;
|
config.services.polybar.extraConfig = with builtins;
|
||||||
with lib;
|
with lib;
|
||||||
with pkgs;
|
with pkgs;
|
||||||
mkIf cfg.enable (readFile (fetchFromGitHub {
|
mkIf cfg.enable (readFile (fetchFromGitHub
|
||||||
|
{
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "polybar";
|
repo = "polybar";
|
||||||
rev = "9ee66f83335404186ce979bac32fcf3cd047396a";
|
rev = "9ee66f83335404186ce979bac32fcf3cd047396a";
|
||||||
|
|
|
@ -15,7 +15,8 @@ let
|
||||||
sha256 = "sha256-bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
|
sha256 = "sha256-bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.programs.tmux.catppuccin =
|
options.programs.tmux.catppuccin =
|
||||||
lib.ctp.mkCatppuccinOpt "tmux" config;
|
lib.ctp.mkCatppuccinOpt "tmux" config;
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,8 @@ with lib; rec {
|
||||||
json = with pkgs; runCommand "converted.json" { } ''
|
json = with pkgs; runCommand "converted.json" { } ''
|
||||||
${yj}/bin/yj < ${file} > $out
|
${yj}/bin/yj < ${file} > $out
|
||||||
'';
|
'';
|
||||||
in fromJSON (readFile json);
|
in
|
||||||
|
fromJSON (readFile json);
|
||||||
|
|
||||||
# a -> a -> [path] -> [path]
|
# a -> a -> [path] -> [path]
|
||||||
# this imports a list of paths while inheriting
|
# this imports a list of paths while inheriting
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
{ config, pkgs, lib, ... }: let
|
{ config, pkgs, lib, ... }:
|
||||||
|
let
|
||||||
extendedLib = import ../lib/mkExtLib.nix lib;
|
extendedLib = import ../lib/mkExtLib.nix lib;
|
||||||
in {
|
in
|
||||||
imports = let
|
{
|
||||||
|
imports =
|
||||||
|
let
|
||||||
files = [
|
files = [
|
||||||
./grub.nix
|
./grub.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -10,11 +10,13 @@ let
|
||||||
rev = "803c5df0e83aba61668777bb96d90ab8f6847106";
|
rev = "803c5df0e83aba61668777bb96d90ab8f6847106";
|
||||||
sha256 = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0=";
|
sha256 = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0=";
|
||||||
};
|
};
|
||||||
in runCommand "catppuccin-grub-theme" { } ''
|
in
|
||||||
|
runCommand "catppuccin-grub-theme" { } ''
|
||||||
mkdir -p "$out"
|
mkdir -p "$out"
|
||||||
cp -r ${src}/src/catppuccin-${cfg.flavour}-grub-theme/* "$out"/
|
cp -r ${src}/src/catppuccin-${cfg.flavour}-grub-theme/* "$out"/
|
||||||
'';
|
'';
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.boot.loader.grub.catppuccin =
|
options.boot.loader.grub.catppuccin =
|
||||||
lib.ctp.mkCatppuccinOpt "grub" config;
|
lib.ctp.mkCatppuccinOpt "grub" config;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue