remove neovim

Signed-off-by: Michael Thomson <michael@michaelthomson.dev>
2024-11-17 21:03:50 -05:00
parent 116e757499
commit f3e9f9e031
28 changed files with 34 additions and 686 deletions
--- a/hosts/dell/configuration.nix
+++ b/hosts/dell/configuration.nix
@@ -30,7 +30,6 @@
  nix.settings.experimental-features = [ "nix-command" "flakes" ];

  environment.systemPackages = with pkgs; [
-    neovim
    wget
    git
    curl
--- a/hosts/dell/home.nix
+++ b/hosts/dell/home.nix
@@ -5,7 +5,7 @@
    ../../modules/home-manager/i3
    ../../modules/home-manager/ssh
    ../../modules/home-manager/git
-    ../../modules/home-manager/neovim
+    ../../modules/home-manager/nixvim
    ../../modules/home-manager/wezterm
    ../../modules/home-manager/zsh
    ../../modules/home-manager/tmux
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -33,7 +33,6 @@
  nix.settings.experimental-features = [ "nix-command" "flakes" ];

  environment.systemPackages = with pkgs; [
-    neovim
    wget
    git
    curl
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -5,7 +5,7 @@
    ../../modules/home-manager/i3
    ../../modules/home-manager/ssh
    ../../modules/home-manager/git
-    ../../modules/home-manager/neovim
+    ../../modules/home-manager/nixvim
    ../../modules/home-manager/wezterm
    ../../modules/home-manager/zsh
    ../../modules/home-manager/tmux
--- a/hosts/macbook/configuration.nix
+++ b/hosts/macbook/configuration.nix
@@ -54,8 +54,6 @@
    };
  };

-  # programs.zsh.enable = true;
-
  system.stateVersion = 5;

  # Auto upgrade nix package and the daemon service.
--- a/hosts/macbook/home.nix
+++ b/hosts/macbook/home.nix
@@ -19,17 +19,15 @@

  home.sessionVariables = {
    EDITOR = "nvim";
+    ZK_NOTEBOOK_DIR = "\${HOME}/zk";
  };

  programs = {
    direnv = {
      enable = true;
-      enableZshIntegration = true; # see note on other shells below
+      enableZshIntegration = true;
      nix-direnv.enable = true;
    };
-    java = {
-      enable = true;
-    };
    zk = {
      enable = true;
      settings = {
@@ -38,10 +36,9 @@
        };
      };
    };
-  };
-
-  home.sessionVariables = {
-    ZK_NOTEBOOK_DIR = "\${HOME}/zk";
+    go = {
+      enable = true;
+    };
  };

  home.packages = with pkgs; [
@@ -67,7 +64,6 @@
    glow
    gcc
    nchat
-    go
    emanote
  ];

--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -35,7 +35,6 @@
  nix.settings.experimental-features = [ "nix-command" "flakes" ];

  environment.systemPackages = with pkgs; [
-    neovim
    wget
    git
    curl
--- a/hosts/thinkpad/home.nix
+++ b/hosts/thinkpad/home.nix
@@ -5,7 +5,7 @@
    ../../modules/home-manager/i3
    ../../modules/home-manager/ssh
    ../../modules/home-manager/git
-    ../../modules/home-manager/neovim
+    ../../modules/home-manager/nixvim
    ../../modules/home-manager/wezterm
    ../../modules/home-manager/zsh
    ../../modules/home-manager/tmux