Flakes update

This commit is contained in:
Michael Thomas 2022-01-09 13:29:03 -05:00
parent 011a9da57c
commit 6098a39e2a
10 changed files with 48 additions and 41 deletions

16
flake.lock generated
View File

@ -7,32 +7,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1627649712, "lastModified": 1639871969,
"narHash": "sha256-AJBasvMKpsyJmCLdjroBElCHY5AlalbVy+XY5vjbgXc=", "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "b39647e52ed3c0b989e9d5c965e598ae4c38d7ef", "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "rycee", "owner": "rycee",
"ref": "release-21.05", "ref": "release-21.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1629033443, "lastModified": 1641687203,
"narHash": "sha256-Vo3TvQvR5hsd3incx/xOt6GFgTm651CYVauHS/irOFo=", "narHash": "sha256-W6Xrb/l1x+E+WMVLw4q5HUnNjt3x4WQFSYJtjJtopbU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8ac785da9843aa110caeed6c912875e46a415a11", "rev": "00acdb2aa817048fbe1f91ece18fe7de09762531",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-21.05", "ref": "nixos-21.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -2,16 +2,16 @@
description = "Michael Thomas's NixOS configuration"; description = "Michael Thomas's NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
home-manager = { home-manager = {
url = "github:rycee/home-manager/release-21.05"; url = "github:rycee/home-manager/release-21.11";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
}; };
}; };
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
}; };
outputs = inputs: { outputs = inputs: {
@ -38,7 +38,42 @@
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
};
homeConfigurations = {
nixos = inputs.home-manager.lib.homeManagerConfiguration {
system = "x86_64-linux";
homeDirectory = "/home/michael";
username = "michael";
stateVersion = "21.05";
configuration = { config, pkgs, ... }:
{
nixpkgs.config = {
allowUnfree = true;
};
imports = [
./user/environments/nixos/home.nix
];
};
};
wsl = inputs.home-manager.lib.homeManagerConfiguration {
system = "x86_64-linux";
homeDirectory = "/home/michael";
username = "michael";
stateVersion = "21.05";
configuration = { config, pkgs, ... }:
{
nixpkgs.config = {
allowUnfree = true;
};
imports = [
./user/environments/wsl/home.nix
];
};
};
}; };
}; };
} }

View File

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
../../modules/home-manager.nix
../../modules/dev.nix ../../modules/dev.nix
../../modules/fonts.nix ../../modules/fonts.nix
../../modules/git.nix ../../modules/git.nix
@ -13,9 +12,6 @@
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
neofetch
fortune
google-chrome
firefox firefox
]; ];

View File

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
../../modules/home-manager.nix
../../modules/git.nix ../../modules/git.nix
../../modules/zsh.nix ../../modules/zsh.nix
]; ];

View File

@ -1,3 +0,0 @@
{
allowUnfree = true;
}

View File

@ -1,20 +0,0 @@
{ config, pkgs, ... }:
{
imports = [
../../modules/home-manager.nix
../../modules/fonts.nix
../../modules/git.nix
../../modules/git_nixos.nix
../../modules/gnome.nix
../../modules/dev.nix
../../modules/vscode.nix
../../modules/zsh.nix
];
home.packages = with pkgs; [
neofetch
fortune
];
}