diff --git a/apps/gui/ghostty.nix b/apps/gui/ghostty.nix index 259f955..668f64f 100644 --- a/apps/gui/ghostty.nix +++ b/apps/gui/ghostty.nix @@ -1,16 +1,18 @@ -{ pkgs, ... }: { - xdg.configFile."ghostty/config".text = '' - background-opacity = 0.9 - command = nu - confirm-close-surface = false - font-family = MonaspiceNe Nerd Font - theme = catppuccin-mocha - term = xterm-256color - ''; - # zig build -p ~/.local/share/ghostty -Doptimize=ReleaseFast - # xdg.systemDirs.data = [ "/home/jolheiser/.local/share/ghostty/share" ]; - # home.sessionPath = [ "/home/jolheiser/.local/share/ghostty/bin" ]; - # programs.bash.enable = true; - home.packages = [ pkgs.ghostty ]; + config, + lib, + ... +}: +{ + programs.ghostty = { + enable = true; + settings = { + background-opacity = 0.9; + command = "${lib.getExe config.programs.nushell.package} --login --interactive"; + confirm-close-surface = false; + font-family = "MonaspiceNe Nerd Font"; + theme = "catppuccin-mocha"; + term = "xterm-256color"; + }; + }; } diff --git a/flake.lock b/flake.lock index f5b59ee..d2c2819 100644 --- a/flake.lock +++ b/flake.lock @@ -43,22 +43,6 @@ "url": "https://git.jolheiser.com/cfg.git" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -80,49 +64,9 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "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" - } - }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", - "zig": "zig", - "zon2nix": "zon2nix" - }, - "locked": { - "lastModified": 1748372068, - "narHash": "sha256-JeZWDzY1f//amtQSU7TmwAqG8qeyBIdx7JBfgzhEkdY=", - "ref": "refs/heads/main", - "rev": "ad632f10687c087bc45319aad6c8ee272269e5f9", - "revCount": 10376, - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - }, - "original": { - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - } - }, "gomodinit": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1734153556, @@ -140,7 +84,7 @@ }, "helix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1742139323, @@ -209,19 +153,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1748189127, - "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1733935885, "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", @@ -237,7 +168,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1741037377, "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", @@ -253,6 +184,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_5": { "locked": { "lastModified": 1748190013, @@ -270,22 +217,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1741037377, "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", @@ -301,7 +232,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1726937504, "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", @@ -317,7 +248,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1743583204, "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", @@ -335,7 +266,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -354,7 +285,7 @@ }, "pokego": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1741123315, @@ -374,12 +305,11 @@ "inputs": { "agenix": "agenix", "cfg": "cfg", - "ghostty": "ghostty", "gomodinit": "gomodinit", "helix": "helix", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nur": "nur", "pokego": "pokego", "spectre": "spectre", @@ -388,7 +318,7 @@ }, "spectre": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1732207908, @@ -434,24 +364,9 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "utils": "utils" }, "locked": { @@ -491,7 +406,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -506,60 +421,6 @@ "repo": "flake-utils", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748261582, - "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "aafb1b093fb838f7a02613b719e85ec912914221", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zon2nix": { - "inputs": { - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "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 cfdc2df..04d9c1f 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,6 @@ cfg.url = "git+https://git.jolheiser.com/cfg.git"; spectre.url = "git+https://git.jolheiser.com/go-spectre.git"; pokego.url = "git+https://git.jolheiser.com/pokego.git"; - ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty"; tclip.url = "github:tailscale-dev/tclip"; }; @@ -48,7 +47,6 @@ pokego = inputs.pokego.packages.${prev.system}.default; }; tclip = inputs.tclip.packages.${prev.system}.tclip; - ghostty = inputs.ghostty.packages.${prev.system}.ghostty; }; pkgs = import inputs.nixpkgs { inherit system;