switched to unstable and refactored

This commit is contained in:
willifan 2024-10-04 21:07:31 +02:00
parent 63cfb1c741
commit c8a3355599
12 changed files with 167 additions and 146 deletions

View file

@ -4,13 +4,13 @@
inputs = {
# NixOS official package source, using the nixos-23.11 branch here
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware";
# Declarative dotfile management
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -20,16 +20,16 @@
inputs.nixpkgs.follows = "nixpkgs";
};
stylix.url = "github:danth/stylix/release-24.05";
stylix.url = "github:danth/stylix";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
zen = {
url = "github:MarceColl/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
# # Secrets management. See ./docs/secretsmgmt.md
@ -40,11 +40,11 @@
};
outputs = { nixpkgs, nixpkgs-unstable, stylix, nixvim, ... }@attrs:
outputs = { nixpkgs, nixpkgs-stable, ... }@attrs:
let
lib = nixpkgs.lib;
pkgs = import nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; };
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config = { allowUnfree = true; }; };
pkgs-stable = import nixpkgs-stable { system = "x86_64-linux"; config = { allowUnfree = true; }; };
in
{
nixosConfigurations = {
@ -58,7 +58,7 @@
hostname = "Lenni";
type = "desktop";
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-stable;
inherit attrs;
inherit system;
};
@ -70,8 +70,8 @@
home-manager.useUserPackages = true;
}
attrs.disko.nixosModules.disko
stylix.nixosModules.stylix
nixvim.nixosModules.nixvim
attrs.stylix.nixosModules.stylix
attrs.nixvim.nixosModules.nixvim
attrs.nixos-hardware.nixosModules.framework-12th-gen-intel
./hosts
./users/willifan
@ -88,7 +88,7 @@
hostname = "Puenktchen";
type = "desktop";
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-stable;
inherit system;
};
@ -99,8 +99,8 @@
home-manager.useUserPackages = true;
}
attrs.disko.nixosModules.disko
stylix.nixosModules.stylix
nixvim.nixosModules.nixvim
attrs.stylix.nixosModules.stylix
attrs.nixvim.nixosModules.nixvim
attrs.nixos-hardware.nixosModules.common-cpu-amd
attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
@ -120,7 +120,7 @@
hostname = "Anton";
type = "server";
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-stable;
inherit system;
};
@ -131,8 +131,8 @@
home-manager.useUserPackages = true;
}
attrs.disko.nixosModules.disko
stylix.nixosModules.stylix
nixvim.nixosModules.nixvim
attrs.stylix.nixosModules.stylix
attrs.nixvim.nixosModules.nixvim
attrs.nixos-hardware.nixosModules.common-cpu-amd
attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower