diff --git a/flake.lock b/flake.lock index 839822c..6f734bc 100644 --- a/flake.lock +++ b/flake.lock @@ -37,22 +37,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -68,7 +52,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -126,24 +110,6 @@ "type": "indirect" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flood": { "flake": false, "locked": { @@ -160,36 +126,9 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs-stable": [ - "nixpkgs" - ], - "nixpkgs-unstable": [ - "nixpkgs" - ], - "zig": "zig", - "zon2nix": "zon2nix" - }, - "locked": { - "lastModified": 1742838227, - "narHash": "sha256-LSmn3lGFH4WWeDDMR01c+bgGXwbSN+cl//58PtP6IKg=", - "owner": "mitchellh", - "repo": "ghostty", - "rev": "5d9bee98e8ef8e36f3e8fb18d0fcedc7b9eef17f", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "ghostty", - "type": "github" - } - }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "neovim-nightly", @@ -261,11 +200,11 @@ ] }, "locked": { - "lastModified": 1742871411, - "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", + "lastModified": 1743136572, + "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "owner": "nix-community", "repo": "home-manager", - "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", + "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "type": "github" }, "original": { @@ -308,7 +247,7 @@ }, "neovim-nightly": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", @@ -319,11 +258,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742862181, - "narHash": "sha256-IlVr0Ft7OJwDTIIb4FnwwbQxtot1FrOQrs9kCxKjvzU=", + "lastModified": 1743150501, + "narHash": "sha256-faQvxywTAOSe46PchJTEIMNCIBQYizL66r/XP3itVIw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "458f080e8f7005a9c464101100831f066b21a97e", + "rev": "81b3c44666b9e31920a6dd1de9bc8aa31f5c9b29", "type": "github" }, "original": { @@ -335,11 +274,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1742850922, - "narHash": "sha256-N6S+yUH0wcgGJuXGYWFeWoPSGtvFeWSDIU4pPshu/wg=", + "lastModified": 1743117594, + "narHash": "sha256-CUkBueRhIcoPnEi1mu8S85PZtbFIri+MJVWnAKFLuSI=", "owner": "neovim", "repo": "neovim", - "rev": "5719f2b91a3100785c8b454e28054b5c7848271d", + "rev": "07f048a8d764b075cb73dca4002b4743841faaa9", "type": "github" }, "original": { @@ -355,11 +294,11 @@ ] }, "locked": { - "lastModified": 1742869675, - "narHash": "sha256-rgwUZJZVztaNYPTsf6MIqirPL5r2JTMMyHuzk1ezyYk=", + "lastModified": 1743125241, + "narHash": "sha256-TA/xYqZbBwCCprXf8ABORDsjJy0Idw6OdQNqYQhgKCM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bb81755a3674951724d79b8cba6bbff01409d44d", + "rev": "75f8e4dbc553d3052f917e66ee874f69d49c9981", "type": "github" }, "original": { @@ -406,17 +345,17 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1742481215, - "narHash": "sha256-m7I/2UaGEFOI+Cy0RoADBi10NZt1WD5N3q2jUwPprE4=", + "lastModified": 1743125458, + "narHash": "sha256-0z+5AMacL2Eqo92fAd0eCWeKVecWrxPJwd5/BIfcdJ8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "96d7df91cce0d7cd30d1958fe1aefcb5f9bfced7", + "rev": "394c77f61ac76399290bfc2ef9d47b1fba31b215", "type": "github" }, "original": { @@ -427,11 +366,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -461,7 +400,6 @@ "inputs": { "astal": "astal", "flood": "flood", - "ghostty": "ghostty", "home-manager": "home-manager", "impermanence": "impermanence", "ltex-extra": "ltex-extra", @@ -476,21 +414,6 @@ "zen-browser": "zen-browser" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tmux": { "flake": false, "locked": { @@ -515,11 +438,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1743081648, + "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", "type": "github" }, "original": { @@ -535,11 +458,11 @@ ] }, "locked": { - "lastModified": 1742616341, - "narHash": "sha256-4/jpVPcN5VKomVhC/4KG0wU1KPxoDi1zVmu+GuuP6PU=", + "lastModified": 1743134754, + "narHash": "sha256-NC90oFdXwjABXs7wg0tMi5yxNW/xT1bgezg+0a9+3AI=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "33f2c77de9b296992436dc9e17c3580c727511a7", + "rev": "ceb2e7122307700e9c310973c793c2c241dc0901", "type": "github" }, "original": { @@ -547,60 +470,6 @@ "repo": "zen-browser-flake", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1741825901, - "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "0b14285e283f5a747f372fb2931835dd937c4383", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zon2nix": { - "inputs": { - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1742104771, - "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", - "owner": "jcollie", - "repo": "zon2nix", - "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", - "type": "github" - }, - "original": { - "owner": "jcollie", - "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613", - "repo": "zon2nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ac5dafb..3a2063c 100644 --- a/flake.nix +++ b/flake.nix @@ -19,11 +19,6 @@ url = "github:nix-community/neovim-nightly-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - ghostty = { - url = "github:mitchellh/ghostty"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - inputs.nixpkgs-unstable.follows = "nixpkgs"; - }; flood = { url = "github:zoriya/flood"; flake = false; diff --git a/modules/cli/nix/nix.nix b/modules/cli/nix/nix.nix index 5ca5104..133da7d 100644 --- a/modules/cli/nix/nix.nix +++ b/modules/cli/nix/nix.nix @@ -21,11 +21,9 @@ use-xdg-base-directories = true; substituters = [ "https://nix-community.cachix.org" - "https://ghostty.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" ]; # 500mb of download buffer size (default is 64mb) download-buffer-size = 500 * 1024 * 1024; diff --git a/modules/gui/ghostty.nix b/modules/gui/ghostty.nix index b0a0891..d453e57 100644 --- a/modules/gui/ghostty.nix +++ b/modules/gui/ghostty.nix @@ -1,14 +1,6 @@ -{ - ghostty, - pkgs, - ... -}: { +{...}: { programs.ghostty = { enable = true; - package = - if pkgs.stdenv.isLinux - then ghostty.packages.${pkgs.system}.default - else null; enableZshIntegration = true; clearDefaultKeybinds = true; settings = { diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index c0dac1a..3267781 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -176,6 +176,5 @@ if vim.g.have_nerd_font then }) end vim.diagnostic.config({ - virtual_text = false, update_in_insert = true, })