terraform is unfree now

yuanw · Oct 13, 2023 · a3c9d77 · a3c9d77
1 parent e06d7c3
commit a3c9d77
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/flake.nix b/flake.nix
@@ -59,20 +59,21 @@
         inputs.treefmt-nix.flakeModule
         inputs.haskell-flake.flakeModule
       ];
-      perSystem = { ... }: {
-        # _module.args.pkgs = import inputs.nixpkgs {
-        #   inherit system;
-        #   overlays = [
-        #     (_final: _prev: {
-        #       # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634
-        #       mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else
-        #       inputs.nixpkgs.legacyPackages.${_prev.system}.mesa;
-        #     })
-        #   ];
-        #   config = {
-        #     allowUnsupportedSystem = true;
-        #   };
-        # };
+      perSystem = { system, ... }: {
+        _module.args.pkgs = import inputs.nixpkgs {
+          inherit system;
+          # overlays = [
+          #   (_final: _prev: {
+          #     # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634
+          #     mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else
+          #     inputs.nixpkgs.legacyPackages.${_prev.system}.mesa;
+          #   })
+          # ];
+          config = {
+            allowUnfree = true;
+            # allowUnsupportedSystem = true;
+          };
+        };
         haskellProjects.default = {
           projectRoot = ./packages;
           settings = { };

diff --git a/modules/home.nix b/modules/home.nix
@@ -28,13 +28,16 @@
       enable = true;
       themes =
         {
-          dracula = builtins.readFile (pkgs.fetchFromGitHub
-            {
-              owner = "dracula";
-              repo = "sublime"; # Bat uses sublime syntax for its themes
-              rev = "26c57ec282abcaa76e57e055f38432bd827ac34e";
-              sha256 = "019hfl4zbn4vm4154hh3bwk6hm7bdxbr1hdww83nabxwjn99ndhv";
-            } + "/Dracula.tmTheme");
+          dracula = {
+            src = pkgs.fetchFromGitHub
+              {
+                owner = "dracula";
+                repo = "sublime"; # Bat uses sublime syntax for its themes
+                rev = "26c57ec282abcaa76e57e055f38432bd827ac34e";
+                sha256 = "019hfl4zbn4vm4154hh3bwk6hm7bdxbr1hdww83nabxwjn99ndhv";
+              };
+            file = "/Dracula.tmTheme";
+          };
         };
       extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
     };