hosts/dell-5590/home-manager/home-manager

@@ -0,0 +1 @@
+/home/alexandre/git/nixos-config/hosts/dell-5590/home-manager/

hosts/dell-5590/home-manager/home.nix

@@ -10,7 +10,7 @@
     ./dunst.nix
     ./bat.nix
 #    ./redshift.nix
-    ../../../modules/neovim.nix
+#    ../../../modules/neovim.nix
     ../../../modules/rust.nix
     ../../../modules/tmux.nix
     ../../../modules/git.nix

hosts/dell-5590/home-manager/packages.nix

@@ -3,6 +3,7 @@
   home.packages = with pkgs; [
     firefox
     thunderbird
+    vim
     jq
     nextcloud-client
     libreoffice
@@ -43,6 +44,7 @@
     zola
     exa
     bat
+    vimPlugins.vim-markdown-composer
     python3
     mtr
     powertop
@@ -66,6 +68,7 @@
     graphviz
     evince
     kdeconnect
+    neovim
   ];
   nixpkgs.config.permittedInsecurePackages = [
     "ferdi-5.8.1"

hosts/dell-5590/home-manager/variables.nix

@@ -3,7 +3,7 @@
 #config ={
   home.sessionVariables = {
     LESS = "--quit-if-one-screen --RAW-CONTROL-CHARS";
-    EDITOR = "nvim";
+    EDITOR = "vim";
     TERMINAL = "xfce4-terminal";
     BROWSER = "firefox";
     PRIVATE_BROWSER = "firefox -private";

hosts/dell-5590/nixos/configuration.nix

@@ -24,15 +24,13 @@
   }; 
 
  programs = {
+    zsh.enable = true;
     htop = {
       enable = true;
       settings.show_cpu_temperature = 1;
       };
     fish = {
       enable = true;
-      interactiveShellInit = ''
-        set -gx EDITOR nvim
-      '';
       shellAliases = {
         ll = "ls -l";
         ls = "lsd";
@@ -178,7 +176,7 @@ nix.settings.auto-optimise-store = true;
   system.stateVersion = "21.05"; # Did you read the comment?
 
   environment.variables = {
-    EDITOR = "nvim";
+    EDITOR = "vim";
     BROWSER = "firefox";
     LESS = "--quit-if-one-screen --RAW-CONTROL-CHARS";
     TERMINAL = "xfce4-terminal";

hosts/dell-5590/nixos/packages.nix

@@ -4,7 +4,7 @@
   
   environment.systemPackages = with pkgs; [
 
-    wget lshw openssh bc unzip zip file which gnumake tmux
+    wget lshw openssh bc unzip zip file which vim gnumake tmux
     gitAndTools.gitFull
     dmenu
     pkgs.dconf

modules/configs/starship.toml

@@ -1,81 +0,0 @@
-# ~/.config/starship.toml
-
-[battery]
-full_symbol = "🔋"
-charging_symbol = "🔌"
-discharging_symbol = "⚡"
-
-[[battery.display]]
-threshold = 30
-style = "bold red"
-
-[character]
-error_symbol = "[✖](bold red) "
-
-[cmd_duration]
-min_time = 10_000  # Show command duration over 10,000 milliseconds (=10 sec)
-format = " took [$duration]($style)"
-
-[directory]
-truncation_length = 5
-format = "[$path]($style)[$lock_symbol]($lock_style) "
-
-[git_branch]
-format = " [$symbol$branch]($style) "
-symbol = "🍣 "
-style = "bold yellow"
-
-[git_commit]
-commit_hash_length = 8
-style = "bold white"
-
-[git_state]
-format = '[\($state( $progress_current of $progress_total)\)]($style) '
-
-[git_status]
-conflicted = "⚔️ "
-ahead = "🏎️ 💨 ×${count}"
-behind = "🐢 ×${count}"
-diverged = "🔱 🏎️ 💨 ×${ahead_count} 🐢 ×${behind_count}"
-untracked = "🛤️  ×${count}"
-stashed = "📦 "
-modified = "📝 ×${count}"
-staged = "🗃️  ×${count}"
-renamed = "📛 ×${count}"
-deleted = "🗑️  ×${count}"
-style = "bright-white"
-format = "$all_status$ahead_behind"
-
-[hostname]
-ssh_only = false
-format = "<[$hostname]($style)>"
-trim_at = "-"
-style = "bold dimmed white"
-disabled = false
-
-[memory_usage]
-format = "$symbol[${ram}( | ${swap})]($style) "
-threshold = 70
-style = "bold dimmed white"
-disabled = false
-
-[package]
-disabled = true
-
-[python]
-format = "[$symbol$version]($style) "
-style = "bold green"
-
-[rust]
-format = "[$symbol$version]($style) "
-style = "bold green"
-
-[time]
-time_format = "%T"
-format = "🕙 $time($style) "
-style = "bright-white"
-disabled = false
-
-[username]
-style_user = "bold dimmed blue"
-show_always = false

modules/neovim.nix

@@ -4,12 +4,12 @@ programs.neovim = {
   viAlias = true;
   vimAlias = true;
   vimdiffAlias = true;
-#  plugins = with pkgs.vimPlugins;[
+  plugins = with pkgs.vimPlugins;[
-#    nvim-lspconfig
+    nvim-lspconfig
-#    nvim-treesitter.withAllGrammars
+    nvim-treesitter.withAllGrammars
-#    plenary-nvim
+    plenary-nvim
-#    gruvbox-material
+    gruvbox-material
-#    mini-nvim
+    mini-nvim
-#    ];
+    ];
   };
 }