sckova/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch back to nixfmt

Browse source
This commit is contained in:
Sean Kovacs 2026-01-19 22:27:28 -05:00
commit 62032eab6d
Signed by: sckova
GPG key ID: 00F325187C68651A
37 changed files with 797 additions and 689 deletions
Download patch file Download diff file Expand all files Collapse all files

8
home/terminal/btop.nix
View file

@ -2,15 +2,17 @@
config,
pkgs,
...
}: let
mergedConfig = pkgs.runCommand "mergedConfig" {} ''
}:
let
mergedConfig = pkgs.runCommand "mergedConfig" { } ''
mkdir -p $out/themes
${pkgs.gnused}/bin/sed 's/blankFlavor/${config.catppuccin.flavor}/g' \
${./btop.conf} > $out/btop.conf
cp ${pkgs.catppuccin-btop-git}/themes/catppuccin_latte.theme $out/themes/
cp ${pkgs.catppuccin-btop-git}/themes/catppuccin_${config.catppuccin.flavor}.theme $out/themes/nixos.theme
'';
in {
in
{
home.file.".config/btop" = {
source = mergedConfig;
recursive = true;

16
home/terminal/fish.nix
View file

@ -3,7 +3,8 @@
pkgs,
lib,
...
}: {
}:
{
home.packages = with pkgs; [
kdePackages.qttools
eza
@ -44,14 +45,15 @@
programs.man.generateCaches = false;
home.file.".config/fish/colors.fish" = {
text = let
flavor = config.catppuccin.flavor;
palette = pkgs.catppuccin.bare.${flavor};
accent = config.catppuccin.accent;
in
text =
let
flavor = config.catppuccin.flavor;
palette = pkgs.catppuccin.bare.${flavor};
accent = config.catppuccin.accent;
in
lib.concatStringsSep "\n" (
(lib.mapAttrsToList (name: value: "set -g color_${name} ${value}") palette)
++ ["set -g color_accent ${palette.${accent}}"]
++ [ "set -g color_accent ${palette.${accent}}" ]
);
force = true;
};

8
home/terminal/kitty.nix
View file

@ -2,7 +2,8 @@
config,
pkgs,
...
}: let
}:
let
colors = pkgs.catppuccin.hex.${config.catppuccin.flavor};
accent = colors.${config.catppuccin.accent};
@ -87,7 +88,8 @@
text = kitty-colors;
destination = "/kitty-colors.conf";
};
in {
in
{
home.file.".config/kitty/themes" = {
source = kitty-colors-file;
recursive = true;
@ -109,7 +111,7 @@ in {
};
shellIntegration.enableFishIntegration = true;
keybindings = {
"ctrl+k" = ''combine : clear_terminal scroll active : clear_terminal scrollback active'';
"ctrl+k" = "combine : clear_terminal scroll active : clear_terminal scrollback active";
};
settings = {
include = "/home/${config.userOptions.username}/.config/kitty/themes/kitty-colors.conf";

225
home/terminal/neovim.nix
View file

@ -2,7 +2,8 @@
pkgs,
config,
...
}: {
}:
{
home.sessionVariables = {
EDITOR = "nvim";
};
@ -11,7 +12,7 @@
kdePackages.qtdeclarative
prettier
prettierd
alejandra
nixfmt
stylua
black
clang-tools
@ -106,18 +107,18 @@
];
};
sources = [
{name = "git";}
{name = "nvim_lsp";}
{name = "path";}
{name = "buffer";}
{name = "fish";}
{name = "emoji";}
{ name = "git"; }
{ name = "nvim_lsp"; }
{ name = "path"; }
{ name = "buffer"; }
{ name = "fish"; }
{ name = "emoji"; }
{
name = "buffer"; # text within current buffer
option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
keywordLength = 3;
}
{name = "copilot";}
{ name = "copilot"; }
{
name = "path"; # file system paths
keywordLength = 3;
@ -133,16 +134,16 @@
enable = true;
settings = {
formatters_by_ft = {
lua = ["stylua"];
python = ["black"];
nix = ["alejandra"];
javascript = ["prettier"];
css = ["prettier"];
json = ["prettier"];
jsonc = ["prettier"];
fish = ["fish_indent"];
c = ["clang-format"];
cpp = ["clang-format"];
lua = [ "stylua" ];
python = [ "black" ];
nix = [ "nixfmt" ];
javascript = [ "prettier" ];
css = [ "prettier" ];
json = [ "prettier" ];
jsonc = [ "prettier" ];
fish = [ "fish_indent" ];
c = [ "clang-format" ];
cpp = [ "clang-format" ];
};
# Default formatting options
@ -185,108 +186,110 @@
nixd.enable = true;
};
};
lualine = let
palette = pkgs.catppuccin.${config.catppuccin.flavor};
in {
enable = true;
settings = {
options = {
theme = {
normal = {
a = {
fg = palette.base;
bg = palette.mauve;
lualine =
let
palette = pkgs.catppuccin.${config.catppuccin.flavor};
in
{
enable = true;
settings = {
options = {
theme = {
normal = {
a = {
fg = palette.base;
bg = palette.mauve;
};
b = {
fg = palette.text;
bg = palette.surface0;
};
c = {
fg = palette.text;
};
};
b = {
fg = palette.text;
bg = palette.surface0;
insert = {
a = {
fg = palette.base;
bg = palette.blue;
};
};
c = {
fg = palette.text;
visual = {
a = {
fg = palette.base;
bg = palette.teal;
};
};
replace = {
a = {
fg = palette.base;
bg = palette.red;
};
};
inactive = {
a = {
fg = palette.text;
bg = palette.base;
};
b = {
fg = palette.text;
bg = palette.base;
};
c = {
fg = palette.text;
};
};
};
insert = {
a = {
fg = palette.base;
bg = palette.blue;
};
};
visual = {
a = {
fg = palette.base;
bg = palette.teal;
};
};
replace = {
a = {
fg = palette.base;
bg = palette.red;
};
};
inactive = {
a = {
fg = palette.text;
bg = palette.base;
};
b = {
fg = palette.text;
bg = palette.base;
};
c = {
fg = palette.text;
};
component_separators = "";
section_separators = {
left = "";
right = "";
};
};
component_separators = "";
section_separators = {
left = "";
right = "";
sections = {
lualine_a = [
{
__unkeyed-1 = "mode";
separator = {
left = " ";
};
right_padding = 2;
}
];
lualine_b = [
"filename"
"branch"
];
lualine_c = [ "%=" ];
lualine_x = [ ];
lualine_y = [
"filetype"
"progress"
];
lualine_z = [
{
__unkeyed-1 = "location";
separator = {
right = " ";
};
left_padding = 2;
}
];
};
};
sections = {
lualine_a = [
{
__unkeyed-1 = "mode";
separator = {
left = " ";
};
right_padding = 2;
}
];
lualine_b = [
"filename"
"branch"
];
lualine_c = ["%="];
lualine_x = [];
lualine_y = [
"filetype"
"progress"
];
lualine_z = [
{
__unkeyed-1 = "location";
separator = {
right = " ";
};
left_padding = 2;
}
];
inactive_sections = {
lualine_a = [ "filename" ];
lualine_b = [ ];
lualine_c = [ ];
lualine_x = [ ];
lualine_y = [ ];
lualine_z = [ "location" ];
};
tabline = { };
extensions = [ ];
};
inactive_sections = {
lualine_a = ["filename"];
lualine_b = [];
lualine_c = [];
lualine_x = [];
lualine_y = [];
lualine_z = ["location"];
};
tabline = {};
extensions = [];
};
};
};
};
}