diff --git a/default.nix b/default.nix index 460956a..19d448f 100644 --- a/default.nix +++ b/default.nix @@ -8,7 +8,7 @@ in { imports = [ inputs.home-manager.nixosModules.home-manager -# inputs.nixvim.nixosModules.nixvim + inputs.nixvim.nixosModules.nixvim inputs.stylix.nixosModules.stylix (mkAliasOptionModule ["hm"] ["home-manager" "users" config.user.name]) (mkAliasOptionModule ["home"] ["hm" "home"]) diff --git a/flake.lock b/flake.lock index 0d5fb3f..5196c2f 100644 --- a/flake.lock +++ b/flake.lock @@ -584,22 +584,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1718428119, "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", @@ -615,7 +599,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1723415338, "narHash": "sha256-K/BVeDLkpswRSBh3APxc2gBNVFEMXGpnkuQz666FiTM=", @@ -639,7 +623,9 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -714,7 +700,7 @@ }, "rust": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1724638882, @@ -743,7 +729,7 @@ "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "systems": "systems_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 9e40387..30ee0cf 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim.url = "github:nix-community/nixvim"; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; firefox.url = "github:nix-community/flake-firefox-nightly"; diff --git a/modules/desktop/editors/nvim.nix b/modules/desktop/editors/nvim.nix index e701003..8071d80 100644 --- a/modules/desktop/editors/nvim.nix +++ b/modules/desktop/editors/nvim.nix @@ -9,7 +9,7 @@ in in { enable = mkEnableOption "neo-vim (nixvim)"; }; config = mkIf config.modules.desktop.editors.nvim.enable { - /*programs.nixvim = { + programs.nixvim = { enable = true; options = { @@ -43,6 +43,6 @@ in ]; }; }; - };*/ + }; }; }