diff --git a/flake.lock b/flake.lock index 0a7908a..18083c3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,47 @@ { "nodes": { + "alex-lib": { + "inputs": { + "alex-utils": "alex-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769444523, + "narHash": "sha256-V3XO/kz0HiC0Y3SRF7L00/wIuHbZgW0scMMRmla3+Gc=", + "ref": "refs/heads/main", + "rev": "9aa030a1b1a9b372aec7d473ebeb34fdee4b637e", + "revCount": 27, + "type": "git", + "url": "https://git.sr.ht/~sposito/Alexandria" + }, + "original": { + "type": "git", + "url": "https://git.sr.ht/~sposito/Alexandria" + } + }, + "alex-utils": { + "inputs": { + "nixpkgs": [ + "alex-lib", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768599245, + "narHash": "sha256-ooS9LXab+NLlNQlY3CNQqL/DdXIPTaF8gpphFOdbyfM=", + "ref": "refs/heads/main", + "rev": "e77ca47ba7ce0bbbb142b00a0318884a20b78f29", + "revCount": 27, + "type": "git", + "url": "https://git.sr.ht/~sposito/alex-utils" + }, + "original": { + "type": "git", + "url": "https://git.sr.ht/~sposito/alex-utils" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -189,6 +231,7 @@ }, "root": { "inputs": { + "alex-lib": "alex-lib", "home-manager": "home-manager", "icons": "icons", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index a7a5326..6755438 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,11 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + + alex-lib ={ + url = "git+https://git.sr.ht/~sposito/Alexandria"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/home-manager/release-25.11"; @@ -76,6 +81,7 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux; extraSpecialArgs = { inherit inputs outputs; + alex-lib = inputs.alex-lib; icons = inputs.icons; sops = inputs.sops-nix; secrets = inputs.secrets; @@ -88,6 +94,7 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux; extraSpecialArgs = { inherit inputs outputs; + alex-lib = inputs.alex-lib; icons = inputs.icons; sops = inputs.sops-nix; secrets = inputs.secrets; diff --git a/home-manager/home.nix b/home-manager/home.nix index 0c871a8..a8d5c0f 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -3,11 +3,13 @@ lib, inputs, sops, + alex-lib, ... }: let + system = "x86_64-linux"; pkgsUnstable = import inputs.nixpkgs-unstable { - system = "x86_64-linux"; + inherit system; config.allowUnfree = true; config.allowUnfreePredicate = pkg: @@ -18,6 +20,7 @@ let "vscode" ]; }; + alpkgs = alex-lib.packages.${system}; in { imports = [ @@ -48,13 +51,17 @@ in home = { homeDirectory = "/home/thiago"; packages = with pkgs; [ + alpkgs.antifennel + alpkgs.fennel + alpkgs.fnlfmt + alpkgs.fennel-ls + alpkgs.luajit cmake pkgsUnstable.code-cursor pkgsUnstable.cursor-cli direnv distrobox fd - fennel-ls fira-code firefox glow @@ -64,9 +71,7 @@ in inkscape keymapp lazygit - luajit lua-language-server - luajitPackages.fennel luajitPackages.luacheck nerd-fonts.fira-code nil diff --git a/home-manager/services/default.nix b/home-manager/services/default.nix index 2332aca..40a5a8e 100644 --- a/home-manager/services/default.nix +++ b/home-manager/services/default.nix @@ -6,3 +6,4 @@ } + diff --git a/hosts/common/users/thiago/default.nix b/hosts/common/users/thiago/default.nix index 2309871..5bd8739 100644 --- a/hosts/common/users/thiago/default.nix +++ b/hosts/common/users/thiago/default.nix @@ -31,7 +31,7 @@ in (builtins.fetchurl { url = "https://meta.sr.ht/~sposito.keys"; name = "sposito-srht-keys"; - sha256 = "1mf76x36kd1iaccy6l5f5xnbjqkm1fwf9giws9nb3bvgmj3c25wc"; + sha256 = "1a0qcpbdkmdhnhhqvcmf6rq7zmjap6kxiwrcmmgs0fbhrlcyhkmi"; }) ];