This commit is contained in:
Daan Vanoverloop 2023-07-01 11:33:15 +02:00
parent ecdeba0805
commit d7a08d5f19
3 changed files with 71 additions and 13 deletions

49
nixos/flake.lock Normal file
View File

@ -0,0 +1,49 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1687871164,
"narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1688109178,
"narHash": "sha256-BSdeYp331G4b1yc7GIRgAnfUyaktW2nl7k0C577Tttk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b72aa95f7f096382bff3aea5f8fde645bca07422",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

View File

@ -1,8 +1,25 @@
{
outputs = { self, nixpkgs }: {
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = inputs@{ self, nixpkgs, home-manager }:
let
homeconfig = {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.daan = import ./modules/home;
};
in
{
nixosConfigurations.danacus-yoga = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./systems/yoga/configuration.nix ];
modules = [
./systems/yoga/configuration.nix
home-manager.nixosModules.home-manager
homeconfig
];
};
};
}

View File

@ -1,13 +1,5 @@
{ config, pkgs, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
in
{
imports =
[
(import "${home-manager}/nixos")
];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -79,9 +71,9 @@ in
extraGroups = [ "networkmanager" "wheel" ];
};
home-manager.users.daan = { pkgs, ... }: {
imports = [ "./home" ];
};
# home-manager.users.daan = { pkgs, ... }: {
# imports = [ "./home" ];
# };
# Allow unfree packages
nixpkgs.config.allowUnfree = true;