From 3ce12900b8117a42cbf860831f70b50004abeb59 Mon Sep 17 00:00:00 2001 From: zack Date: Sat, 2 Aug 2025 16:20:18 -0400 Subject: [PATCH] updar --- flake.lock | 319 +++++++++--------- flake.nix | 2 +- homes/x86_64-linux/zoey@earth/default.nix | 2 +- modules/home/apps/term/ghostty/default.nix | 4 +- modules/home/apps/term/kitty/default.nix | 2 + .../apps/tools/neovim/config/lazyvim.json | 15 +- .../neovim/config/lua/config/options.lua | 2 +- .../tools/neovim/config/lua/plugins/core.lua | 10 +- .../config/lua/plugins/extras/typescript.lua | 284 ++++++++++++++++ modules/home/apps/tools/starship/default.nix | 2 +- modules/home/apps/web/librewolf/default.nix | 141 ++------ patch.patch | 24 ++ systems/x86_64-linux/earth/default.nix | 19 +- 13 files changed, 517 insertions(+), 309 deletions(-) create mode 100644 modules/home/apps/tools/neovim/config/lua/plugins/extras/typescript.lua create mode 100644 patch.patch diff --git a/flake.lock b/flake.lock index c425ab5..570968f 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1753471400, - "narHash": "sha256-HFoF82El1cjuiz5se+SeawMwWseUUtYBimq3Iu6G2D0=", + "lastModified": 1753870263, + "narHash": "sha256-r+mj2TAN4dcTDzQIaPjbR4xEiVsVSJ3j4qo40EwosMA=", "owner": "catppuccin", "repo": "nix", - "rev": "bc6d2b7b57dd29389538f8c4465e408c07187404", + "rev": "2f0b779c531ac922a3f0e3f817ff4e794865873a", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1753636422, - "narHash": "sha256-ceRdWC7sUdO5moEz1ta/bmDMzv/0PP6bfiJRjsOmGwo=", + "lastModified": 1753959362, + "narHash": "sha256-Abmgty7Feh+yd6wi+pFblFGY+zTKXirrLAlHAnS19h8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b7298823fe92a8667fbeb73a03ef0d6a85e387c5", + "rev": "24b2a61431ecccfa4e16c976c967dd2f54f1c7d1", "type": "github" }, "original": { @@ -230,10 +230,7 @@ }, "crane_3": { "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1717535930, @@ -315,11 +312,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1753636057, - "narHash": "sha256-JvPCxlERHVuqXg+ekcTumbe8gCL4rB0vpHF/+G7Nwmc=", + "lastModified": 1753954492, + "narHash": "sha256-wG4VIjY5AeHeX1kC7bZbo62NQDUI6aYJhMV4J5lyYME=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "06e3e3be8aff792547dfd0825c7e5dc0c65bd4db", + "rev": "2dc863f0ba0b72414695f5bedabeeb4a1eef0c44", "type": "github" }, "original": { @@ -336,11 +333,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1753589020, - "narHash": "sha256-rFZWFBjYRXNli1rZvRLOJVKLznk3Fj/eHJJdcWB0zWE=", + "lastModified": 1753761817, + "narHash": "sha256-FE908x/ihUlr5yn1f+PTMyOjcwotGUodzn7Ej6zZf5U=", "owner": "rycee", "repo": "nur-expressions", - "rev": "2988587ae70864239861389dbd84efdbfa9fa2c5", + "rev": "b657cfddb78408e9b53b4a8aaeaac71fc7ea182e", "type": "gitlab" }, "original": { @@ -774,11 +771,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -883,11 +880,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1753557429, - "narHash": "sha256-gy/K5KBktVbzq4u6wx0YytOAxefmKrEbcnEMNdcl8JY=", + "lastModified": 1753893528, + "narHash": "sha256-5oc0by3pe2KqJDbbkQP5R5u5ybx4Fj/5Ff8eAZ4yG6s=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "18831374caf2617235717cf30705c89b657934bb", + "rev": "d4c825186e4b80c3d95db4e5ccf8b7dcfc671197", "type": "github" }, "original": { @@ -1084,11 +1081,11 @@ ] }, "locked": { - "lastModified": 1753470191, - "narHash": "sha256-hOUWU5L62G9sm8NxdiLWlLIJZz9H52VuFiDllHdwmVA=", + "lastModified": 1753943136, + "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1817d1c0e5eabe7dfdfe4caa46c94d9d8f3fdb6", + "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c", "type": "github" }, "original": { @@ -1104,11 +1101,11 @@ ] }, "locked": { - "lastModified": 1753617834, - "narHash": "sha256-WEVfKrdIdu5CpppJ0Va3vzP0DKlS+ZTLbBjugMO2Drg=", + "lastModified": 1753943136, + "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=", "owner": "nix-community", "repo": "home-manager", - "rev": "72cc1e3134a35005006f06640724319caa424737", + "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c", "type": "github" }, "original": { @@ -1237,11 +1234,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1753634783, - "narHash": "sha256-Rl/voNjvcQH6E1vi4wNt5AY6CWaYkqfnkpm9GxrqKGg=", + "lastModified": 1753971789, + "narHash": "sha256-agKfQh8ZbxDFGBhM7RaYw/mWREDVCYC/mXdWZoUZF2A=", "ref": "refs/heads/main", - "rev": "c63d0003a1e5155248695f19778f815a8ad34c67", - "revCount": 6317, + "rev": "a907ecd4ff736a3a09410532b405a437eb48033c", + "revCount": 6329, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1465,11 +1462,11 @@ ] }, "locked": { - "lastModified": 1752252310, - "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=", + "lastModified": 1753800567, + "narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82", + "rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7", "type": "github" }, "original": { @@ -1537,11 +1534,11 @@ ] }, "locked": { - "lastModified": 1753418232, - "narHash": "sha256-fMVYDv0/7v4qrbZmzfqkFeEpelME4bT5JQBfXL9zl/E=", + "lastModified": 1753938227, + "narHash": "sha256-KzjI9khMC2tOL5FClh3sHq8Gax1O5Rw0bH1hvJ3FU3E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ca1145d927d177194fec4b0bf47a4b7dd2ed613d", + "rev": "8d1f0004594e0eddc00159ad7666e669a6bcb711", "type": "github" }, "original": { @@ -1580,7 +1577,6 @@ "crane": "crane_3", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", - "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], @@ -1588,16 +1584,16 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.1", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -1605,7 +1601,7 @@ "lexical": { "inputs": { "flake-parts": "flake-parts_8", - "nixpkgs": "nixpkgs_26", + "nixpkgs": "nixpkgs_27", "systems": "systems_21" }, "locked": { @@ -1662,7 +1658,7 @@ "blobs": "blobs", "flake-compat": "flake-compat_4", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { @@ -1686,15 +1682,15 @@ "git-hooks": "git-hooks_2", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1753637925, - "narHash": "sha256-0a+a6cv95THQvQ5/Pqy2yKTbnZrvq0OkOY9Wdvr06/A=", + "lastModified": 1753958863, + "narHash": "sha256-wMBPL9P3EU4yh4LwZae2N6wTywHojAmWNZSG2dNBejk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "06556188ee8c7ddfbe7b39d652cf409d0f912705", + "rev": "e4f3f820bfaed3a742584476c0bcc3eab2a55929", "type": "github" }, "original": { @@ -1706,11 +1702,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1753559931, - "narHash": "sha256-QIsckK2f4A1PG8hF3TboXYWrYEv3DtVtz+tTFs9V00w=", + "lastModified": 1753840437, + "narHash": "sha256-ybxx34SL/q5VkY80rykPcDSuG2KGRvggC1TaCcAmqIA=", "owner": "neovim", "repo": "neovim", - "rev": "b4ba27c238ec342bcb01fa59ab1eaf6996a4c6ee", + "rev": "b79ff967ac91dce40f3598ea407c5ccaa2929250", "type": "github" }, "original": { @@ -1723,17 +1719,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_17", "nixpkgs-stable": "nixpkgs-stable_3", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753514742, - "narHash": "sha256-OP7hZTjnOLP3X6cWldPLcxQ4vvDYid6SlOf1mw+XRCg=", + "lastModified": 1753967426, + "narHash": "sha256-1cTLZw0moDEJ7jH9C9s0mZCaeSlaAPTBVGEAk5fg1hs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "af1af659e690b3e535d94c54a64700767bfc9544", + "rev": "40cac0b43a13fd7916cb4cd67d4a53343a647dba", "type": "github" }, "original": { @@ -1750,11 +1746,11 @@ "rust-overlay": "rust-overlay_5" }, "locked": { - "lastModified": 1752870529, - "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", + "lastModified": 1753963066, + "narHash": "sha256-2nwtYNA2K/CDX+EIVyIDyXAadN8zKD7gIiWfEErWEng=", "owner": "YaLTeR", "repo": "niri", - "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", + "rev": "e19e1f0f10fa4e294e62292608635877715232dd", "type": "github" }, "original": { @@ -1783,11 +1779,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752870529, - "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", + "lastModified": 1753963066, + "narHash": "sha256-2nwtYNA2K/CDX+EIVyIDyXAadN8zKD7gIiWfEErWEng=", "owner": "YaLTeR", "repo": "niri", - "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", + "rev": "e19e1f0f10fa4e294e62292608635877715232dd", "type": "github" }, "original": { @@ -1876,11 +1872,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { @@ -1892,11 +1888,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -2022,11 +2018,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { @@ -2098,6 +2094,22 @@ } }, "nixpkgs_14": { + "locked": { + "lastModified": 1753934836, + "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8679b16e11becd487b45d568358ddf9d5640d860", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_15": { "locked": { "lastModified": 1751792365, "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", @@ -2113,13 +2125,13 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { - "lastModified": 1753432016, - "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", + "lastModified": 1753844155, + "narHash": "sha256-w81jpZeM3AtYlTKIhT05p3IqvJRIHZPyp0Acgb6hXWc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6027c30c8e9810896b92429f0092f624f7b1aace", + "rev": "e44b8dc0882d66e2627a8ff252b04a22f4a629fd", "type": "github" }, "original": { @@ -2129,39 +2141,39 @@ "type": "github" } }, - "nixpkgs_16": { - "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_17": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", - "owner": "nixos", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_18": { + "locked": { + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { "locked": { "lastModified": 1702151865, "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", @@ -2177,22 +2189,6 @@ "type": "github" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1736189585, - "narHash": "sha256-GBC2LIBk9BuJR4HXfjuNlIWeY15U6jFvaqc7PeToGLw=", - "owner": "jorikvanveen", - "repo": "nixpkgs-posting", - "rev": "135109926a3f11510d6f340ea9c8880385a0438f", - "type": "github" - }, - "original": { - "owner": "jorikvanveen", - "ref": "135109926a3f11510d6f340ea9c8880385a0438f", - "repo": "nixpkgs-posting", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1712883908, @@ -2210,6 +2206,22 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1736189585, + "narHash": "sha256-GBC2LIBk9BuJR4HXfjuNlIWeY15U6jFvaqc7PeToGLw=", + "owner": "jorikvanveen", + "repo": "nixpkgs-posting", + "rev": "135109926a3f11510d6f340ea9c8880385a0438f", + "type": "github" + }, + "original": { + "owner": "jorikvanveen", + "ref": "135109926a3f11510d6f340ea9c8880385a0438f", + "repo": "nixpkgs-posting", + "type": "github" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1712883908, "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", @@ -2225,7 +2237,7 @@ "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -2241,7 +2253,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_23": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -2257,7 +2269,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_24": { "locked": { "lastModified": 1740547748, "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", @@ -2273,7 +2285,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_25": { "locked": { "lastModified": 1747542820, "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", @@ -2289,7 +2301,7 @@ "type": "github" } }, - "nixpkgs_25": { + "nixpkgs_26": { "locked": { "lastModified": 1752480373, "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", @@ -2305,7 +2317,7 @@ "type": "github" } }, - "nixpkgs_26": { + "nixpkgs_27": { "locked": { "lastModified": 1719931832, "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=", @@ -2353,11 +2365,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -2417,11 +2429,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -2453,7 +2465,7 @@ "pnpm2nix_2": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1706694632, @@ -2471,7 +2483,7 @@ }, "posting": { "inputs": { - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_20", "utils": "utils" }, "locked": { @@ -2575,7 +2587,7 @@ }, "resume": { "inputs": { - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_21", "systems": "systems_14" }, "locked": { @@ -2602,11 +2614,11 @@ "systems": "systems_15" }, "locked": { - "lastModified": 1753605791, - "narHash": "sha256-ZYhWptgNKUIkEsy1QPb+9OavmTA7BS0PSqmxuFmy+kc=", + "lastModified": 1753876761, + "narHash": "sha256-PPDugFuVnERsW4J3nRZRCeG2g6q6ut88W414thmkIHo=", "owner": "raphamorim", "repo": "rio", - "rev": "06f7f9afd38389095dcfd1325ba4e68d55ed5f84", + "rev": "51b845ebc010a88adcf0327a1d2165c2450ca97a", "type": "github" }, "original": { @@ -2642,7 +2654,7 @@ "nix-darwin": "nix-darwin", "nixos-generators": "nixos-generators", "nixos-stable": "nixos-stable", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_18", "pnpm2nix": "pnpm2nix_2", "posting": "posting", "quickshell": "quickshell", @@ -2670,11 +2682,11 @@ ] }, "locked": { - "lastModified": 1753497720, - "narHash": "sha256-yzZkDMVfPpNyTciQOfriWpRXrgGNT/cvrFAEQZ//SZs=", + "lastModified": 1753930086, + "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c8b8b812010515b7d9bd7e538f06a9f4edb373ff", + "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4", "type": "github" }, "original": { @@ -2721,10 +2733,7 @@ }, "rust-overlay_4": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], + "flake-utils": "flake-utils_4", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -2767,7 +2776,7 @@ }, "rust-overlay_6": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1753497720, @@ -2790,11 +2799,11 @@ ] }, "locked": { - "lastModified": 1753584741, - "narHash": "sha256-i147iFSy4K4PJvID+zoszLbRi2o+YV8AyG4TUiDQ3+I=", + "lastModified": 1753930086, + "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "69dfe029679e73b8d159011c9547f6148a85ca6b", + "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4", "type": "github" }, "original": { @@ -2874,7 +2883,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_22" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1752544651, @@ -3286,11 +3295,11 @@ ] }, "locked": { - "lastModified": 1753439394, - "narHash": "sha256-Bv9h1AJegLI8uAhiJ1sZ4XAndYxhgf38tMgCQwiEpmc=", + "lastModified": 1753772294, + "narHash": "sha256-8rkd13WfClfZUBIYpX5dvG3O9V9w3K9FPQ9rY14VtBE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2673921c03d6e75fdf4aa93e025772608d1482cf", + "rev": "6b9214fffbcf3f1e608efa15044431651635ca83", "type": "github" }, "original": { @@ -3301,7 +3310,7 @@ }, "umu": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_24" }, "locked": { "dir": "packaging/nix", @@ -3354,15 +3363,15 @@ }, "walker": { "inputs": { - "nixpkgs": "nixpkgs_24", + "nixpkgs": "nixpkgs_25", "systems": "systems_20" }, "locked": { - "lastModified": 1753511060, - "narHash": "sha256-/wxmsPTYncQSZVVhujU5Vlt/XS4gAymKpw0oU/Uiirc=", + "lastModified": 1753965054, + "narHash": "sha256-0Gm9yuk0AJWcQRsF6wW72sJ/BpXQkc74m6KvILlcWZ4=", "owner": "abenz1267", "repo": "walker", - "rev": "9aa95738324a9826dc05cbd52391d50c8ef149d0", + "rev": "11db47bf74631451fb721c5aa3ed91810e939796", "type": "github" }, "original": { @@ -3469,14 +3478,14 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_25" + "nixpkgs": "nixpkgs_26" }, "locked": { - "lastModified": 1753623063, - "narHash": "sha256-fS4zlM4Bs0sk9rGS1t1wp4SLQRzkpIr7vXCfMc8NpNY=", + "lastModified": 1753933355, + "narHash": "sha256-4QxMcKS6oc+cG8efwwAin4M+YOokBak1dVS8u5P3b5M=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4d72beff27e2152b2b1df05202b2dc50397d4c0d", + "rev": "fa795a139a8c92b140bc21f11f61da1c97ad5b1d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ead2416..b34b50f 100644 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ blog.url = "git+https://code.zoeys.cloud/zoey/web.git"; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.1"; + url = "github:nix-community/lanzaboote/v0.4.2"; # Optional but recommended to limit the size of your system closure. inputs.nixpkgs.follows = "nixpkgs"; diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index ea09c4c..0ca6477 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -113,7 +113,7 @@ catppuccin.enable = true; catppuccin.flavor = "mocha"; - catppuccin.accent = "red"; + catppuccin.accent = "blue"; catppuccin.aerc.enable = true; diff --git a/modules/home/apps/term/ghostty/default.nix b/modules/home/apps/term/ghostty/default.nix index 64b309c..a129c36 100644 --- a/modules/home/apps/term/ghostty/default.nix +++ b/modules/home/apps/term/ghostty/default.nix @@ -21,9 +21,9 @@ in { font-size = 24; - font-style = "Retina ExtraCondensed"; + font-style = "SemiBold ExtraCondensed"; font-style-bold = "Bold ExtraCondensed"; - font-style-italic = "Retina ExtraCondensed Oblique"; + font-style-italic = "SemiBold ExtraCondensed Oblique"; font-style-bold-italic = "Bold ExtraCondensed Oblique"; gtk-single-instance = true; diff --git a/modules/home/apps/term/kitty/default.nix b/modules/home/apps/term/kitty/default.nix index 106a901..a6603c2 100644 --- a/modules/home/apps/term/kitty/default.nix +++ b/modules/home/apps/term/kitty/default.nix @@ -33,6 +33,8 @@ in { font_hinting = "slight"; + cursor_trail = 3; + text_composition_strategy = "1.2 10"; # Normal colors diff --git a/modules/home/apps/tools/neovim/config/lazyvim.json b/modules/home/apps/tools/neovim/config/lazyvim.json index f2fecfc..a3d5116 100644 --- a/modules/home/apps/tools/neovim/config/lazyvim.json +++ b/modules/home/apps/tools/neovim/config/lazyvim.json @@ -1,16 +1,9 @@ { "extras": [ - "lazyvim.plugins.extras.coding.mini-comment", - "lazyvim.plugins.extras.coding.yanky", "lazyvim.plugins.extras.dap.core", "lazyvim.plugins.extras.editor.dial", "lazyvim.plugins.extras.editor.inc-rename", - "lazyvim.plugins.extras.lang.angular", - "lazyvim.plugins.extras.lang.astro", - "lazyvim.plugins.extras.lang.cmake", "lazyvim.plugins.extras.lang.docker", - "lazyvim.plugins.extras.lang.haskell", - "lazyvim.plugins.extras.lang.java", "lazyvim.plugins.extras.lang.toml", "lazyvim.plugins.extras.lang.json", "lazyvim.plugins.extras.lang.clangd", @@ -20,18 +13,14 @@ "lazyvim.plugins.extras.lang.sql", "lazyvim.plugins.extras.lang.svelte", "lazyvim.plugins.extras.lang.tailwind", - "lazyvim.plugins.extras.lang.elixir", - "lazyvim.plugins.extras.lang.tex", "lazyvim.plugins.extras.lang.go", - "lazyvim.plugins.extras.lang.python", - "lazyvim.plugins.extras.lang.zig", "lazyvim.plugins.extras.lang.typescript", "lazyvim.plugins.extras.test.core", "lazyvim.plugins.extras.util.rest", "lazyvim.plugins.extras.util.dot", "lazyvim.plugins.extras.util.mini-hipatterns", - "lazyvim.plugins.extras.coding.luasnip", - "lazyvim.plugins.extras.coding.blink" + "lazyvim.plugins.extras.formatting.biome", + "lazyvim.plugins.extras.coding.luasnip" ], "install_version": 8, "news": { diff --git a/modules/home/apps/tools/neovim/config/lua/config/options.lua b/modules/home/apps/tools/neovim/config/lua/config/options.lua index a93bd4c..ac34dc9 100644 --- a/modules/home/apps/tools/neovim/config/lua/config/options.lua +++ b/modules/home/apps/tools/neovim/config/lua/config/options.lua @@ -12,4 +12,4 @@ vim.g.lazyvim_blink_main = true vim.g.snacks_animate = false vim.o.termguicolors = true -vim.g.lazyvim_python_lsp = "pyright" +vim.g.lazyvim_prettier_needs_config = true diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua index 052f9b5..071268a 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua @@ -59,11 +59,11 @@ return { opts = { formatters_by_ft = { nix = { "alejandra" }, - typescript = { "prettierd" }, - typescriptreact = { "prettierd" }, - javascriptreact = { "prettierd" }, - javascript = { "prettierd" }, - htmlangular = { "prettierd" }, + typescript = { "biome" }, + typescriptreact = { "biome" }, + javascriptreact = { "biome" }, + javascript = { "biome" }, + htmlangular = { "biome" }, python = { "black" }, }, }, diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/extras/typescript.lua b/modules/home/apps/tools/neovim/config/lua/plugins/extras/typescript.lua new file mode 100644 index 0000000..6e5cd3b --- /dev/null +++ b/modules/home/apps/tools/neovim/config/lua/plugins/extras/typescript.lua @@ -0,0 +1,284 @@ +return { + recommended = function() + return LazyVim.extras.wants({ + ft = { + "javascript", + "javascriptreact", + "javascript.jsx", + "typescript", + "typescriptreact", + "typescript.tsx", + }, + root = { "tsconfig.json", "package.json", "jsconfig.json" }, + }) + end, + + -- correctly setup lspconfig + { + "neovim/nvim-lspconfig", + opts = { + -- make sure mason installs the server + servers = { + --- @deprecated -- tsserver renamed to ts_ls but not yet released, so keep this for now + --- the proper approach is to check the nvim-lspconfig release version when it's released to determine the server name dynamically + tsserver = { + enabled = false, + }, + ts_ls = { + enabled = false, + }, + vtsls = { + -- explicitly add default filetypes, so that we can extend + -- them in related extras + filetypes = { + "javascript", + "javascriptreact", + "javascript.jsx", + "typescript", + "typescriptreact", + "typescript.tsx", + }, + settings = { + complete_function_calls = true, + vtsls = { + enableMoveToFileCodeAction = true, + autoUseWorkspaceTsdk = true, + experimental = { + maxInlayHintLength = 30, + completion = { + enableServerSideFuzzyMatch = true, + }, + }, + }, + typescript = { + format = { + enable = false, + }, + updateImportsOnFileMove = { enabled = "always" }, + suggest = { + completeFunctionCalls = true, + }, + inlayHints = { + enumMemberValues = { enabled = true }, + functionLikeReturnTypes = { enabled = true }, + parameterNames = { enabled = "literals" }, + parameterTypes = { enabled = true }, + propertyDeclarationTypes = { enabled = true }, + variableTypes = { enabled = false }, + }, + }, + }, + keys = { + { + "gD", + function() + local params = vim.lsp.util.make_position_params() + LazyVim.lsp.execute({ + command = "typescript.goToSourceDefinition", + arguments = { params.textDocument.uri, params.position }, + open = true, + }) + end, + desc = "Goto Source Definition", + }, + { + "gR", + function() + LazyVim.lsp.execute({ + command = "typescript.findAllFileReferences", + arguments = { vim.uri_from_bufnr(0) }, + open = true, + }) + end, + desc = "File References", + }, + { + "co", + LazyVim.lsp.action["source.organizeImports"], + desc = "Organize Imports", + }, + { + "cM", + LazyVim.lsp.action["source.addMissingImports.ts"], + desc = "Add missing imports", + }, + { + "cu", + LazyVim.lsp.action["source.removeUnused.ts"], + desc = "Remove unused imports", + }, + { + "cD", + LazyVim.lsp.action["source.fixAll.ts"], + desc = "Fix all diagnostics", + }, + { + "cV", + function() + LazyVim.lsp.execute({ command = "typescript.selectTypeScriptVersion" }) + end, + desc = "Select TS workspace version", + }, + }, + }, + }, + setup = { + --- @deprecated -- tsserver renamed to ts_ls but not yet released, so keep this for now + --- the proper approach is to check the nvim-lspconfig release version when it's released to determine the server name dynamically + tsserver = function() + -- disable tsserver + return true + end, + ts_ls = function() + -- disable tsserver + return true + end, + vtsls = function(_, opts) + LazyVim.lsp.on_attach(function(client, buffer) + client.commands["_typescript.moveToFileRefactoring"] = function(command, ctx) + ---@type string, string, lsp.Range + local action, uri, range = unpack(command.arguments) + + local function move(newf) + client.request("workspace/executeCommand", { + command = command.command, + arguments = { action, uri, range, newf }, + }) + end + + local fname = vim.uri_to_fname(uri) + client.request("workspace/executeCommand", { + command = "typescript.tsserverRequest", + arguments = { + "getMoveToRefactoringFileSuggestions", + { + file = fname, + startLine = range.start.line + 1, + startOffset = range.start.character + 1, + endLine = range["end"].line + 1, + endOffset = range["end"].character + 1, + }, + }, + }, function(_, result) + ---@type string[] + local files = result.body.files + table.insert(files, 1, "Enter new path...") + vim.ui.select(files, { + prompt = "Select move destination:", + format_item = function(f) + return vim.fn.fnamemodify(f, ":~:.") + end, + }, function(f) + if f and f:find("^Enter new path") then + vim.ui.input({ + prompt = "Enter move destination:", + default = vim.fn.fnamemodify(fname, ":h") .. "/", + completion = "file", + }, function(newf) + return newf and move(newf) + end) + elseif f then + move(f) + end + end) + end) + end + end, "vtsls") + -- copy typescript settings to javascript + opts.settings.javascript = + vim.tbl_deep_extend("force", {}, opts.settings.typescript, opts.settings.javascript or {}) + end, + }, + }, + }, + + { + "mfussenegger/nvim-dap", + optional = true, + dependencies = { + { + "mason-org/mason.nvim", + opts = function(_, opts) + opts.ensure_installed = opts.ensure_installed or {} + table.insert(opts.ensure_installed, "js-debug-adapter") + end, + }, + }, + opts = function() + local dap = require("dap") + if not dap.adapters["pwa-node"] then + require("dap").adapters["pwa-node"] = { + type = "server", + host = "localhost", + port = "${port}", + executable = { + command = "node", + -- 💀 Make sure to update this path to point to your installation + args = { + LazyVim.get_pkg_path("js-debug-adapter", "/js-debug/src/dapDebugServer.js"), + "${port}", + }, + }, + } + end + if not dap.adapters["node"] then + dap.adapters["node"] = function(cb, config) + if config.type == "node" then + config.type = "pwa-node" + end + local nativeAdapter = dap.adapters["pwa-node"] + if type(nativeAdapter) == "function" then + nativeAdapter(cb, config) + else + cb(nativeAdapter) + end + end + end + + local js_filetypes = { "typescript", "javascript", "typescriptreact", "javascriptreact" } + + local vscode = require("dap.ext.vscode") + vscode.type_to_filetypes["node"] = js_filetypes + vscode.type_to_filetypes["pwa-node"] = js_filetypes + + for _, language in ipairs(js_filetypes) do + if not dap.configurations[language] then + dap.configurations[language] = { + { + type = "pwa-node", + request = "launch", + name = "Launch file", + program = "${file}", + cwd = "${workspaceFolder}", + }, + { + type = "pwa-node", + request = "attach", + name = "Attach", + processId = require("dap.utils").pick_process, + cwd = "${workspaceFolder}", + }, + } + end + end + end, + }, + + -- Filetype icons + { + "echasnovski/mini.icons", + opts = { + file = { + [".eslintrc.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" }, + [".node-version"] = { glyph = "", hl = "MiniIconsGreen" }, + [".prettierrc"] = { glyph = "", hl = "MiniIconsPurple" }, + [".yarnrc.yml"] = { glyph = "", hl = "MiniIconsBlue" }, + ["eslint.config.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" }, + ["package.json"] = { glyph = "", hl = "MiniIconsGreen" }, + ["tsconfig.json"] = { glyph = "", hl = "MiniIconsAzure" }, + ["tsconfig.build.json"] = { glyph = "", hl = "MiniIconsAzure" }, + ["yarn.lock"] = { glyph = "", hl = "MiniIconsBlue" }, + }, + }, + }, +} diff --git a/modules/home/apps/tools/starship/default.nix b/modules/home/apps/tools/starship/default.nix index bf801db..144b400 100644 --- a/modules/home/apps/tools/starship/default.nix +++ b/modules/home/apps/tools/starship/default.nix @@ -20,7 +20,7 @@ in { enableNushellIntegration = config.programs.nushell.enable; settings = { add_newline = false; - format = "$username$directory$git_branch$git_status$python$rust$nodejs$nix_shell$cmd_duration$line_break$character"; + format = "$directory$git_branch$git_status$python$rust$nodejs$nix_shell$cmd_duration$line_break$character"; # Username display username = { diff --git a/modules/home/apps/web/librewolf/default.nix b/modules/home/apps/web/librewolf/default.nix index baa1b0c..9c37852 100644 --- a/modules/home/apps/web/librewolf/default.nix +++ b/modules/home/apps/web/librewolf/default.nix @@ -12,8 +12,8 @@ with lib.custom; let natsumi = pkgs.fetchFromGitHub { owner = "greeeen-dev"; repo = "natsumi-browser"; - rev = "61e614d31f74ac9b17b8b5337b8870cd8f88ca96"; - hash = "sha256-4xE8kg8j30vnN54InXTQVXcWLLhBqchhZpNeqiOJYLc="; + rev = "6012032cc45f57723b997385cd4b55cc11483196"; + hash = "sha256-gstoNN7GPpPGDS3fWzyVoWIr6QXt6kMVR0oHc1ejNT4="; }; in { options.apps.web.librewolf = with types; { @@ -34,139 +34,35 @@ in { recursive = true; }; - catppuccin.firefox.profiles.${config.home.username}.enable = false; - catppuccin.firefox.profiles.default.enable = false; - programs.librewolf = { enable = true; profiles.default = lib.mkForce { id = 1; isDefault = false; + extensions = { + force = true; + }; }; profiles.${config.home.username} = { id = 0; isDefault = true; - settings = { - "app.normandy.api_url" = ""; - "app.normandy.enabled" = false; - "app.shield.optoutstudies.enabled" = false; - "app.update.auto" = false; - "beacon.enabled" = false; - "breakpad.reportURL" = ""; - "browser.aboutConfig.showWarning" = false; - "browser.cache.offline.enable" = false; - "browser.crashReports.unsubmittedCheck.autoSubmit" = false; - "browser.crashReports.unsubmittedCheck.autoSubmit2" = false; - "browser.crashReports.unsubmittedCheck.enabled" = false; - "browser.disableResetPrompt" = true; - "browser.newtab.preload" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; - "browser.newtabpage.enhanced" = false; - "browser.newtabpage.introShown" = true; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.system.showSponsored" = false; - "browser.safebrowsing.appRepURL" = ""; - "browser.safebrowsing.blockedURIs.enabled" = false; - "browser.safebrowsing.downloads.enabled" = false; - "browser.safebrowsing.downloads.remote.enabled" = false; - "browser.safebrowsing.downloads.remote.url" = ""; - "browser.safebrowsing.enabled" = false; - "browser.safebrowsing.malware.enabled" = false; - "browser.safebrowsing.phishing.enabled" = false; - "browser.selfsupport.url" = ""; - "browser.send_pings" = false; - "browser.sessionstore.privacy_level" = 0; - "browser.shell.checkDefaultBrowser" = false; - "browser.startup.homepage_override.mstone" = ""; - "browser.tabs.crashReporting.sendReport" = false; - "browser.urlbar.groupLabels.enabled" = false; - "browser.urlbar.quicksuggest.enabled" = false; - "browser.urlbar.speculativeConnect.enabled" = false; - "browser.urlbar.trimURLs" = false; - "browser.urlbar.suggest.quicksuggest.sponsored" = false; - "datareporting.healthreport.service.enabled" = false; - "datareporting.healthreport.uploadEnabled" = false; - "datareporting.policy.dataSubmissionEnabled" = false; - "device.sensors.ambientLight.enabled" = false; - "device.sensors.enabled" = false; - "device.sensors.motion.enabled" = false; - "device.sensors.orientation.enabled" = false; - "device.sensors.proximity.enabled" = false; - "dom.battery.enabled" = false; - "dom.event.clipboardevents.enabled" = false; - "dom.webaudio.enabled" = false; - "experiments.activeExperiment" = false; - "experiments.enabled" = false; - "experiments.manifest.uri" = ""; - "experiments.supported" = false; - "extensions.ClearURLs@kevinr.whiteList" = ""; - "extensions.Decentraleyes@ThomasRientjes.whiteList" = ""; - "extensions.FirefoxMulti-AccountContainers@mozilla.whiteList" = ""; - "extensions.TemporaryContainers@stoically.whiteList" = ""; - "extensions.autoDisableScopes" = 14; - "extensions.getAddons.cache.enabled" = false; - "extensions.getAddons.showPane" = false; - "extensions.greasemonkey.stats.optedin" = false; - "extensions.greasemonkey.stats.url" = ""; - "extensions.pocket.enabled" = false; - "extensions.shield-recipe-client.api_url" = ""; - "extensions.shield-recipe-client.enabled" = false; - "extensions.webservice.discoverURL" = ""; - "media.autoplay.default" = 0; - "media.autoplay.enabled" = true; - "media.eme.enabled" = false; - "media.gmp-widevinecdm.enabled" = false; - "media.navigator.enabled" = false; - "media.peerconnection.enabled" = false; - "media.video_stats.enabled" = false; - "network.IDN_show_punycode" = true; - "network.allow-experiments" = false; - "network.captive-portal-service.enabled" = false; - "network.cookie.cookieBehavior" = 1; - "network.dns.disablePrefetch" = true; - "network.dns.disablePrefetchFromHTTPS" = true; - "network.http.referer.spoofSource" = true; - "network.http.speculative-parallel-limit" = ""; - "network.predictor.enable-prefetch" = false; - "network.predictor.enabled" = false; - "network.prefetch-next" = false; - "network.trr.mode" = ""; - "privacy.donottrackheader.enabled" = true; - "privacy.donottrackheader.value" = ""; - "privacy.firstparty.isolate" = true; - "privacy.query_stripping" = true; - "privacy.trackingprotection.cryptomining.enabled" = true; - "privacy.trackingprotection.enabled" = true; - "privacy.trackingprotection.pbmode.enabled" = true; - "privacy.usercontext.about_newtab_segregation.enabled" = true; - "security.ssl.disable_session_identifiers" = true; - "services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsoredTopSite" = false; - "signon.autofillForms" = false; - "toolkit.telemetry.archive.enabled" = false; - "toolkit.telemetry.bhrPing.enabled" = false; - "toolkit.telemetry.cachedClientID" = ""; - "toolkit.telemetry.enabled" = false; - "toolkit.telemetry.firstShutdownPing.enabled" = false; - "toolkit.telemetry.hybridContent.enabled" = false; - "toolkit.telemetry.newProfilePing.enabled" = false; - "toolkit.telemetry.prompted" = ""; - "toolkit.telemetry.rejected" = true; - "toolkit.telemetry.reportingpolicy.firstRun" = false; - "toolkit.telemetry.server" = ""; - "toolkit.telemetry.shutdownPingSender.enabled" = false; - "toolkit.telemetry.unified" = false; - "toolkit.telemetry.unifiedIsOptIn" = false; - "toolkit.telemetry.updatePing.enabled" = false; - "webgl.renderer-string-override" = " "; - "webgl.vendor-string-override" = " "; + extensions = { + force = true; + }; + settings = { "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "sidebar.verticalTabs" = true; + "webgl.disabled" = false; + "privacy.resistFingerprinting" = false; + "privacy.clearOnShutdown.history" = false; + "privacy.clearOnShutdown.cookies" = false; + "network.cookie.lifetimePolicy" = 0; + "natsumi.theme.type" = "default"; }; @@ -204,7 +100,10 @@ in { ]; icon = "https://www.openstreetmap.org/favicon.ico"; - definedAliases = ["@openstreetmap" "@osm"]; + definedAliases = [ + "@openstreetmap" + "@osm" + ]; }; "SearXNG" = { @@ -259,8 +158,6 @@ in { (extension "ublock-origin" "uBlock0@raymondhill.net") (extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack") (extension "1password-x-password-manager" "{d634138d-c276-4fc8-924b-40a0ea21d284}") - (extension "multi-account-containers" "@testpilot-containers") - (extension "temporary-containers" "{c607c8df-14a7-4f28-894f-29e8722976af}") (extension "styl-us" "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}") (extension "betterttv" "firefox@betterttv.net") (extension "decentraleyes" "jid1-BoFifL9Vbdl2zQ@jetpack") diff --git a/patch.patch b/patch.patch new file mode 100644 index 0000000..c8d3f7d --- /dev/null +++ b/patch.patch @@ -0,0 +1,24 @@ +From 2ce643428722dc0d6e181ea4745097c6e18feca2 Mon Sep 17 00:00:00 2001 +From: Lars Kellogg-Stedman +Date: Wed, 7 May 2025 21:45:00 -0400 +Subject: [PATCH] Fix broken integration with Mason 2.0.0 + +--- + lua/lazyvim/plugins/lsp/init.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua +index b5cba5f..1dfc8c7 100644 +--- a/lua/lazyvim/plugins/lsp/init.lua ++++ b/lua/lazyvim/plugins/lsp/init.lua +@@ -212,7 +212,7 @@ return { + local have_mason, mlsp = pcall(require, "mason-lspconfig") + local all_mslp_servers = {} + if have_mason then +- all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package) ++ all_mslp_servers = require("mason-lspconfig").get_mappings().lspconfig_to_package + end + + local ensure_installed = {} ---@type string[] +-- +2.49.0 diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index cb9a466..2b8ad96 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -30,6 +30,8 @@ hardware.keyboard.qmk.enable = true; programs.nix-ld.enable = true; + services.tailscale.enable = true; + services.flatpak.enable = true; hardware.march = { @@ -126,10 +128,10 @@ }; # Bootloader. - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.enable = lib.mkForce false; boot.lanzaboote = { - enable = false; - pkiBundle = "/etc/secureboot"; + enable = true; + pkiBundle = "/var/lib/sbctl"; }; boot.loader.efi.canTouchEfiVariables = true; boot.blacklistedKernelModules = ["joydev"]; @@ -208,10 +210,8 @@ }) pkgs.bottles pkgs.file-roller - pkgs.podman-tui pkgs.dive pkgs.docker-compose - pkgs.podman-compose pkgs.transmission_4 pkgs.protonup-qt pkgs.restic @@ -297,10 +297,13 @@ sites.mealie.enable = false; virtualisation.containers.enable = true; - virtualisation.podman = { + # virtualisation.podman = { + # enable = true; + # dockerCompat = true; + # defaultNetwork.settings.dns_enabled = true; + # }; + virtualisation.docker = { enable = true; - dockerCompat = true; - defaultNetwork.settings.dns_enabled = true; }; hardware.gpu-passthru.enable = true;