diff --git a/flake.lock b/flake.lock index 153c0742..a0262980 100644 --- a/flake.lock +++ b/flake.lock @@ -277,6 +277,23 @@ "type": "github" } }, + "freetype2": { + "flake": false, + "locked": { + "lastModified": 1687587065, + "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + }, + "original": { + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -299,6 +316,23 @@ "type": "github" } }, + "harfbuzz": { + "flake": false, + "locked": { + "lastModified": 1711722720, + "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", + "owner": "harfbuzz", + "repo": "harfbuzz", + "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", + "type": "github" + }, + "original": { + "owner": "harfbuzz", + "ref": "8.4.0", + "repo": "harfbuzz", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -374,6 +408,23 @@ "type": "github" } }, + "libpng": { + "flake": false, + "locked": { + "lastModified": 1549245649, + "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + }, + "original": { + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + } + }, "minecraft": { "inputs": { "flake-compat": [ @@ -578,6 +629,7 @@ "systems": "systems", "tree": "tree", "utils": "utils", + "wezterm": "wezterm", "wsl": "wsl" } }, @@ -606,6 +658,27 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "wezterm", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726280639, + "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e9f8641c92f26fd1e076e705edb12147c384171d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "scalpel": { "inputs": { "flake-utils": [ @@ -752,6 +825,37 @@ "type": "github" } }, + "wezterm": { + "inputs": { + "flake-utils": [ + "utils" + ], + "freetype2": "freetype2", + "harfbuzz": "harfbuzz", + "libpng": "libpng", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2", + "zlib": "zlib" + }, + "locked": { + "dir": "nix", + "lastModified": 1729006311, + "narHash": "sha256-1xtKJHu6CFnOhp4snof+WSTwcdPgwIaD6mBODP/cv3w=", + "owner": "wez", + "repo": "wezterm", + "rev": "9ddca7bde92090792dbcdc65c1e9897c362196d7", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "wez", + "ref": "main", + "repo": "wezterm", + "type": "github" + } + }, "wsl": { "inputs": { "flake-compat": [ @@ -777,6 +881,23 @@ "repo": "NixOS-WSL", "type": "github" } + }, + "zlib": { + "flake": false, + "locked": { + "lastModified": 1484501380, + "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", + "owner": "madler", + "repo": "zlib", + "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", + "type": "github" + }, + "original": { + "owner": "madler", + "ref": "v1.2.11", + "repo": "zlib", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 998bf625..65df3465 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,13 @@ flake-compat.follows = "flake-compat"; }; }; + wezterm = { + url = "github:wez/wezterm/main?dir=nix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "utils"; + }; + }; ci = { url = "github:arcnmx/ci/v0.7"; flake = false; diff --git a/home/profiles/common/base16.nix b/home/profiles/common/base16.nix index 650d1025..f78e9259 100644 --- a/home/profiles/common/base16.nix +++ b/home/profiles/common/base16.nix @@ -22,6 +22,6 @@ in { ansi.palette.background.alpha = "ee00"; }; }; - defaultSchemeName = "dark"; + defaultSchemeName = "light"; }; } diff --git a/home/profiles/graphical/wezterm.nix b/home/profiles/graphical/wezterm.nix index 7dc84b61..2d906114 100644 --- a/home/profiles/graphical/wezterm.nix +++ b/home/profiles/graphical/wezterm.nix @@ -1,6 +1,7 @@ -_: { +{ inputs, pkgs, ... }: { programs.wezterm = { enable = true; + package = inputs.wezterm.outputs.packages.${pkgs.system}.default; extraConfig = '' local wezterm = require 'wezterm'; return { diff --git a/wrappers/exports.nix b/wrappers/exports.nix index cb225874..f738cd74 100644 --- a/wrappers/exports.nix +++ b/wrappers/exports.nix @@ -4,7 +4,7 @@ ... }: let inherit (inputs.std.lib) string list set; - systems = inputs.self.systems; + inherit (inputs.self) systems; enabledNixosSystems = set.filter (_: system: system.config.ci.enable && system.config.type == "NixOS") systems; in { exports = '' @@ -18,4 +18,4 @@ in { NF_NIX_SYSTEMS=(${toSystems enabledNixosSystems}) NF_NIX_SYSTEMS_WARN=(${toSystems warnSystems}) ''; -} \ No newline at end of file +}