nixos/home/bashdots.nix

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

nixos/home/nvim.nix

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