From bcc54b6158901a590b2eb31c16f15f90a19b71b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Sun, 27 Mar 2022 14:59:16 +0100
Subject: [PATCH] fix everything

---
 build-all.sh                     |  2 +-
 config/programs/vscode.nix       | 88 ++++++++++++++++----------------
 config/workarounds/default.nix   |  3 +-
 flake.lock                       | 17 ++++++
 flake.nix                        |  1 +
 packages/minecraft/luckperms.nix |  4 +-
 6 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/build-all.sh b/build-all.sh
index 71f60071..c41eeec9 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -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
diff --git a/config/programs/vscode.nix b/config/programs/vscode.nix
index 9ddec254..79efac47 100644
--- a/config/programs/vscode.nix
+++ b/config/programs/vscode.nix
@@ -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";
diff --git a/config/workarounds/default.nix b/config/workarounds/default.nix
index 00646053..24a28972 100644
--- a/config/workarounds/default.nix
+++ b/config/workarounds/default.nix
@@ -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
diff --git a/flake.lock b/flake.lock
index fccd8eae..6975e144 100644
--- a/flake.lock
+++ b/flake.lock
@@ -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",
diff --git a/flake.nix b/flake.nix
index 16f58c4b..89ba64bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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:
diff --git a/packages/minecraft/luckperms.nix b/packages/minecraft/luckperms.nix
index c34c6657..50f485ef 100644
--- a/packages/minecraft/luckperms.nix
+++ b/packages/minecraft/luckperms.nix
@@ -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