Remove alacritty

the-nix-way · Dec 26, 2024 · b378e30 · b378e30
1 parent ce4adcf
commit b378e30
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 43 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,6 +5,8 @@
   inputs = {
     determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
     fh = { url = "https://flakehub.com/f/DeterminateSystems/fh/*"; inputs.nixpkgs.follows = "nixpkgs"; };
+    ghostty.url = "github:ghostty-org/ghostty";
+    ghostty-module.url = "github:clo4/ghostty-hm-module";
     jelly = { url = "github:lucperkins/jelly"; inputs.nixpkgs.follows = "nixpkgs"; };
     fenix = { url = "https://flakehub.com/f/nix-community/fenix/0.1.*"; inputs.nixpkgs.follows = "nixpkgs"; };
     flake-checker = { url = "https://flakehub.com/f/DeterminateSystems/flake-checker/*"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -71,6 +73,7 @@
         rev = inputs.self.rev or inputs.self.dirtyRev or null;
         fh = inputs.fh.packages.${system}.default;
         flake-checker = inputs.flake-checker.packages.${system}.default;
+        ghostty = inputs.ghostty.packages.${system}.default;
         jelly = inputs.jelly.packages.${system}.default;
         rustToolchain = with inputs.fenix.packages.${system};
           combine (with stable; [
@@ -99,6 +102,7 @@
           inherit pkgs;
           overlays = [
             inputs.nuenv.overlays.default
+            inputs.fenix.overlays.default
             inputs.self.overlays.default
           ];
         };
@@ -109,6 +113,7 @@
 
         home-manager = { pkgs, ... }: import ./home-manager {
           inherit pkgs stateVersion username;
+          ghosttyModule = inputs.ghostty-module.homeModules.default;
         };
       };
 

diff --git a/home-manager/alacritty.nix b/home-manager/alacritty.nix
diff --git a/home-manager/default.nix b/home-manager/default.nix
@@ -1,6 +1,7 @@
 { pkgs
 , stateVersion
 , username
+, ghosttyModule
 }:
 
 {
@@ -16,6 +17,7 @@
         shellAliases = (import ./aliases.nix { inherit pkgs; }).shell;
         inherit stateVersion username;
       };
+      imports = [ ghosttyModule ];
       programs = import ./programs.nix { inherit pkgs; };
     };
   };

diff --git a/home-manager/packages.nix b/home-manager/packages.nix
@@ -109,7 +109,7 @@ let
     cargo-edit
     cargo-machete
     cargo-watch
-    rust-analyzer
+    rust-analyzer-nightly
   ];
 
   scripts = with pkgs; [

diff --git a/home-manager/programs.nix b/home-manager/programs.nix
@@ -1,9 +1,6 @@
 { pkgs }:
 
 {
-  # Alternative terminal
-  alacritty = import ./alacritty.nix { inherit pkgs; };
-
   # Fancy replacement for cat
   bat = {
     enable = true;
@@ -57,6 +54,14 @@
   # GitHub CLI
   gh = import ./gh.nix { inherit pkgs; };
 
+  # Ghostty
+  ghostty = {
+    enable = true;
+    #package = pkgs.ghostty;
+    shellIntegration.enable = false;
+    shellIntegration.enableZshIntegration = true;
+  };
+
   # But of course
   git = import ./git.nix { inherit pkgs; };
 

diff --git a/home-manager/scripts/init.sh b/home-manager/scripts/init.sh
@@ -19,3 +19,5 @@ eval "$(go env)"
 
 # Specific to FlakeHub dev
 export ENVRC_USE_FLAKE="1"
+
+export CARGO_NET_GIT_FETCH_WITH_CLI="true"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,5 @@ eval "$(go env)"

		# Specific to FlakeHub dev
		export ENVRC_USE_FLAKE="1"

		export CARGO_NET_GIT_FETCH_WITH_CLI="true"