From 1bf5f5c4ed8b4b64f8d4b7bee1682582dee10cbf Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 2 Jan 2025 10:32:40 -0500 Subject: [PATCH] latest --- flake.lock | 138 ++++++++++++++++++++++++++++++++++++++++++----- flake.nix | 3 +- hosts/fwbook.nix | 2 + 3 files changed, 130 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index c2deee4..1fe5c31 100644 --- a/flake.lock +++ b/flake.lock @@ -50,6 +50,22 @@ } }, "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-compat_3": { "flake": false, "locked": { "lastModified": 1717312683, @@ -65,6 +81,45 @@ "type": "github" } }, + "flake-utils": { + "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": "flake-compat", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1735595376, + "narHash": "sha256-vs9XVWzbdkvoMair896NaT/RlXR5kr5pUM1cTghZ2YI=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "d512f5600543250dd510acd0e9da4a7582e3ff8c", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -372,11 +427,13 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ + "unstable" + ], + "nixpkgs-stable": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -426,6 +483,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -441,31 +514,31 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", - "owner": "NixOS", + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.11", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1734379367, @@ -483,6 +556,7 @@ }, "root": { "inputs": { + "ghostty": "ghostty", "home-manager": "home-manager", "hyprland": "hyprland", "nix-darwin": "nix-darwin", @@ -490,7 +564,7 @@ "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "systems": "systems", + "systems": "systems_2", "unstable": "unstable", "unstable-home-manager": "unstable-home-manager" } @@ -531,6 +605,21 @@ "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" + } + }, "unstable": { "locked": { "lastModified": 1734622375, @@ -608,6 +697,31 @@ "repo": "xdg-desktop-portal-hyprland", "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 b1a0903..5d4f67a 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,8 @@ # Cosmic nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + inputs.nixpkgs.follows = "unstable"; }; # Hyprland hyprland = { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index ecb1dae..146856c 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -141,11 +141,13 @@ in "auth.me.internal" "me.internal" "me.local" + "api.me.internal" ]; "127.0.0.1" = [ "auth.me.internal" "me.internal" "me.local" + "api.me.internal" ]; }; }