diff --git a/flake.lock b/flake.lock index a4d0caf..09594a7 100644 --- a/flake.lock +++ b/flake.lock @@ -160,6 +160,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -308,6 +326,7 @@ "nix-github-actions": { "inputs": { "nixpkgs": [ + "sqlfmt", "poetry2nix", "nixpkgs" ] @@ -403,6 +422,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1717394157, + "narHash": "sha256-xI6YE/VM1w5DQKxPK6VSEdV4JOx72LWIWx8+fV424L4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "518daacfe2ee732432b4a7dac19b72eda037d44d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -433,12 +468,13 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nix-github-actions": "nix-github-actions", "nixpkgs": [ + "sqlfmt", "nixpkgs" ], - "systems": "systems_3", + "systems": "systems_4", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -465,8 +501,8 @@ "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", - "poetry2nix": "poetry2nix", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "sqlfmt": "sqlfmt" } }, "sops-nix": { @@ -490,6 +526,28 @@ "type": "github" } }, + "sqlfmt": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix" + }, + "locked": { + "dir": "sqlfmt", + "lastModified": 1717438253, + "narHash": "sha256-esXZz2AE95t/D8lptEVORys0g68wVuIrFrqmdXsSbXI=", + "ref": "refs/heads/master", + "rev": "5d1d966349841b18d7933843ed96a5a4fb300075", + "revCount": 1, + "type": "git", + "url": "https://git.bitlab21.com/sam/flake-packages?dir=sqlfmt" + }, + "original": { + "dir": "sqlfmt", + "type": "git", + "url": "https://git.bitlab21.com/sam/flake-packages?dir=sqlfmt" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -521,6 +579,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -558,6 +631,7 @@ "treefmt-nix_2": { "inputs": { "nixpkgs": [ + "sqlfmt", "poetry2nix", "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 7d08100..ef35c23 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,9 @@ # Nixpkgs nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + # Import personal packages repo + sqlfmt.url = "git+https://git.bitlab21.com/sam/flake-packages?dir=sqlfmt"; + # Home manager home-manager = { url = "github:nix-community/home-manager"; diff --git a/hosts/common/users/sam/default.nix b/hosts/common/users/sam/default.nix index 0548e85..827f255 100644 --- a/hosts/common/users/sam/default.nix +++ b/hosts/common/users/sam/default.nix @@ -66,5 +66,6 @@ in }; environment.systemPackages = [ + inputs.sqlfmt.packages.x86_64-linux.sqlfmt ]; }