Split out home configuration. Update.

This commit is contained in:
2025-10-13 16:10:57 -05:00
parent 344ba2af68
commit f456f171d2
4 changed files with 21 additions and 27 deletions

18
flake.lock generated
View File

@@ -46,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760015796, "lastModified": 1760312644,
"narHash": "sha256-c/WkaynHrRE1EHWATe5+vb9M9YabfTaR1GHivdybaSU=", "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6564ee29d0521af3feba937a91024e6a3e77a8b6", "rev": "e121f3773fa596ecaba5b22e518936a632d72a90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -89,11 +89,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1759831965, "lastModified": 1760284886,
"narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c9b6fb798541223bbb396d287d16f43520250518", "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -113,11 +113,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1760245579, "lastModified": 1760353389,
"narHash": "sha256-VnWatwwsLHkgWO6R3N71nQiacOKhpmEBPbasGdr3Ogk=", "narHash": "sha256-/NLkyQww0DEkGqC6drAUK5MEFhhygibv8tyNGpWzR3E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "dc8dea66e8b02fcee6711ec0c72932bf4a033069", "rev": "69d72bb82d7ba1904df47cf092ce1d4c88448001",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -14,21 +14,23 @@
}; };
outputs = { self, nixpkgs, home-manager, nixvim }@inputs: { 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 = { nixosConfigurations = {
lily-desktop = nixpkgs.lib.nixosSystem { lily-desktop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/desktop/configuration.nix ./hosts/desktop/configuration.nix
inputs.home-manager.nixosModules.default
inputs.nixvim.nixosModules.nixvim
]; ];
specialArgs = { inherit inputs; }; 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; };
};
}; };
} }

View File

@@ -6,9 +6,7 @@
../../modules/nixos/localization.nix ../../modules/nixos/localization.nix
../../modules/nixos/ai/index.nix ../../modules/nixos/ai/index.nix
../../modules/nixos/desktops/gnome.nix ../../modules/nixos/desktops/gnome.nix
../../modules/home/vim.nix
../../modules/nixos/desktops/hyprland.nix ../../modules/nixos/desktops/hyprland.nix
inputs.home-manager.nixosModules.default
]; ];
# Bootloader. # Bootloader.
@@ -23,7 +21,7 @@
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
@@ -59,13 +57,6 @@
]; ];
}; };
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
"lily" = import ./home.nix;
};
};
programs.nh = { programs.nh = {
enable = true; enable = true;
flake = "/home/lily/Programming/New LiNix"; flake = "/home/lily/Programming/New LiNix";

View File

@@ -1,7 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ /*../../modules/home/vim.nix*/ imports = [
../../modules/home/vim.nix
../../modules/home/hyprland.nix ../../modules/home/hyprland.nix
]; ];