From 571c6846ec9a11d837a5115750a59946f6a913a3 Mon Sep 17 00:00:00 2001 From: meml0rz Date: Tue, 12 Nov 2024 00:29:21 +0100 Subject: [PATCH] nixvim --- configuration.nix | 4 ---- flake.nix | 5 +++-- modules/nix/nixvim.nix | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/configuration.nix b/configuration.nix index 1cb2b09..3683dcf 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,11 +1,7 @@ { config, lib, pkgs, inputs, ... }: -let - home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"; -in { imports = [ - ./hardware-configuration.nix ./modules/nix/firefox.nix ]; diff --git a/flake.nix b/flake.nix index 5eebfc8..89b9caf 100644 --- a/flake.nix +++ b/flake.nix @@ -21,9 +21,10 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.jdoe = import ./home.nix; + home-manager.users.fabian = import ./modules/home.nix; home-manager.extraSpecialArgs = { - inherit inputs nixvim + inherit nixvim; + inherit inputs; }; } ]; diff --git a/modules/nix/nixvim.nix b/modules/nix/nixvim.nix index 70bdd07..561c2de 100644 --- a/modules/nix/nixvim.nix +++ b/modules/nix/nixvim.nix @@ -1,7 +1,7 @@ -{ config, pkgs, inputs, nixvim, ... }: +{ config, pkgs, nixvim, ... }: { imports = [ - .homeManagerModules.nixvim + nixvim.homeManagerModules.nixvim ]; programs.nixvim = { enable = true;