11 current 2024-09-07 10:24:00 24.11.20240828.71e91c4 6.6.47 *

This commit is contained in:
Colin Henry 2024-09-07 10:24:01 -07:00
parent d4d155ac91
commit 99908d63c8
4 changed files with 40 additions and 9 deletions

View File

@ -2,14 +2,19 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
{ config, pkgs, inputs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
./main-user.nix
inputs.home-manager.nixosModules.default
];
main-user.enable = true;
main-user.userName = "jchenry";
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -101,6 +106,12 @@
];
};
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
"jchenry" = import ./home.nix;
};
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;

21
flake.lock generated
View File

@ -1,5 +1,25 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1725694918,
"narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1724819573,
@ -18,6 +38,7 @@
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
}
}

View File

@ -4,10 +4,10 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# home-manager = {
# url = "github:nix-community/home-manager";
# inputs.nixpkgs.follows = "nixpkgs";
# };
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, ... }@inputs: {
@ -15,7 +15,7 @@
specialArgs = {inherit inputs;};
modules = [
./configuration.nix
# inputs.home-manager.nixosModules.default
inputs.home-manager.nixosModules.default
];
};
};

View File

@ -1,4 +1,4 @@
{ lib, config, pkgs, ... };
{ lib, config, pkgs, ... }:
{
options = {
@ -12,8 +12,7 @@
config = lib.mkIf config.main-user.enable {
users.users.${config.main-user.userName} = {
isNormalUser = true;
initalPassword = "12345";
description = "main user";
initialPassword = "12345";
shell = pkgs.bash;
};
};