From dc4c8a81e1587cb3f602f6a16bc8effe4c713033 Mon Sep 17 00:00:00 2001 From: harry123 Date: Fri, 7 Mar 2025 13:34:05 +0100 Subject: [PATCH] having fun with nixvim --- features/neovim/default.nix | 11 +++++ features/neovim/keys.nix | 14 ++++++ features/neovim/plugins.nix | 78 +++++++++++++++++++++++++++++ flake.nix | 15 +++--- home-manager/home.nix | 97 ++++++++++++++++++------------------- 5 files changed, 158 insertions(+), 57 deletions(-) create mode 100644 features/neovim/default.nix create mode 100644 features/neovim/keys.nix create mode 100644 features/neovim/plugins.nix diff --git a/features/neovim/default.nix b/features/neovim/default.nix new file mode 100644 index 0000000..2b98f29 --- /dev/null +++ b/features/neovim/default.nix @@ -0,0 +1,11 @@ +{ self, ... }: +{ + programs.nixvim = { + enable = true; + + colorschemes.catppuccin = { + enable = true; + settings.flavour = "latte"; + }; + }; +} diff --git a/features/neovim/keys.nix b/features/neovim/keys.nix new file mode 100644 index 0000000..36af769 --- /dev/null +++ b/features/neovim/keys.nix @@ -0,0 +1,14 @@ +{ + lib, + config, + pkgs, + ... +}: +{ + programs.nixvim = { + enable = true; + keymaps = { + + }; + }; +} diff --git a/features/neovim/plugins.nix b/features/neovim/plugins.nix new file mode 100644 index 0000000..dc1a635 --- /dev/null +++ b/features/neovim/plugins.nix @@ -0,0 +1,78 @@ +{ + lib, + config, + pkgs, + ... +}: +{ + programs.nixvim = { + plugins = { + lsp = { + enable = true; + servers = { + asm_lsp.enable = true; + gopls.enable = true; + java_language_server.enable = true; + rust-analyzer.enable = true; + }; + }; + + nvim-cmp = { + enable = true; + autoEnableSources = true; + sources = [ + { name = "nvim_lsp"; } + { name = "path"; } + { name = "buffer"; } + + ]; + }; + barbar.enable = true; + gitsigns.enable = true; + + comment = { + enable = true; + }; + + treesitter = { + enable = true; + }; + + web-devicons = { + enable = true; + }; + + emmet = { + enable = true; + }; + + nvim-autopairs = { + enable = true; + }; + + presence-nvim = { + enable = true; + }; + + chadtree = { + enable = true; + }; + + fzf-lua = { + enable = true; + }; + + notify = true; + + neotest = { + enable = true; + adapters = { + rust.enable = true; + python.enable = true; + java.enable = true; + go.enable = true; + }; + }; + }; + }; +} diff --git a/flake.nix b/flake.nix index a85d847..a5822cc 100644 --- a/flake.nix +++ b/flake.nix @@ -25,13 +25,13 @@ nix-darwin.url = "github:LnL7/nix-darwin"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - anyrun = { - url = "github:anyrun-org/anyrun"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + inputs.nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -44,8 +44,8 @@ nixos-generators, nix-darwin, nix-flatpak, - anyrun, home-manager, + nixvim, ... }@inputs: let @@ -87,9 +87,6 @@ modules = [ ./hosts/goober/configuration.nix nix-flatpak.nixosModules.nix-flatpak - - { environment.systemPackages = [ anyrun.packages."x86_64-linux".anyrun ]; } - home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -98,6 +95,8 @@ home-manager.extraSpecialArgs = { inherit inputs; }; } + + nixvim.homeManagerModules.nixvim ]; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index ab3ddb6..89785d0 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -30,72 +30,71 @@ # The home.packages option allows you to install Nix packages into your # environment. - home.packages = [ + home.packages = with pkgs; [ # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. # pkgs.hello - # # It is sometimes useful to fine-tune packages, for example, by applying - # # overrides. You can do that directly here, just don't forget the - # # parentheses. Maybe you want to install Nerd Fonts with a limited number of - # # fonts? - (pkgs.nerdfonts.override { fonts = [ "CodeNewRoman" ]; }) + nerd-fonts.code-new-roman - pkgs.dm-sans - pkgs.zoxide - pkgs.btop + dm-sans + zoxide + btop #pkgs.bitwarden - pkgs.weechat - pkgs.eclipses.eclipse-java # school wants us to use it... - pkgs.cava - pkgs.hyfetch - pkgs.kittysay - pkgs.nextcloud-client - pkgs.thunderbird-bin - pkgs.feh - pkgs.waybar - pkgs.p7zip + weechat + eclipses.eclipse-java # school wants us to use it... + cava + hyfetch + kittysay + nextcloud-client + thunderbird-bin + feh + waybar + p7zip - pkgs.playerctl - pkgs.wf-recorder + playerctl + wf-recorder - pkgs.file - pkgs.osu-lazer-bin + file + osu-lazer-bin - pkgs.qbittorrent + qbittorrent - pkgs.i2pd + i2pd - pkgs.ripgrep - pkgs.vscode + ripgrep + vscode - pkgs.zathura - pkgs.tor-browser + zathura + tor-browser - pkgs.gammastep - pkgs.lazygit - pkgs.xfce.thunar - pkgs.gimp-with-plugins - pkgs.fzf - pkgs.lf - pkgs.why3 - pkgs.alt-ergo - pkgs.cvc4 - pkgs.z3 - pkgs.prismlauncher + gammastep + lazygit + xfce.thunar + gimp-with-plugins + fzf + lf + why3 + alt-ergo + cvc4 + z3 + prismlauncher - pkgs.audacious - pkgs.audacious-plugins + audacious + audacious-plugins - pkgs.krita - pkgs.udiskie + krita + udiskie - pkgs.libsixel - pkgs.walker - pkgs.unzip - pkgs.p7zip + libsixel + walker + unzip + p7zip - pkgs.nixfmt-rfc-style + nixfmt-rfc-style + signal-desktop + gajim + blender # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your # # environment: