diff --git a/users/youwen/common/core.nix b/users/youwen/common/core.nix index 6369e8e..526c5a8 100755 --- a/users/youwen/common/core.nix +++ b/users/youwen/common/core.nix @@ -1,4 +1,13 @@ { pkgs, ... }: +let + inherit (builtins) fromTOML readFile fetchurl; + rose-pine-starship = fromTOML ( + readFile (fetchurl { + url = "https://raw.githubusercontent.com/rose-pine/starship/f8b3cdc0aefecae9e7e5999ecad97d4701a6e602/rose-pine.toml"; + sha256 = "sha256:1ywk5xjl3vhyyc7iq89h01ry3nzs78spp5zf495fh0m0wnalrxvq"; + }) + ); +in { home.file.".essentials" = { source = ./essentials; @@ -69,12 +78,20 @@ extensions = [ pkgs.github-copilot-cli ]; }; - programs.oh-my-posh = { + # programs.oh-my-posh = { + # enable = true; + # # enableZshIntegration = true; + # enableFishIntegration = true; + # enableBashIntegration = true; + # useTheme = "gruvbox"; + # }; + + programs.starship = { enable = true; - # enableZshIntegration = true; enableFishIntegration = true; enableBashIntegration = true; - useTheme = "gruvbox"; + enableNushellIntegration = true; + settings = rose-pine-starship; }; programs.direnv = { @@ -87,9 +104,9 @@ shellAliases = { ls = "eza -l --icons=auto"; }; - shellInit = '' - oh-my-posh disable notice - ''; + # shellInit = '' + # oh-my-posh disable notice + # ''; interactiveShellInit = '' fish_vi_key_bindings set -g fish_greeting diff --git a/users/youwen/linux/programs/default.nix b/users/youwen/linux/programs/default.nix index cfa2882..caff096 100644 --- a/users/youwen/linux/programs/default.nix +++ b/users/youwen/linux/programs/default.nix @@ -1,12 +1,7 @@ -{ - pkgs, - inputs, - ... -}: { programs.kitty = { enable = true; - themeFile = "tokyo_night_night"; + themeFile = "rose-pine"; font.name = "CaskaydiaCove Nerd Font"; shellIntegration.enableFishIntegration = true; shellIntegration.enableBashIntegration = true; @@ -19,6 +14,8 @@ allow_remote_control = "socket-only"; listen_on = "unix:/tmp/kitty"; scrollback_pager = ''nvim --noplugin -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - "''; + cursor = "#c0caf5"; + cursor_text_color = "#1a1b26"; }; keybindings = { "kitty_mod+h" = "show_scrollback";