Skip to content

Commit

Permalink
fix neovim
Browse files Browse the repository at this point in the history
  • Loading branch information
ojsef39 committed Nov 9, 2024
1 parent 100cb4d commit fa8a8dd
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 14 deletions.
14 changes: 10 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,20 @@
home-manager.url = "github:nix-community/home-manager";
darwin.url = "github:lnl7/nix-darwin/master";
yuki.url = "github:frostplexx/yuki";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
};
outputs = inputs @ { self, nixpkgs, home-manager, darwin, yuki, ... }:
{
outputs = inputs @ { self, nixpkgs, home-manager, darwin, yuki, ... }:
let
overlays = [
inputs.neovim-nightly-overlay.overlays.default
];
in
{
sharedModules = [
./nix/core.nix
##TODO: Do i need homemanager again here or is it sufficient if its called by the parent?
home-manager.darwinModules.home-manager
({ vars, system, ... }: { # system is now available here
({ vars, config, inputs, system, ... }: {
nixpkgs.overlays = overlays;
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
Expand Down
2 changes: 1 addition & 1 deletion hosts/shared/import.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ vars, pkgs, lib, ... }:
{ vars, pkgs, inputs, lib, ... }:
let
# Check if programs directory exists
hasProgramsDir = builtins.pathExists ./programs;
Expand Down
18 changes: 9 additions & 9 deletions hosts/shared/programs/editor/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ let
};
in
{
# Packages used in nvim but also outside of it
home.packages = with pkgs; [
fzf
git
lazygit
nerdfonts
ripgrep
];

programs.neovim = {
enable = lib.mkDefault true;
defaultEditor = lib.mkDefault true;
Expand All @@ -22,15 +31,6 @@ in
];
};

# Packages used in nvim but also outside of it
home.packages = with pkgs; [
fzf
git
lazygit
neovim
nerdfonts
ripgrep
];

# Copy your Neovim configuration
xdg.configFile = {
Expand Down

0 comments on commit fa8a8dd

Please sign in to comment.