format with alejandra
This commit is contained in:
parent
110abe5c63
commit
71522c6b5d
35 changed files with 578 additions and 589 deletions
|
|
@ -1,6 +1,8 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
catppuccin-btop = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "btop";
|
||||
|
|
@ -8,15 +10,14 @@ let
|
|||
sha256 = "sha256-mEGZwScVPWGu+Vbtddc/sJ+mNdD2kKienGZVUcTSl+c=";
|
||||
};
|
||||
|
||||
mergedConfig = pkgs.runCommand "mergedConfig" { } ''
|
||||
mergedConfig = pkgs.runCommand "mergedConfig" {} ''
|
||||
mkdir -p $out/themes
|
||||
${pkgs.gnused}/bin/sed 's/blankFlavor/${config.catppuccin.flavor}/g' \
|
||||
${./btop.conf} > $out/btop.conf
|
||||
cp ${catppuccin-btop}/themes/catppuccin_latte.theme $out/themes/
|
||||
cp ${catppuccin-btop}/themes/catppuccin_${config.catppuccin.flavor}.theme $out/themes/
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
home.file.".config/btop" = {
|
||||
source = mergedConfig;
|
||||
recursive = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [ kdePackages.qttools ];
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [kdePackages.qttools];
|
||||
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
}: let
|
||||
catppuccin-kitty = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "kitty";
|
||||
|
|
@ -13,15 +11,14 @@ let
|
|||
sha256 = "sha256-59ON7CzVgfZUo7F81qQZQ1r6kpcjR3OPvTl99gzDP8E=";
|
||||
};
|
||||
|
||||
mergedConfig = pkgs.runCommand "mergedConfig" { } ''
|
||||
mergedConfig = pkgs.runCommand "mergedConfig" {} ''
|
||||
mkdir -p $out
|
||||
${pkgs.gnused}/bin/sed 's/#cba6f7/${
|
||||
pkgs.catppuccin.${config.catppuccin.flavor}.${config.catppuccin.accent}
|
||||
}/g' ${catppuccin-kitty}/themes/${config.catppuccin.flavor}.conf > \
|
||||
$out/${config.catppuccinUpper.flavor}${config.catppuccinUpper.accent}.conf
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
home.file.".config/kitty/themes" = {
|
||||
source = mergedConfig;
|
||||
recursive = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ pkgs, config, ... }:
|
||||
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
|
|
@ -9,7 +11,7 @@
|
|||
kdePackages.qtdeclarative
|
||||
prettier
|
||||
prettierd
|
||||
nixfmt-rfc-style
|
||||
alejandra
|
||||
stylua
|
||||
black
|
||||
];
|
||||
|
|
@ -94,13 +96,13 @@
|
|||
autoLoad = true;
|
||||
settings = {
|
||||
formatters_by_ft = {
|
||||
lua = [ "stylua" ];
|
||||
python = [ "black" ];
|
||||
nix = [ "nixfmt" ];
|
||||
javascript = [ "prettier" ];
|
||||
css = [ "prettier" ];
|
||||
json = [ "prettier" ];
|
||||
jsonc = [ "prettier" ];
|
||||
lua = ["stylua"];
|
||||
python = ["black"];
|
||||
nix = ["alejandra"];
|
||||
javascript = ["prettier"];
|
||||
css = ["prettier"];
|
||||
json = ["prettier"];
|
||||
jsonc = ["prettier"];
|
||||
};
|
||||
|
||||
# Default formatting options
|
||||
|
|
@ -216,8 +218,8 @@
|
|||
"filename"
|
||||
"branch"
|
||||
];
|
||||
lualine_c = [ "%=" ];
|
||||
lualine_x = [ ];
|
||||
lualine_c = ["%="];
|
||||
lualine_x = [];
|
||||
lualine_y = [
|
||||
"filetype"
|
||||
"progress"
|
||||
|
|
@ -234,15 +236,15 @@
|
|||
};
|
||||
|
||||
inactive_sections = {
|
||||
lualine_a = [ "filename" ];
|
||||
lualine_b = [ ];
|
||||
lualine_c = [ ];
|
||||
lualine_x = [ ];
|
||||
lualine_y = [ ];
|
||||
lualine_z = [ "location" ];
|
||||
lualine_a = ["filename"];
|
||||
lualine_b = [];
|
||||
lualine_c = [];
|
||||
lualine_x = [];
|
||||
lualine_y = [];
|
||||
lualine_z = ["location"];
|
||||
};
|
||||
tabline = { };
|
||||
extensions = [ ];
|
||||
tabline = {};
|
||||
extensions = [];
|
||||
};
|
||||
autoLoad = true;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue