diff --git a/flake.lock b/flake.lock index 12785af..324388b 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1760015796, - "narHash": "sha256-c/WkaynHrRE1EHWATe5+vb9M9YabfTaR1GHivdybaSU=", + "lastModified": 1760312644, + "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "6564ee29d0521af3feba937a91024e6a3e77a8b6", + "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "type": "github" }, "original": { @@ -89,11 +89,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1760245579, - "narHash": "sha256-VnWatwwsLHkgWO6R3N71nQiacOKhpmEBPbasGdr3Ogk=", + "lastModified": 1760353389, + "narHash": "sha256-/NLkyQww0DEkGqC6drAUK5MEFhhygibv8tyNGpWzR3E=", "owner": "nix-community", "repo": "nixvim", - "rev": "dc8dea66e8b02fcee6711ec0c72932bf4a033069", + "rev": "69d72bb82d7ba1904df47cf092ce1d4c88448001", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 258c005..3936fa8 100644 --- a/flake.nix +++ b/flake.nix @@ -14,21 +14,23 @@ }; outputs = { self, nixpkgs, home-manager, nixvim }@inputs: { - - packages.x86_64-linux.hello = nixpkgs.legacyPackages.x86_64-linux.hello; - - packages.x86_64-linux.default = self.packages.x86_64-linux.hello; - nixosConfigurations = { lily-desktop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./hosts/desktop/configuration.nix - inputs.home-manager.nixosModules.default - inputs.nixvim.nixosModules.nixvim ]; specialArgs = { inherit inputs; }; }; }; + + homeConfigurations."lily" = home-manager.lib.homeManagerConfiguration { + pkgs = import nixpkgs { system = "x86_64-linux"; }; + modules = [ + ./users/lily/home.nix + inputs.nixvim.homeModules.nixvim + ]; + extraSpecialArgs = { inherit inputs; }; + }; }; } diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index d8cdb47..cad1e06 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -6,9 +6,7 @@ ../../modules/nixos/localization.nix ../../modules/nixos/ai/index.nix ../../modules/nixos/desktops/gnome.nix - ../../modules/home/vim.nix ../../modules/nixos/desktops/hyprland.nix - inputs.home-manager.nixosModules.default ]; # Bootloader. @@ -23,7 +21,7 @@ # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Enable networking - networking.networkmanager.enable = true; + networking.networkmanager.enable = true; # Enable the X11 windowing system. services.xserver.enable = true; @@ -59,13 +57,6 @@ ]; }; - home-manager = { - extraSpecialArgs = { inherit inputs; }; - users = { - "lily" = import ./home.nix; - }; - }; - programs.nh = { enable = true; flake = "/home/lily/Programming/New LiNix"; diff --git a/hosts/desktop/home.nix b/users/lily/home.nix similarity index 98% rename from hosts/desktop/home.nix rename to users/lily/home.nix index 9073726..a62e711 100644 --- a/hosts/desktop/home.nix +++ b/users/lily/home.nix @@ -1,7 +1,8 @@ { config, pkgs, ... }: { - imports = [ /*../../modules/home/vim.nix*/ + imports = [ + ../../modules/home/vim.nix ../../modules/home/hyprland.nix ];