diff --git a/flake.lock b/flake.lock index f1d99dd..d7a70d0 100644 --- a/flake.lock +++ b/flake.lock @@ -217,15 +217,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1737394973, - "narHash": "sha256-EW4oXMfnfA5sNM9Jqm+y98horWVvN66Gu7YIcEpFYZc=", + "lastModified": 1737478403, + "narHash": "sha256-e6PJI4Bd+QdpukHyd5F/fQY8fRUiNfCwvCRU8WXMSk8=", "owner": "nix-community", "repo": "home-manager", - "rev": "9786661d57c476021c8a0c3e53bf9fa2b4f3328b", + "rev": "96dee79b178d295b716052feca3ee46abc085abe", "type": "github" }, "original": { @@ -298,7 +298,7 @@ "nix-index-database": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { @@ -411,22 +411,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "ghostty": "ghostty", @@ -434,7 +418,6 @@ "jujutsu": "jujutsu", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable_2" } diff --git a/flake.nix b/flake.nix index 35ccf56..6388658 100644 --- a/flake.nix +++ b/flake.nix @@ -17,33 +17,32 @@ ghostty.url = "github:ghostty-org/ghostty"; jujutsu.url = "github:dln/jj/openssh"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nix-index-database.url = "github:nix-community/nix-index-database"; - nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable"; }; outputs = inputs@{ self, nix-index-database, - nixpkgs, + nixpkgs-unstable, home-manager, ... }: let inherit (self) outputs; system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = nixpkgs-unstable.legacyPackages.${system}; mkHost = modules: - nixpkgs.lib.nixosSystem { + nixpkgs-unstable.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; diff --git a/home/common/ghostty.nix b/home/common/ghostty.nix index ba36fa3..9d44a86 100644 --- a/home/common/ghostty.nix +++ b/home/common/ghostty.nix @@ -108,7 +108,7 @@ "TerminalEmulator" ]; exec = '' - ghostty --class=com.mitchellh.ghostty-secondary --font-style="ExtraCondensed" --font-style-bold="Bold ExtraCondensed" --font-style-italic="ExtraCondensed Oblique" -e bash + ghostty --class=com.mitchellh.ghostty-secondary --font-style="UltraCondensed" --font-style-bold="Bold UltraCondensed" --font-style-italic="UltraCondensed Oblique" -e bash ''; genericName = "Ghostty Secondary"; icon = "com.mitchellh.ghostty";