mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flake cleanup

Browse Source
This commit is contained in:
mjallen18
2024-06-06 13:14:54 -05:00
parent 747dfbf65b
commit 466906c575
2 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
flake.lock generated
View File

@@ -452,7 +452,7 @@
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
"nixpkgs-unstable"
]
},
"locked": {
@@ -539,7 +539,7 @@
"flake-parts": "flake-parts",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
"nixpkgs-unstable"
],
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay_2"
@@ -908,22 +908,6 @@
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"parts": {
"inputs": {
"nixpkgs-lib": [
@@ -1068,7 +1052,6 @@
"nix-inspect": "nix-inspect",
"nixos-apple-silicon": "nixos-apple-silicon",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable_3",
"nixpkgs-unstable": "nixpkgs-unstable"
}

52
flake.nix
View File

@@ -2,39 +2,48 @@
description = "flake for matt-nixos";
inputs = {
# Common
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
# nixpgs
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
# Nix Inspect
nix-inspect.url = "github:bluskript/nix-inspect";
# Desktop
nix-flatpak.url = "github:gmodena/nix-flatpak";
impermanence.url = "github:nix-community/impermanence";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.3.0";
inputs.nixpkgs.follows = "nixpkgs";
};
# Chaotic-nix
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
# Flatpak
nix-flatpak.url = "github:gmodena/nix-flatpak";
# Impermenance
impermanence.url = "github:nix-community/impermanence";
# Home Manager
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager-stable.url = "github:nix-community/home-manager/release-24.05";
home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable";
nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
# Lanzaboote
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.3.0";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# Nix hardware
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
#Apple
nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
nix-darwin.url = "github:LnL7/nix-darwin";
# Pi4
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
};
outputs =
{
self,
nixpkgs,
nixpkgs-unstable,
nixpkgs-stable,
chaotic,
lanzaboote,
@@ -46,7 +55,6 @@
nixos-apple-silicon,
home-manager-stable,
nix-inspect,
nixpkgs-unstable,
}@inputs:
let
inherit (self) outputs;
@@ -56,7 +64,7 @@
nixosConfigurations = {
# Desktop
"matt-nixos" = nixpkgs.lib.nixosSystem {
"matt-nixos" = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit inputs outputs;
@@ -100,7 +108,7 @@
};
# mac nix
"mac-nixos" = nixpkgs.lib.nixosSystem {
"mac-nixos" = nixpkgs-unstable.lib.nixosSystem {
system = "aarch64-linux";
modules = [
nixos-apple-silicon.nixosModules.apple-silicon-support
@@ -115,7 +123,7 @@
};
# Pi4
"nixos-pi4" = nixpkgs.lib.nixosSystem {
"nixos-pi4" = nixpkgs-unstable.lib.nixosSystem {
system = "aarch64-linux";
modules = [
nixos-hardware.nixosModules.raspberry-pi-4