diff --git a/flake.lock b/flake.lock index c4bbed9..fc7f4e7 100644 --- a/flake.lock +++ b/flake.lock @@ -125,49 +125,6 @@ "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" - } - }, - "ghostty": { - "inputs": { - "flake-compat": [], - "nixpkgs-stable": [ - "nixpkgs" - ], - "nixpkgs-unstable": [ - "nixpkgs" - ], - "zig": "zig" - }, - "locked": { - "lastModified": 1735362327, - "narHash": "sha256-kD49xAUMCWU60IRKoJiyJTaEUum7rk45OYjZfwWr3Ck=", - "ref": "refs/heads/main", - "rev": "6cbd69da7839260508466f9dfb2bc0c0fbb43991", - "revCount": 8515, - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - }, - "original": { - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -286,13 +243,12 @@ "crane": "crane", "flake-parts": "flake-parts", "flake-utils": "flake-utils", - "ghostty": "ghostty", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "mystia": "mystia", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", - "systems": "systems_2", + "systems": "systems", "treefmt-nix": "treefmt-nix", "ukubot-rs": "ukubot-rs", "vencord": "vencord", @@ -335,21 +291,6 @@ "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -432,31 +373,6 @@ "repo": "nix-vscode-extensions", "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d1d4777..3289325 100644 --- a/flake.nix +++ b/flake.nix @@ -85,13 +85,6 @@ inputs.systems.follows = "systems"; }; - ghostty = { - url = "git+ssh://git@github.com/ghostty-org/ghostty"; - inputs.nixpkgs-unstable.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - inputs.flake-compat.follows = ""; - }; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/programs/ghostty.nix b/programs/ghostty.nix index 030593e..9594049 100644 --- a/programs/ghostty.nix +++ b/programs/ghostty.nix @@ -1,18 +1,15 @@ { pkgs, - ghostty, ... }: { - hm.home = { - packages = [ ghostty.packages.${pkgs.system}.default ]; + environment.systemPackages = [ pkgs.ghostty ]; - file.".config/ghostty/config".text = '' - theme = light:catppuccin-latte,dark:catppuccin-mocha - font-family = Iosevka Term - font-size = 12 - font-feature = -calt - font-feature = -dlig - ''; - }; + hm.home.file.".config/ghostty/config".text = '' + theme = light:catppuccin-latte,dark:catppuccin-mocha + font-family = Iosevka Term + font-size = 12 + font-feature = -calt + font-feature = -dlig + ''; }