Add wezterm flake and move experimental features under extra

arunoruto · Dec 10, 2024 · 4226885 · 4226885
1 parent 5e5f2a6
commit 4226885
Show file tree

Hide file tree

Showing 5 changed files with 200 additions and 17 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -45,10 +45,8 @@
     #     home-manager.follows = "home-manager";
     #   };
     # };
-    helix = {
-      url = "github:helix-editor/helix";
-      # inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
+    helix.url = "github:helix-editor/helix";
+    wezterm.url = "github:wez/wezterm?dir=nix";
     # nixvim-flake.url = "github:arunoruto/nvim.nix";
     # Styling
     stylix = {
@@ -201,4 +199,13 @@
       # devShells.${system} = import ./shells nixpkgs.legacyPackages.${system};
       # packages.${system} = import ./pkgs nixpkgs.legacyPackages.${system};
     };
+
+  # nixConfig = {
+  #   extra-substituters = [
+  #     "https://wezterm.cachix.org"
+  #   ];
+  #   extra-trusted-public-keys = [
+  #     "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
+  #   ];
+  # };
 }
diff --git a/modules/home-manager/pc/terminal/wezterm.nix b/modules/home-manager/pc/terminal/wezterm.nix
@@ -1,6 +1,8 @@
 {
   config,
   lib,
+  pkgs,
+  inputs,
   ...
 }:
 {
@@ -9,6 +11,7 @@
   config = lib.mkIf config.terminals.wezterm.enable {
     programs.wezterm = {
       enable = true;
+      package = inputs.wezterm.packages.${pkgs.system}.default;
       enableZshIntegration = config.programs.zsh.enable;
       extraConfig = ''
         local wezterm = require 'wezterm'

diff --git a/modules/home-manager/server/nix-utils.nix b/modules/home-manager/server/nix-utils.nix
@@ -54,15 +54,19 @@ in
     nix = {
       package = lib.mkForce pkgs.unstable.nix;
       settings = {
-        experimental-features = [
+        extra-experimental-features = [
           "nix-command"
           "flakes"
-        ];
-        extra-experimental-features = [
           "pipe-operators"
         ];
-        extra-substituters = [ "https://helix.cachix.org" ];
-        extra-trusted-public-keys = [ "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" ];
+        extra-substituters = [
+          "https://helix.cachix.org"
+          "https://wezterm.cachix.org"
+        ];
+        extra-trusted-public-keys = [
+          "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
+          "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
+        ];
       };
       extraOptions = ''
         trusted-users = root ${user}

diff --git a/modules/nixos/system/nix-utils.nix b/modules/nixos/system/nix-utils.nix
@@ -22,19 +22,23 @@
     nix = {
       # package = pkgs.unstable.nix;
       settings = {
-        # build in a sandbox
         sandbox = true;
         # auto-optimise-store = true;
-        experimental-features = [
+        warn-dirty = false;
+        accept-flake-config = true;
+        extra-experimental-features = [
           "nix-command"
           "flakes"
-        ];
-        extra-experimental-features = [
           "pipe-operators"
         ];
-        warn-dirty = false;
-        extra-substituters = [ "https://helix.cachix.org" ];
-        extra-trusted-public-keys = [ "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" ];
+        extra-substituters = [
+          "https://helix.cachix.org"
+          "https://wezterm.cachix.org"
+        ];
+        extra-trusted-public-keys = [
+          "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
+          "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
+        ];
       };
       extraOptions = ''
         trusted-users = root ${username}