summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMel <einebeere@gmail.com>2025-01-11 00:22:50 +0100
committerMel <einebeere@gmail.com>2025-01-11 00:22:50 +0100
commit3bd800a4560f89e8d8ca9586b99854b0ca51e2e5 (patch)
treecc42c7415799bca08f207101472abb5b17ff5376
parent6aa6be75f08751c7d8d6d8c04e37d1fb20820cb2 (diff)
downloadminerals-3bd800a4560f89e8d8ca9586b99854b0ca51e2e5.tar.zst
minerals-3bd800a4560f89e8d8ca9586b99854b0ca51e2e5.zip
Remove custom Ghostty flake in favor of stable package
Signed-off-by: Mel <einebeere@gmail.com>
-rw-r--r--flake.lock100
-rw-r--r--flake.nix12
-rw-r--r--modules/common.nix2
3 files changed, 2 insertions, 112 deletions
diff --git a/flake.lock b/flake.lock
index 5296d90..623405e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -62,65 +62,6 @@
"type": "github"
}
},
- "flake-compat_2": {
- "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-utils": {
- "inputs": {
- "systems": "systems_2"
- },
- "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": "flake-compat_2",
- "nixpkgs-stable": [
- "nixpkgs"
- ],
- "nixpkgs-unstable": [
- "nixpkgs-unstable"
- ],
- "zig": "zig"
- },
- "locked": {
- "lastModified": 1736455421,
- "narHash": "sha256-TsDbQIHOi84hTjb0SSLSyX27P1MA1DVLagX8uik+WGk=",
- "owner": "ghostty-org",
- "repo": "ghostty",
- "rev": "6ef757a8f85db7a124d370378850339a899c9e65",
- "type": "github"
- },
- "original": {
- "owner": "ghostty-org",
- "repo": "ghostty",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -178,7 +119,6 @@
"inputs": {
"agenix": "agenix",
"flake-compat": "flake-compat",
- "ghostty": "ghostty",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
@@ -198,46 +138,6 @@
"repo": "default",
"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"
- }
- },
- "zig": {
- "inputs": {
- "flake-compat": [
- "ghostty"
- ],
- "flake-utils": "flake-utils",
- "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 3464037..ff0f11f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,16 +15,10 @@
inputs.home-manager.follows = "home-manager";
};
- ghostty = {
- url = "github:ghostty-org/ghostty";
- inputs.nixpkgs-stable.follows = "nixpkgs";
- inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
- };
-
flake-compat.url = "github:edolstra/flake-compat";
};
- outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, agenix, ghostty, home-manager, ... }:
+ outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, ... }:
let
system = "x86_64-linux";
@@ -64,10 +58,6 @@
}
agenix.nixosModules.default
-
- {
- environment.systemPackages = [ ghostty.packages.${system}.ghostty ];
- }
];
}
);
diff --git a/modules/common.nix b/modules/common.nix
index 0eb37d0..9628921 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -90,7 +90,7 @@
jdk maven gradle
nil nixfmt-rfc-style direnv
nixpkgs-review nixpkgs-fmt nixpkgs-lint-community
- helix alacritty
+ helix alacritty ghostty
androidStudioPackages.dev
winetricks bottles