diff --git a/flake.lock b/flake.lock index 2b181d7..bb16977 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1735689283, - "narHash": "sha256-LOZRScnB8Q9ylmlXnt2j2v4Aj1b5JZTdSeKYaFL1RDw=", + "lastModified": 1735765328, + "narHash": "sha256-f4LI34cXP8nOTi4Va6GPUFaJYf0qGbabk+OeUddsfuk=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "60611b8a4a1d5b3c1097cce85eb0311de0696cfa", + "rev": "94599102e9fb8247af08cbbbcb7ee25e3d31e1bd", "type": "github" }, "original": { @@ -129,21 +129,6 @@ "type": "github" } }, - "ghostty-hm": { - "locked": { - "lastModified": 1702368251, - "narHash": "sha256-hafrDmzGplzm+vdIo+LkOjRfA4qRcy5JmpGGksnht5c=", - "owner": "clo4", - "repo": "ghostty-hm-module", - "rev": "887e13a6e7acf5ffaab0119d96e476d84db90904", - "type": "github" - }, - "original": { - "owner": "clo4", - "repo": "ghostty-hm-module", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -202,11 +187,11 @@ ] }, "locked": { - "lastModified": 1733333617, - "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", + "lastModified": 1735695978, + "narHash": "sha256-cwk53OX1S1bCFY09zydubZNmmwcx9l5XEba8mVYuNE4=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", + "rev": "f6233b5cfbada692d93a73d6ed35bdbfd0fdb9c4", "type": "github" }, "original": { @@ -222,11 +207,11 @@ ] }, "locked": { - "lastModified": 1735735907, - "narHash": "sha256-/AOGn9qJMjrZQyWYbObHTKmWDUP0q9+0TAXOJnq6ik0=", + "lastModified": 1735774425, + "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "59a4c43e9ba6db24698c112720a58a334117de83", + "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "type": "github" }, "original": { @@ -246,11 +231,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735693090, - "narHash": "sha256-Axke90GBbocA48Lrb7ub/RycvHt1NcujkZW1RMF+Q7Q=", + "lastModified": 1735801710, + "narHash": "sha256-Z6Pl8LWYbPnqSinpSxrylfCpa4XkEVhzpfnfqiD0Kv8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "47e417b35d1ec8bf79deec3e96c90f1e41a9e1e4", + "rev": "57a05ea557689b9d85dd594a9a26778b6842a18a", "type": "github" }, "original": { @@ -262,11 +247,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1735686267, - "narHash": "sha256-gLa+1QOW7P5J4cAG34BW68tnf/yOx50rH6iZuSyoX1A=", + "lastModified": 1735771362, + "narHash": "sha256-+HxTD7TxeIySWsE++VKDWBMQK5OqTv391wADaZ8UDuo=", "owner": "neovim", "repo": "neovim", - "rev": "59cbe640233eeb6ae96231e059449e73e15f9ea5", + "rev": "6dc0eb9f41e6453fe003dd3a28c58b701fd003c9", "type": "github" }, "original": { @@ -277,11 +262,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735554305, - "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", + "lastModified": 1735617354, + "narHash": "sha256-5zJyv66q68QZJZsXtmjDBazGnF0id593VSy+8eSckoo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", + "rev": "69b9a8c860bdbb977adfa9c5e817ccb717884182", "type": "github" }, "original": { @@ -309,11 +294,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1735531152, - "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { @@ -374,7 +359,6 @@ "root": { "inputs": { "ghostty": "ghostty", - "ghostty-hm": "ghostty-hm", "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 170ca39..c19e910 100644 --- a/flake.nix +++ b/flake.nix @@ -22,14 +22,12 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - ghostty-hm.url = "github:clo4/ghostty-hm-module"; }; outputs = inputs@{ self, nixpkgs, - ghostty-hm, home-manager, ... }: @@ -55,7 +53,6 @@ inherit inputs outputs; }; modules = [ - ghostty-hm.homeModules.default ./home/common ] ++ modules; }; diff --git a/home/common/ghostty.nix b/home/common/ghostty.nix index 60174c8..165989a 100644 --- a/home/common/ghostty.nix +++ b/home/common/ghostty.nix @@ -7,13 +7,10 @@ }: { config = lib.mkIf config.patagia.desktop.enable { - - home.packages = with pkgs; [ - inputs.ghostty.packages.${pkgs.system}.default - ]; - programs.ghostty = { enable = true; + enableFishIntegration = true; + package = inputs.ghostty.packages.${pkgs.system}.default; settings = { font-size = 14; font-family = "Berkeley Mono Variable"; diff --git a/home/dln/desktop.nix b/home/dln/desktop.nix index 95d3157..783f875 100644 --- a/home/dln/desktop.nix +++ b/home/dln/desktop.nix @@ -9,7 +9,6 @@ dynamic-wallpaper gimp inkscape - inputs.ghostty.packages.${pkgs.system}.default moonlight-qt obsidian pavucontrol