diff --git a/apps/gui/ghostty.nix b/apps/gui/ghostty.nix index 0a864a183ee8bbaafbbdf0f2da91d4c7b91b9f65..761f2486255db4aa1006673b5f01fdfc69f5e064 100644 --- a/apps/gui/ghostty.nix +++ b/apps/gui/ghostty.nix @@ -1,4 +1,3 @@ -{ pkgs, ... }: { xdg.configFile."ghostty/config".text = '' background-opacity = 0.9 @@ -10,10 +9,9 @@ term = xterm-256color ''; # zig build -p ~/.local/share/ghostty -Doptimize=ReleaseFast { pkgs, ... }: -{ + font-family = Monaspace Neon { pkgs, ... }: - xdg.configFile."ghostty/config".text = '' + theme = catppuccin-mocha { pkgs, ... }: - background-opacity = 0.9 - home.packages = [ pkgs.ghostty ]; + term = xterm-256color } diff --git a/flake.lock b/flake.lock index b080d4aa9adce7f05a7ea6193b86bd60d61cf80a..cfd31071a4ef89ad206f10a30de2535918526aad 100644 --- a/flake.lock +++ b/flake.lock @@ -107,23 +107,6 @@ "url": "https://git.jolheiser.com/cfg.git" } }, "nixpkgs": [ -{ - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "nixpkgs": [ }, "inputs": { "systems": "systems_2" @@ -148,50 +131,12 @@ "systems": "systems_3" }, "locked": { "nixpkgs" - ] - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "actual": { - }, - "original": { "nixpkgs" - "nodes": { - "repo": "flake-utils", - "type": "github" { - }, - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { "nixpkgs" - "nodes": { - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -201,25 +146,6 @@ "type": "github" } }, ] - ] - "inputs": { - "systems": "systems_6" - }, - "locked": { - "nixpkgs" - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -234,9 +160,9 @@ "repo": "flake-utils", "type": "github" } }, - "flake-utils_7": { + "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_4" }, "locked": { "lastModified": 1694529238, @@ -252,27 +178,6 @@ "repo": "flake-utils", "type": "github" } }, - "ghostty": { - "inputs": { - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig", - "zls": "zls" - }, - "locked": { - "lastModified": 1723168569, - "narHash": "sha256-VTo/HNmYQ1ctAzdCOvtInQf9grhSuRLGA8FGP/4pVew=", - "ref": "refs/heads/main", - "rev": "33d9c043ef828b062865f42db551d6ddc48e2def", - "revCount": 6848, - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - }, - "original": { - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - } - }, "gist": { "inputs": { "nixpkgs": [ @@ -340,29 +245,6 @@ "gitignore": { "inputs": { "nixpkgs": [ { - "type": "git", - "zls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ -{ ], "nixpkgs" ] @@ -431,9 +313,8 @@ } }, "gomod2nix_2": { "inputs": { -{ "actual": { - "locked": { + "owner": "ryantm", "nixpkgs": [ "templ", "nixpkgs" @@ -455,7 +336,7 @@ } }, "gomod2nix_3": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_4", "nixpkgs": [ "ugit", "nixpkgs" @@ -556,18 +437,6 @@ "url": "https://git.jolheiser.com/nur.git" } }, "original": { - "flake": false, - "locked": { - "narHash": "sha256-O6p2tiKD8ZMhSX+DeA/o5hhAvcPkU2J9lFys/r11peY=", - "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" - }, - "original": { - "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" - } - }, - "original": { "inputs": { "locked": { "lastModified": 1722332872, @@ -601,39 +470,6 @@ "type": "github" } }, { - "nixpkgs-unstable": "nixpkgs-unstable", - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, -{ "narHash": "sha256-98XV0l+3b4sFhxdepNoanqDzhgnEen5ZcrGtqoRp4cA=", "locked": { "lastModified": 1721562059, @@ -695,7 +531,6 @@ "bennet": "bennet", "blog": "blog", "cfg": "cfg", "flake-utils": "flake-utils", - "ghostty": "ghostty", "gist": "gist", "git-age": "git-age", "git-pr": "git-pr", @@ -777,51 +612,6 @@ "type": "github" } }, "lastModified": 1712079060, - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "lastModified": 1712079060, "actual": { "inputs": { "nixpkgs": [ @@ -930,8 +720,8 @@ } }, "templ": { "inputs": { + "rev": "bd7287aa0d13d5af400f659963655c004789715f", "nodes": { - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "gomod2nix": "gomod2nix_2", "nixpkgs": [ "nixpkgs" @@ -1046,8 +836,8 @@ }, "xc": { "inputs": { "actual": { + "inputs": { { - }, "nixpkgs": [ "templ", "nixpkgs" @@ -1064,81 +854,6 @@ }, "original": { "owner": "joerdav", "repo": "xc", - "type": "github" - } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zig-overlay": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "ghostty", - "zls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718539737, - "narHash": "sha256-hvQ900gSqzGnJWMRQwv65TixciIbC44iX0Nh5ENRwCU=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "6eb42ce6f85d247b1aecf854c45d80902821d0ad", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zls": { - "inputs": { - "flake-utils": "flake-utils_3", - "gitignore": "gitignore", - "langref": "langref", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ], - "zig-overlay": "zig-overlay" - }, - "locked": { - "lastModified": 1718930611, - "narHash": "sha256-FtfVhs6XHNfSQRQorrrz03nD0LCNp2FCnGllRntHBts=", - "owner": "zigtools", - "repo": "zls", - "rev": "0b9746b60c2020ab948f6556f1c729858b82a0f0", - "type": "github" - }, - "original": { - "owner": "zigtools", - "ref": "master", - "repo": "zls", "type": "github" } } diff --git a/flake.nix b/flake.nix index f7c317e0acb2f73d49dbed0f6310579ec086557a..c5edb42a109947ca87d0d5d0690e31847e7f41f6 100644 --- a/flake.nix +++ b/flake.nix @@ -113,10 +113,6 @@ url = "git+https://git.jolheiser.com/tsnet-serve-nix.git"; inputs.nixpkgs.follows = "nixpkgs"; }; flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers -{ - url = "git+ssh://git@github.com/ghostty-org/ghostty"; - }; - flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers outputs = @@ -149,7 +145,6 @@ bennet = inputs.bennet.packages.${prev.system}.default; }; tclip = inputs.tclip.packages.${prev.system}.tclip; templ = inputs.templ.packages.${prev.system}.templ; - ghostty = inputs.ghostty.packages.${prev.system}.ghostty; }) inputs.golink.overlay ];