diff --git a/base/programs.nix b/base/programs.nix index 08affee..c85460f 100644 --- a/base/programs.nix +++ b/base/programs.nix @@ -13,6 +13,9 @@ # Debug and find files file + # Process json data + jq + # Check computer specs lshw @@ -54,6 +57,8 @@ programs.nano.enable = true; # Same reasoning as nano programs.vim.enable = true; + # Same reasoning as vim + programs.neovim.enable = true; # Some people like this shell for some reason programs.zsh.enable = true; diff --git a/flake.nix b/flake.nix index 2d59513..d2b2741 100644 --- a/flake.nix +++ b/flake.nix @@ -237,7 +237,6 @@ inputs.dibbler.overlays.default (final: prev: { atool = prev.emptyDirectory; - neovim = prev.vim; micro = prev.vim; }) ]; diff --git a/hosts/skrott/configuration.nix b/hosts/skrott/configuration.nix index 5eff9e6..5294f17 100644 --- a/hosts/skrott/configuration.nix +++ b/hosts/skrott/configuration.nix @@ -33,6 +33,7 @@ documentation.enable = lib.mkForce false; + programs.neovim.enable = lib.mkForce false; programs.git.package = pkgs.gitMinimal; sops.secrets = { diff --git a/users/adriangl.nix b/users/adriangl.nix index 05df8f0..8892fa4 100644 --- a/users/adriangl.nix +++ b/users/adriangl.nix @@ -9,14 +9,6 @@ "nix-builder-users" ]; - packages = with pkgs; [ - neovim - htop - ripgrep - vim - foot.terminfo - ]; - openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFa5y7KyLn2tjxed1czMbyM5scnEpo9v/GfnhL/28ckM legolas" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICf7SlyHR6KgP7+IeFr/Iuiu2lL5vaSlzqPonaO8XU0J gunalx@aragon" diff --git a/users/albertba.nix b/users/albertba.nix index b786e59..5342f14 100644 --- a/users/albertba.nix +++ b/users/albertba.nix @@ -5,11 +5,7 @@ extraGroups = [ "wheel" "drift" "nix-builder-users" ]; packages = with pkgs; [ - htop - neovim - ripgrep fd - tmux ]; shell = pkgs.zsh; diff --git a/users/oysteikt.nix b/users/oysteikt.nix index 41e5fca..20c170b 100644 --- a/users/oysteikt.nix +++ b/users/oysteikt.nix @@ -12,9 +12,6 @@ packages = with pkgs; [ bottom eza - neovim - ripgrep - tmux ]; openssh.authorizedKeys.keys = [ diff --git a/users/pederbs.nix b/users/pederbs.nix index 6f5f5d8..00a450e 100644 --- a/users/pederbs.nix +++ b/users/pederbs.nix @@ -14,14 +14,9 @@ bat edir fd - htop - jq micro ncdu - ripgrep sd - tmux - wget xe yq ]; diff --git a/users/vegardbm.nix b/users/vegardbm.nix index 8e0cba9..68383a2 100644 --- a/users/vegardbm.nix +++ b/users/vegardbm.nix @@ -11,9 +11,6 @@ packages = with pkgs; [ btop eza - neovim - ripgrep - tmux ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDVA3HqEx3je6L1AC+bP8sTxu3ZTKvTCR0npCyOVAYK5 vbm@arch-xeon"