fix(fish): conditionally use sixel for fastfetch in tmux
Some checks failed
Flake checker / Build Nix targets (push) Has been cancelled

fix(nvim): enhance catppuccin colorscheme with integrations
This commit is contained in:
2026-01-07 21:21:05 +05:30
parent 0d14b6bffc
commit 04a08d3107
2 changed files with 16 additions and 17 deletions

View File

@@ -30,7 +30,7 @@
''; '';
# ${pkgs.spotify-player}/bin/spotify_player generate fish | source # ${pkgs.spotify-player}/bin/spotify_player generate fish | source
interactiveShellInit = '' interactiveShellInit = ''
${lib.getExe pkgs.fastfetch} if test -n "$TMUX"; ${lib.getExe pkgs.fastfetch} --logo-type sixel; else ${lib.getExe pkgs.fastfetch}; end
# ${pkgs.nb}/bin/nb todo undone # ${pkgs.nb}/bin/nb todo undone
${lib.optionalString (device.isLinux && !device.isNix) "source /etc/profile.d/nix-daemon.fish"} ${lib.optionalString (device.isLinux && !device.isNix) "source /etc/profile.d/nix-daemon.fish"}
${lib.optionalString (device.is "ryu") '' ${lib.optionalString (device.is "ryu") ''

View File

@@ -1,8 +1,4 @@
{ {pkgs, ...}: let
pkgs,
stablePkgs,
...
}: let
mkMappings = mappings: mkMappings = mappings:
[] []
++ (pkgs.lib.optionals (builtins.hasAttr "normal" mappings) (mkMode mappings.normal "n")) ++ (pkgs.lib.optionals (builtins.hasAttr "normal" mappings) (mkMode mappings.normal "n"))
@@ -17,16 +13,6 @@
mode = mode; mode = mode;
}) })
mappings; mappings;
border = [
""
""
""
""
""
""
""
""
];
rawLua = lua: { rawLua = lua: {
"__raw" = '' "__raw" = ''
${lua} ${lua}
@@ -60,7 +46,20 @@ in {
colorschemes = { colorschemes = {
catppuccin = { catppuccin = {
enable = true; enable = true;
settings.flavour = "mocha"; settings = {
flavour = "mocha";
integrations = {
cmp = true;
gitsigns = true;
nvimtree = true;
treesitter = true;
notify = true;
mini = {
enabled = true;
indentscope_color = "";
};
};
};
}; };
}; };
keymaps = mkMappings { keymaps = mkMappings {