Merge branch 'experimenting'

reformatted flake and change home.stateVersion
This commit is contained in:
Aria Nolan 2023-12-21 00:28:43 -05:00
commit e2637dcb5c
2 changed files with 19 additions and 17 deletions

View file

@ -41,6 +41,17 @@
overlays = [
nur.overlay
];
home-manager-config = toplevel: [
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.users.tacocat = {
imports = [toplevel];
_module.args.theme = import ./modules/themes;
};
}
];
in {
# desktop
nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem {
@ -59,22 +70,13 @@
nixosConfigurations."JWST" = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
modules = [
modules =
[
./hosts/JWST/configuration.nix
nixos-hardware.nixosModules.dell-xps-15-9520
{nixpkgs.overlays = overlays;}
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.users."tacocat" = {
imports = [
./users/tacocat/home.nix
];
_module.args.theme = import ./modules/themes;
};
}
];
]
++ home-manager-config ./users/tacocat/home.nix;
};
formatter.${system} = pkgs.alejandra;

View file

@ -2,7 +2,7 @@
home = {
username = "tacocat";
homeDirectory = "/home/tacocat";
stateVersion = "23.11";
stateVersion = "24.05";
sessionVariables = {
EDITOR = "hx";
BAT_THEME = "ansi";