diff --git a/home/programs/fish.nix b/home/programs/fish.nix index 3cb8d511..c9481f3d 100644 --- a/home/programs/fish.nix +++ b/home/programs/fish.nix @@ -30,7 +30,7 @@ ''; # ${pkgs.spotify-player}/bin/spotify_player generate fish | source 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 ${lib.optionalString (device.isLinux && !device.isNix) "source /etc/profile.d/nix-daemon.fish"} ${lib.optionalString (device.is "ryu") '' diff --git a/neovim/default.nix b/neovim/default.nix index 5a646a81..7f046a49 100644 --- a/neovim/default.nix +++ b/neovim/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - stablePkgs, - ... -}: let +{pkgs, ...}: let mkMappings = mappings: [] ++ (pkgs.lib.optionals (builtins.hasAttr "normal" mappings) (mkMode mappings.normal "n")) @@ -17,16 +13,6 @@ mode = mode; }) mappings; - border = [ - "╭" - "─" - "╮" - "│" - "╯" - "─" - "╰" - "│" - ]; rawLua = lua: { "__raw" = '' ${lua} @@ -60,7 +46,20 @@ in { colorschemes = { catppuccin = { 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 {