Compare commits

..

No commits in common. "3f2e3ece8946db68ce5ea5da2af90571b0734a51" and "690a034175a8136decbcbb52592a7911bd9663c9" have entirely different histories.

2 changed files with 14 additions and 20 deletions

View file

@ -1,51 +1,45 @@
{ lib, ... }: { lib, ... }:
{ {
programs.starship = let programs.starship = {
textColor = "#e3e5e5";
firstColor = "#bd93f9";
secondColor = "#715895";
thirdColor = "#382c4a";
fourthColor = "#120e18";
in {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;
settings = { settings = {
format = lib.concatStrings [ format = lib.concatStrings [
"" ""
"[](fg:${firstColor})" "[](fg:#bd93f9)"
"[ ](bg:${firstColor} fg:#090c0c)" "[ ](bg:#bd93f9 fg:#090c0c)"
"[](bg:${secondColor} fg:${firstColor})" "[](bg:#715895 fg:#bd93f9)"
"$username$hostname" "$username$hostname"
"$sudo" "$sudo"
"[](fg:${secondColor} bg:${thirdColor})" "[](fg:#715895 bg:#382c4a)"
"$directory" "$directory"
"[](fg:${thirdColor} bg:${fourthColor})" "[](fg:#382c4a bg:#120e18)"
"$git_branch" "$git_branch"
"[](fg:${fourthColor})" "[](fg:#120e18)"
"\n$shlvl$nix_shell$character" "\n$shlvl$nix_shell$character"
]; ];
sudo = { sudo = {
disabled = false; disabled = false;
style = "fg:${textColor} bg:${secondColor}"; style = "fg:#e3e5e5 bg:#715895";
format = "[as root ]($style)"; format = "[as root ]($style)";
}; };
username = { username = {
show_always = true; show_always = true;
style_user = "fg:${textColor} bg:${secondColor}"; style_user = "fg:#e3e5e5 bg:#715895";
format = "[ $user]($style)"; format = "[ $user]($style)";
}; };
hostname = { hostname = {
ssh_only = false; ssh_only = false;
style = "fg:${textColor} bg:${secondColor}"; style = "fg:#e3e5e5 bg:#715895";
format = "[@$hostname ]($style)"; format = "[@$hostname ]($style)";
}; };
directory = { directory = {
style = "fg:${firstColor} bg:${thirdColor}"; style = "fg:#bd93f9 bg:#382c4a";
format = "[ $path ]($style)"; format = "[ $path ]($style)";
truncate_to_repo = false; truncate_to_repo = false;
truncation_length = 0; truncation_length = 0;
@ -59,7 +53,7 @@
}; };
git_branch = { git_branch = {
style = "fg:${secondColor} bg:${fourthColor}"; style = "fg:#715895 bg:#120e18";
symbol = ""; symbol = "";
format = "[ $symbol $branch ]($style)"; format = "[ $symbol $branch ]($style)";
}; };
@ -118,6 +112,8 @@
sudo = "sudo "; sudo = "sudo ";
frick = "sudo $(fc -ln -1)"; frick = "sudo $(fc -ln -1)";
vi = "nvim";
vim = "nvim";
nivm = "nvim"; nivm = "nvim";
nivim = "nvim"; nivim = "nvim";

View file

@ -18,8 +18,6 @@ in
programs.neovim = { programs.neovim = {
enable = true; enable = true;
viAlias = true;
vimAlias = true;
package = pkgs.neovim-nightly; package = pkgs.neovim-nightly;
extraConfig = builtins.concatStringsSep "\n" [ extraConfig = builtins.concatStringsSep "\n" [