removed zig and formatted
This commit is contained in:
parent
9e10776439
commit
4f064d5451
70
flake.lock
70
flake.lock
@ -32,22 +32,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
@ -81,21 +65,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -255,22 +224,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1689088367,
|
||||
"narHash": "sha256-Y2tl2TlKCWEHrOeM9ivjCLlRAKH3qoPUE/emhZECU14=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5c9ddb86679c400d6b7360797b8a22167c2053f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1694975080,
|
||||
@ -323,8 +276,7 @@
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nur": "nur",
|
||||
"vscode-extensions": "vscode-extensions",
|
||||
"wallpaper": "wallpaper",
|
||||
"zig": "zig"
|
||||
"wallpaper": "wallpaper"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
@ -381,26 +333,6 @@
|
||||
"repo": "nix-wallpaper",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"zig": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1694952442,
|
||||
"narHash": "sha256-9CblLz91gHuz5NTrZcW/Q53wT0i1N3Px5xKjpJGmm/k=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "2689ccaadb1737efa23398844efef1fc73ad7fa4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
75
flake.nix
75
flake.nix
@ -14,9 +14,6 @@
|
||||
# Nix User Repository
|
||||
nur.url = "github:nix-community/NUR";
|
||||
|
||||
# Zig
|
||||
zig.url = "github:mitchellh/zig-overlay";
|
||||
|
||||
# Wallpaper
|
||||
wallpaper.url = "github:lunik1/nix-wallpaper";
|
||||
|
||||
@ -37,7 +34,6 @@
|
||||
nixpkgs-master,
|
||||
home-manager,
|
||||
nur,
|
||||
zig,
|
||||
wallpaper,
|
||||
nix-index-database,
|
||||
vscode-extensions,
|
||||
@ -47,43 +43,42 @@
|
||||
in {
|
||||
formatter.${system} = pkgs.alejandra;
|
||||
|
||||
commonModules = [
|
||||
./systems/common
|
||||
{
|
||||
_module.args.wallpaper = wallpaper.packages.${system}.default;
|
||||
_module.args.vscode-extensions = vscode-extensions.extensions.${system};
|
||||
}
|
||||
homeConfigurations = let
|
||||
commonModules = [
|
||||
./systems/common
|
||||
{
|
||||
_module.args.wallpaper = wallpaper.packages.${system}.default;
|
||||
_module.args.vscode-extensions = vscode-extensions.extensions.${system};
|
||||
}
|
||||
|
||||
nur.nixosModules.nur
|
||||
nur.nixosModules.nur
|
||||
|
||||
nix-index-database.hmModules.nix-index
|
||||
{
|
||||
programs.nix-index-database.comma.enable = true;
|
||||
}
|
||||
nix-index-database.hmModules.nix-index
|
||||
{
|
||||
programs.nix-index-database.comma.enable = true;
|
||||
}
|
||||
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
zig.overlays.default # Add zig
|
||||
( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100
|
||||
final: prev: {
|
||||
unstable = import nixpkgs-unstable {
|
||||
system = final.system;
|
||||
config.allowUnfreePredicate = _: true;
|
||||
};
|
||||
master = import nixpkgs-master {
|
||||
system = final.system;
|
||||
config.allowUnfreePredicate = _: true;
|
||||
};
|
||||
}
|
||||
)
|
||||
( # Overrides davinci-resolve with the unstable version because of https://github.com/NixOS/nixpkgs/pull/246074
|
||||
final: prev: {davinci-resolve = final.master.davinci-resolve;}
|
||||
)
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
homeConfigurations = {
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100
|
||||
final: prev: {
|
||||
unstable = import nixpkgs-unstable {
|
||||
system = final.system;
|
||||
config.allowUnfreePredicate = _: true;
|
||||
};
|
||||
master = import nixpkgs-master {
|
||||
system = final.system;
|
||||
config.allowUnfreePredicate = _: true;
|
||||
};
|
||||
}
|
||||
)
|
||||
( # Overrides davinci-resolve with the unstable version because of https://github.com/NixOS/nixpkgs/pull/246074
|
||||
final: prev: {davinci-resolve = final.master.davinci-resolve;}
|
||||
)
|
||||
];
|
||||
}
|
||||
];
|
||||
in {
|
||||
pc = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
@ -91,7 +86,7 @@
|
||||
[
|
||||
./systems/pc
|
||||
]
|
||||
++ self.commonModules;
|
||||
++ commonModules;
|
||||
};
|
||||
|
||||
laptop = home-manager.lib.homeManagerConfiguration {
|
||||
@ -101,7 +96,7 @@
|
||||
[
|
||||
./systems/laptop
|
||||
]
|
||||
++ self.commonModules;
|
||||
++ commonModules;
|
||||
};
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user