diff --git a/flake.lock b/flake.lock index 68387cb..44e879a 100644 --- a/flake.lock +++ b/flake.lock @@ -597,7 +597,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_12" + "systems": "systems_14" }, "locked": { "lastModified": 1710146030, @@ -613,41 +613,6 @@ "type": "github" } }, - "flake-utils_6": { - "inputs": { - "systems": "systems_15" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -724,23 +689,6 @@ "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" - } - }, "helix": { "inputs": { "crane": "crane_2", @@ -1085,7 +1033,7 @@ "xdg-portal-hyprland", "nixpkgs" ], - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1721324361, @@ -1366,23 +1314,6 @@ "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" - } - }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts_3", @@ -1652,22 +1583,6 @@ } }, "nixpkgs_18": { - "locked": { - "lastModified": 1721466660, - "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_19": { "locked": { "lastModified": 1722062969, "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", @@ -1683,13 +1598,13 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_19": { "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "lastModified": 1722415718, + "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", "type": "github" }, "original": { @@ -1699,13 +1614,13 @@ "type": "github" } }, - "nixpkgs_20": { + "nixpkgs_2": { "locked": { - "lastModified": 1722415718, - "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "type": "github" }, "original": { @@ -1908,7 +1823,6 @@ "pre-commit-hooks": "pre-commit-hooks_2", "sops-nix": "sops-nix", "stylix": "stylix", - "wezterm": "wezterm", "xdg-portal-hyprland": "xdg-portal-hyprland", "yazi": "yazi" } @@ -1995,27 +1909,6 @@ } }, "rust-overlay_3": { - "inputs": { - "nixpkgs": [ - "wezterm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721441897, - "narHash": "sha256-gYGX9/22tPNeF7dR6bWN5rsrpU4d06GnQNNgZ6ZiXz0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b7996075da11a2d441cfbf4e77c2939ce51506fd", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { "inputs": { "nixpkgs": [ "yazi", @@ -2133,16 +2026,16 @@ }, "systems_12": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -2162,21 +2055,6 @@ } }, "systems_14": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_15": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2354,39 +2232,12 @@ "type": "github" } }, - "wezterm": { - "inputs": { - "flake-utils": "flake-utils_5", - "freetype2": "freetype2", - "harfbuzz": "harfbuzz", - "libpng": "libpng", - "nixpkgs": "nixpkgs_18", - "rust-overlay": "rust-overlay_3", - "zlib": "zlib" - }, - "locked": { - "dir": "nix", - "lastModified": 1722914277, - "narHash": "sha256-P7XWuTTj6VXxKTekAjC2ZF+fLZjNH/CsWb9CHLXakIs=", - "owner": "notohh", - "repo": "wezterm", - "rev": "e7ac13d03dc14967e705f7e2a5f1e3ce48759a68", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "notohh", - "ref": "nix-add-overlay", - "repo": "wezterm", - "type": "github" - } - }, "xdg-portal-hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", "hyprlang": "hyprlang_5", - "nixpkgs": "nixpkgs_19", - "systems": "systems_14" + "nixpkgs": "nixpkgs_18", + "systems": "systems_13" }, "locked": { "lastModified": 1722365976, @@ -2434,9 +2285,9 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_20", - "rust-overlay": "rust-overlay_4" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_19", + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1723368652, @@ -2451,23 +2302,6 @@ "repo": "yazi", "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 aa937e1..c1aedbd 100755 --- a/flake.nix +++ b/flake.nix @@ -80,7 +80,7 @@ stylix.url = "github:danth/stylix"; eww.url = "github:elkowar/eww"; anyrun.url = "github:Kirottu/anyrun"; - wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay"; + # wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay"; deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/programs/terminal/wezterm/config.lua b/home/programs/terminal/wezterm/config.lua index 13aef61..21b8aa6 100644 --- a/home/programs/terminal/wezterm/config.lua +++ b/home/programs/terminal/wezterm/config.lua @@ -10,7 +10,7 @@ local config = { }, color_scheme = "Tokyo Night", - enable_wayland = true, + enable_wayland = false, font = wezterm.font_with_fallback({ "JetBrainsMono NF Medium", "Comic Code Ligatures Medium" }), font_size = 12.0, window_background_opacity = 0.6, diff --git a/modules/nix.nix b/modules/nix.nix index 4db98eb..1aaf08b 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -10,7 +10,7 @@ inputs.hyprpicker.overlays.default inputs.atuin.overlays.default inputs.eww.overlays.default - inputs.wezterm.overlays.default + # inputs.wezterm.overlays.default ]; config = { allowUnfree = true;