removed zig and formatted

This commit is contained in:
Kristian Krsnik 2023-09-30 16:16:07 +02:00
parent 9e10776439
commit 4f064d5451
Signed by: Kristian
GPG Key ID: FD1330AC9F909E85
2 changed files with 36 additions and 109 deletions

View File

@ -32,22 +32,6 @@
"type": "github" "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": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -81,21 +65,6 @@
"type": "github" "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": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -255,22 +224,6 @@
"type": "github" "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": { "nur": {
"locked": { "locked": {
"lastModified": 1694975080, "lastModified": 1694975080,
@ -323,8 +276,7 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"vscode-extensions": "vscode-extensions", "vscode-extensions": "vscode-extensions",
"wallpaper": "wallpaper", "wallpaper": "wallpaper"
"zig": "zig"
} }
}, },
"systems": { "systems": {
@ -381,26 +333,6 @@
"repo": "nix-wallpaper", "repo": "nix-wallpaper",
"type": "github" "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", "root": "root",

View File

@ -14,9 +14,6 @@
# Nix User Repository # Nix User Repository
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
# Zig
zig.url = "github:mitchellh/zig-overlay";
# Wallpaper # Wallpaper
wallpaper.url = "github:lunik1/nix-wallpaper"; wallpaper.url = "github:lunik1/nix-wallpaper";
@ -37,7 +34,6 @@
nixpkgs-master, nixpkgs-master,
home-manager, home-manager,
nur, nur,
zig,
wallpaper, wallpaper,
nix-index-database, nix-index-database,
vscode-extensions, vscode-extensions,
@ -47,6 +43,7 @@
in { in {
formatter.${system} = pkgs.alejandra; formatter.${system} = pkgs.alejandra;
homeConfigurations = let
commonModules = [ commonModules = [
./systems/common ./systems/common
{ {
@ -63,7 +60,6 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
zig.overlays.default # Add zig
( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100 ( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100
final: prev: { final: prev: {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
@ -82,8 +78,7 @@
]; ];
} }
]; ];
in {
homeConfigurations = {
pc = home-manager.lib.homeManagerConfiguration { pc = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
@ -91,7 +86,7 @@
[ [
./systems/pc ./systems/pc
] ]
++ self.commonModules; ++ commonModules;
}; };
laptop = home-manager.lib.homeManagerConfiguration { laptop = home-manager.lib.homeManagerConfiguration {
@ -101,7 +96,7 @@
[ [
./systems/laptop ./systems/laptop
] ]
++ self.commonModules; ++ commonModules;
}; };
}; };