darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

fix everything

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-03-27 14:59:16 +01:00
parent 20f32e30ba
commit bcc54b6158
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
6 changed files with 68 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-all.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
nix flake update
#nix flake update
nixos-rebuild build --flake '.#nutty-noon' -j16
nixos-rebuild build --flake '.#nixos-8gb-fsn1-1' -j16
nixos-rebuild build --flake '.#thinkrac' -j16

88
config/programs/vscode.nix
View file

@ -15,48 +15,50 @@
ritwickdey.liveserver
vadimcn.vscode-lldb
yzhang.markdown-all-in-one
]) ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [{
name = "rust-doc-viewer";
publisher = "jscearcy";
version = "2.0.1";
sha256 = "sha256-bVWM3RlcXY0+fACKrOtq63dHo0neyaw/TuhUxwCxeYs=";
}
{
name = "cargo";
publisher = "panicbit";
version = "0.2.3";
sha256 = "sha256-B0oLZE8wtygTaUX9/qOBg9lJAjUUg2i7B2rfSWJerEU=";
}
{
name = "vscode-rust-test-adapter";
publisher = "swellaby";
version = "0.11.0";
sha256 = "sha256-IgfcIRF54JXm9l2vVjf7lFJOVSI0CDgDjQT+Hw6FO4Q=";
}
{
name = "discord-vscode";
publisher = "icrawl";
version = "5.8.0";
sha256 = "sha256-IU/looiu6tluAp8u6MeSNCd7B8SSMZ6CEZ64mMsTNmU=";
}
{
name = "vscode-test-explorer";
publisher = "hbenl";
version = "2.21.2";
sha256 = "sha256-fHyePd8fYPt7zPHBGiVmd8fRx+IM3/cSBCyiI/C0VAg=";
}
{
name = "test-adapter-converter";
publisher = "ms-vscode";
version = "0.1.5";
sha256 = "sha256-nli4WJ96lL3JssNuwLCsthvphI7saFT2ktWQ46VNooc=";
}
{
name = "material-icon-theme";
publisher = "PKief";
version = "4.14.1";
sha256 = "sha256-OHXi0EfeyKMeFiMU5yg0aDoWds4ED0lb+l6T12XZ3LQ=";
}];
]) ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
name = "rust-doc-viewer";
publisher = "jscearcy";
version = "2.0.1";
sha256 = "sha256-bVWM3RlcXY0+fACKrOtq63dHo0neyaw/TuhUxwCxeYs=";
}
{
name = "cargo";
publisher = "panicbit";
version = "0.2.3";
sha256 = "sha256-B0oLZE8wtygTaUX9/qOBg9lJAjUUg2i7B2rfSWJerEU=";
}
{
name = "vscode-rust-test-adapter";
publisher = "swellaby";
version = "0.11.0";
sha256 = "sha256-IgfcIRF54JXm9l2vVjf7lFJOVSI0CDgDjQT+Hw6FO4Q=";
}
{
name = "discord-vscode";
publisher = "icrawl";
version = "5.8.0";
sha256 = "sha256-IU/looiu6tluAp8u6MeSNCd7B8SSMZ6CEZ64mMsTNmU=";
}
{
name = "vscode-test-explorer";
publisher = "hbenl";
version = "2.21.1";
sha256 = "sha256-fHyePd8fYPt7zPHBGiVmd8fRx+IM3/cSBCyiI/C0VAg=";
}
{
name = "test-adapter-converter";
publisher = "ms-vscode";
version = "0.1.5";
sha256 = "sha256-nli4WJ96lL3JssNuwLCsthvphI7saFT2ktWQ46VNooc=";
}
{
name = "material-icon-theme";
publisher = "PKief";
version = "4.14.1";
sha256 = "sha256-OHXi0EfeyKMeFiMU5yg0aDoWds4ED0lb+l6T12XZ3LQ=";
}
];
userSettings = {
"crates.listPreReleases" = true;
"diffEditor.codeLens" = true;
@ -86,7 +88,7 @@
"git.autoStash" = true;
"git.enableCommitSigning" = true;
"git.enableSmartCommit" = true;
"git.fetchOnPull"= true;
"git.fetchOnPull" = true;
"git.rebaseWhenSync" = true;
"nix.enableLanguageServer" = true;
"nix.serverPath" = "${pkgs.rnix-lsp}/bin/rnix-lsp";

3
config/workarounds/default.nix
View file

@ -1,4 +1,4 @@
{ system, pkgs, nixpkgs, hydra, ... }: with pkgs;
{ nixpkgs-kicad, system, pkgs, nixpkgs, hydra, ... }: with pkgs;
let
n-kicad = import nixpkgs-kicad { inherit system; };
hydra-pkg = hydra.defaultPackage.${system};
@ -66,6 +66,7 @@ in
{
nixpkgs.overlays = [
(self: prev: {
sane-backends = n-kicad.sane-backends;
hydra-unstable = hydra-pkg.overrideAttrs (old: {
postPatch = ''
sed -i 's/totalNarSize > maxOutputSize/false/g' src/hydra-queue-runner/build-remote.cc

17
flake.lock
View file

@ -468,6 +468,22 @@
"type": "github"
}
},
"nixpkgs-kicad": {
"locked": {
"lastModified": 1648031101,
"narHash": "sha256-CHNIOo6b9xmJH1DcqyvGCU+aJwusVgVl9yj7AtncdNg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f4998c542d68a8a6e3d345d5c106e5915f430a16",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f4998c542d68a8a6e3d345d5c106e5915f430a16",
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1637453606,
@ -674,6 +690,7 @@
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_7",
"nixpkgs-hydra": "nixpkgs-hydra",
"nixpkgs-kicad": "nixpkgs-kicad",
"nur": "nur",
"polymc": "polymc",
"rust-binaries": "rust-binaries",

1
flake.nix
View file

@ -25,6 +25,7 @@ rec {
nixos-hardware.url = github:NixOS/nixos-hardware;
miifox-net.url = "git+https://git.chir.rs/CarolineHusky/MiiFox.net";
miifox-net.flake = false;
nixpkgs-kicad.url = github:NixOS/nixpkgs/f4998c542d68a8a6e3d345d5c106e5915f430a16;
};
outputs = { self, nixpkgs, sops-nix, home-manager, chir-rs, nur, nix-gaming, polymc, ... } @ args:

4
packages/minecraft/luckperms.nix
View file

@ -18,7 +18,7 @@ let
owner = "LuckPerms";
repo = "LuckPerms";
rev = "138f2c1b3e2ec7711614f79b0b920c8c58e673a1";
sha256 = "0w3qzbn0mik8rg1hdb23r6zpflnmbrk43i4w0k3cpbh8dd1wdvm2";
sha256 = "sha256-Gs3MuIxd3ODe2qRHK9MJhAxD5BSQQG8+HNLzMCRnmws=";
leaveDotGit = true;
};
@ -67,7 +67,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-Gs3MuIxd3ODe2qRHK9MJhAxD5BSQQG8+HNLzMCRnmws=";
outputHash = "sha256-vV3sJ5GoKJwjeWJ7LGX6Dkzr0glLZjgBWzWEn2eGW1s=";
};
in