From cbfad029b05b479c2db1be99b149464a75276947 Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 9 Jun 2024 17:53:02 +0200 Subject: [PATCH] feat(desktop): add ghostty --- configs/desktop.nix | 2 + flake.lock | 276 +++++++++++++++++++++++++++++++++++++++++++- flake.nix | 2 + 3 files changed, 279 insertions(+), 1 deletion(-) diff --git a/configs/desktop.nix b/configs/desktop.nix index a9c59bd..49a493d 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -3,6 +3,7 @@ pkgs, config, catppuccin, + ghostty, ... }: { imports = [ @@ -65,6 +66,7 @@ # font-manager chromium gimp + ghostty.packages.${pkgs.system}.default gnome.gnome-calculator gparted jetbrains.idea-ultimate diff --git a/flake.lock b/flake.lock index 5123dc1..345b1d7 100644 --- a/flake.lock +++ b/flake.lock @@ -110,6 +110,38 @@ "type": "github" } }, + "flake-compat": { + "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" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -150,6 +182,100 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghostty": { + "inputs": { + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig", + "zls": "zls" + }, + "locked": { + "lastModified": 1717899019, + "narHash": "sha256-MY65SsRV86BEpkhzxlYsl6fUBoo3eify2vuOZYTtUKI=", + "ref": "refs/heads/main", + "rev": "c69dc0e0e14b89bdbda6a035fd864386cc1b86fa", + "revCount": 6305, + "type": "git", + "url": "ssh://git@github.com/ghostty-org/ghostty" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/ghostty-org/ghostty" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "ghostty", + "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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -170,6 +296,18 @@ "type": "github" } }, + "langref": { + "flake": false, + "locked": { + "narHash": "sha256-94broSBethRhPJr0G9no4TPyB8ee6BQ/hHK1QnLPln0=", + "type": "file", + "url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in" + }, + "original": { + "type": "file", + "url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in" + } + }, "lanzaboote": { "inputs": { "crane": [ @@ -241,6 +379,38 @@ "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1702049175, + "narHash": "sha256-c/q2+tGHbmLgzT3sXyUKVJR98h1CTks2+nkVaoZPRM0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b15508bd65870620f1df5864e8e861dffbc4e428", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1713687659, + "narHash": "sha256-Yd8KuOBpZ0Slau/NxFhMPJI0gBxeax0vq/FD0rqKwuQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -250,11 +420,12 @@ "deploy-rs": "deploy-rs", "flake-parts": "flake-parts", "flake-utils": "flake-utils", + "ghostty": "ghostty", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", - "systems": "systems", + "systems": "systems_3", "ukubot-rs": "ukubot-rs", "vscode-extensions": "vscode-extensions", "vscode-server": "vscode-server" @@ -300,6 +471,36 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "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" + } + }, "ukubot-rs": { "inputs": { "flake-parts": [ @@ -370,6 +571,79 @@ "repo": "nixos-vscode-server", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1717934961, + "narHash": "sha256-e0wwZVPxiimweGkGif6n0blDoF9VQNVhdibsh8LOxVI=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "33e18507720d7ae4e551c47689fb3ce3de60c83a", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zig-overlay": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "ghostty", + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711627798, + "narHash": "sha256-4BUZmgUFrrD5dRZbOUYRRQEDwLX/r7/ErLi+vHfB/+8=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "b01e0b81d1fa489e54362ea0a74f182eaa9a35bb", + "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": 1711925513, + "narHash": "sha256-DFgsGlEGsxLgtRrh7J+v8x4w+/cJatTCkrZP3/0Gb/o=", + "owner": "zigtools", + "repo": "zls", + "rev": "4e01c08f558ea07462aaa7b71d2a24f86f47a855", + "type": "github" + }, + "original": { + "owner": "zigtools", + "ref": "master", + "repo": "zls", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6a1f7ff..d403b3e 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,8 @@ inputs.systems.follows = "systems"; }; + ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty"; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs";