diff --git a/flake.lock b/flake.lock
index 04ea1e1..e181f4c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -134,11 +134,11 @@
"zig": "zig"
},
"locked": {
- "lastModified": 1737430029,
- "narHash": "sha256-z55IQogW9z4HhVeT55LlCUFKbYD5O5aLMnU5cX1WTto=",
+ "lastModified": 1737699693,
+ "narHash": "sha256-Rs8KNdInnmqs0YNWvvauYlf2XcnA4EIdmRggvQGjmUQ=",
"owner": "ghostty-org",
"repo": "ghostty",
- "rev": "5cb2fa6f7594202b12a2603bf32094aa75b1bf0e",
+ "rev": "fd8cacaa674c93fb86751e8030af2b202133939e",
"type": "github"
},
"original": {
@@ -157,11 +157,11 @@
]
},
"locked": {
- "lastModified": 1737301351,
- "narHash": "sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE=",
+ "lastModified": 1737465171,
+ "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f",
+ "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github"
},
"original": {
@@ -221,11 +221,11 @@
]
},
"locked": {
- "lastModified": 1737478403,
- "narHash": "sha256-e6PJI4Bd+QdpukHyd5F/fQY8fRUiNfCwvCRU8WXMSk8=",
+ "lastModified": 1737704314,
+ "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "96dee79b178d295b716052feca3ee46abc085abe",
+ "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7",
"type": "github"
},
"original": {
@@ -266,11 +266,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1737444129,
- "narHash": "sha256-RDwsCYHgjFf6iTi5JSfpOAnuQenDh8VFKU01XluVWM8=",
+ "lastModified": 1737701591,
+ "narHash": "sha256-S71nENrb8kBrEvihDD+1mzn5sRrRr1sAaNMkjWDx1h0=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "ac8238031094d5242da26947bfc7174369c12e33",
+ "rev": "c9248eec123e70ef1132bbedeae22e2af7011095",
"type": "github"
},
"original": {
@@ -282,11 +282,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1737414984,
- "narHash": "sha256-A1ITJgtOOwhSC5wB/jfBV9ZuAftroeYRYFqA+aFKgac=",
+ "lastModified": 1737675744,
+ "narHash": "sha256-2Q4SNciK6DHC5WknFSbk3aYjorayf9y4uz3tdtl/T1M=",
"owner": "neovim",
"repo": "neovim",
- "rev": "855a2a75e6f7d08376c221a46e0179e5c76176ec",
+ "rev": "8bc28978b632362ae658f8d4a6327e07a8b371b2",
"type": "github"
},
"original": {
@@ -349,11 +349,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1737299813,
- "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=",
+ "lastModified": 1737569578,
+ "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "107d5ef05c0b1119749e381451389eded30fb0d5",
+ "rev": "47addd76727f42d351590c905d9d1905ca895b82",
"type": "github"
},
"original": {
@@ -379,13 +379,29 @@
"type": "github"
}
},
+ "nixpkgs-unstable_2": {
+ "locked": {
+ "lastModified": 1737622296,
+ "narHash": "sha256-GWHH9ljsR0LR29IEruJnKVVk6veeQpo7kfolyDyCVGQ=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "055c50feaa548eadca66407630961b77f3ebb750",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixpkgs_2": {
"locked": {
- "lastModified": 1737370608,
- "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=",
+ "lastModified": 1737557748,
+ "narHash": "sha256-BaMuhctP1x00+8cBE2cJveJQb70/tWHI50MHj/ZrtOY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "300081d0cc72df578b02d914df941b8ec62240e6",
+ "rev": "606996d74f6e2a12635d41c1bf58bfc7ea3bb5ec",
"type": "github"
},
"original": {
@@ -397,16 +413,16 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1737370608,
- "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=",
+ "lastModified": 1737469691,
+ "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "300081d0cc72df578b02d914df941b8ec62240e6",
+ "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixpkgs-unstable",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -419,7 +435,8 @@
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_3",
- "nixpkgs-stable": "nixpkgs-stable_2"
+ "nixpkgs-stable": "nixpkgs-stable_2",
+ "nixpkgs-unstable": "nixpkgs-unstable_2"
}
},
"rust-overlay": {
@@ -481,11 +498,11 @@
]
},
"locked": {
- "lastModified": 1737103437,
- "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
+ "lastModified": 1737483750,
+ "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
+ "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 99e7a36..f72d553 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,8 @@
jujutsu.url = "github:dln/jj/openssh";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nix-index-database.url = "github:nix-community/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
@@ -32,6 +33,7 @@
self,
nix-index-database,
nixpkgs,
+ nixpkgs-unstable,
home-manager,
...
}:
@@ -52,7 +54,7 @@
mkHome =
modules:
home-manager.lib.homeManagerConfiguration {
- inherit pkgs;
+ pkgs = nixpkgs-unstable.legacyPackages.${system};
extraSpecialArgs = {
inherit inputs outputs;
};
diff --git a/home/common/ghostty.nix b/home/common/ghostty.nix
index 8635e63..76e4031 100644
--- a/home/common/ghostty.nix
+++ b/home/common/ghostty.nix
@@ -74,9 +74,9 @@
exec = ''
ghostty --class=com.mitchellh.ghostty-secondary --font-style="UltraCondensed" --font-style-bold="Bold UltraCondensed" --font-style-italic="UltraCondensed Oblique" -e bash
'';
- genericName = "Ghostty Secondary";
+ genericName = "Secondary Ghostty";
icon = "com.mitchellh.ghostty";
- name = "Ghostty Secondary";
+ name = "Secondary Ghostty";
settings = {
StartupWMClass = "com.mitchellh.ghostty-secondary";
TryExec = "ghostty";
@@ -112,9 +112,9 @@
exec = ''
ghostty --class=com.mitchellh.ghostty-devel-secondary --font-style="ExtraCondensed" --font-style-bold="Bold ExtraCondensed" --font-style-italic="ExtraCondensed Oblique" --command="ssh -t devel" --initial-command="ssh -t devel"
'';
- genericName = "Ghostty Secondary (devel)";
+ genericName = "Secondary Ghostty (devel)";
icon = "com.mitchellh.ghostty";
- name = "Ghostty Secondary (devel)";
+ name = "Secondary Ghostty (devel)";
settings = {
StartupWMClass = "com.mitchellh.ghostty-devel-secondary";
TryExec = "ghostty";