diff --git a/flake.lock b/flake.lock index 3b75863..9297f0b 100644 --- a/flake.lock +++ b/flake.lock @@ -54,31 +54,16 @@ "type": "github" } }, - "flake-utils": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1643933104, - "narHash": "sha256-NZPuFxRsZKN8pjRuHPpzlMyt6JQhcjiduBG8bMghSjE=", + "lastModified": 1645140957, + "narHash": "sha256-WTJzLSCDLBI537o2L/3kRyqEV5YRT7+1QSGryeKReHE=", "owner": "nix-community", "repo": "home-manager", - "rev": "63dccc4e60422c1db2c3929b2fd1541f36b7e664", + "rev": "4f4165a8b9108818ab0193bbd1a252106870b2a2", "type": "github" }, "original": { @@ -91,6 +76,25 @@ "inputs": { "nixpkgs": "nixpkgs_5" }, + "locked": { + "lastModified": 1639947939, + "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", + "owner": "nmattia", + "repo": "naersk", + "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653", + "type": "github" + }, + "original": { + "owner": "nmattia", + "ref": "master", + "repo": "naersk", + "type": "github" + } + }, + "naersk_2": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, "locked": { "lastModified": 1639947939, "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", @@ -136,11 +140,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1643653624, - "narHash": "sha256-+8hLMsQrZ2rkvcEtEId6HMe8GPxVb5ga+Vh1fdsqJDU=", + "lastModified": 1645013224, + "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a529f0c125a78343b145a8eb2b915b0295e4f459", + "rev": "b66b39216b1fef2d8c33cc7a5c72d8da80b79970", "type": "github" }, "original": { @@ -150,11 +154,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1643805626, - "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { @@ -166,11 +170,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1640418986, - "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=", + "lastModified": 1645013224, + "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2", + "rev": "b66b39216b1fef2d8c33cc7a5c72d8da80b79970", "type": "github" }, "original": { @@ -215,6 +219,7 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs_4", "utils": "utils_2", + "xe-mara": "xe-mara", "xe-printerfacts": "xe-printerfacts" } }, @@ -235,11 +240,11 @@ }, "utils_2": { "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -263,11 +268,40 @@ "type": "github" } }, + "xe-mara": { + "inputs": { + "naersk": "naersk", + "nixpkgs": [ + "nixpkgs" + ], + "utils": [ + "utils" + ] + }, + "locked": { + "lastModified": 1645298635, + "narHash": "sha256-GoFca0/3oXLBmxqXLQr8DLTNe7qu53+TIZFfodscw9o=", + "ref": "main", + "rev": "e10236c47b7f0d8ac61c16b0858fce95c8ca237c", + "revCount": 7, + "type": "git", + "url": "https://tulpa.dev/Xe/mara.git" + }, + "original": { + "ref": "main", + "type": "git", + "url": "https://tulpa.dev/Xe/mara.git" + } + }, "xe-printerfacts": { "inputs": { - "flake-utils": "flake-utils", - "naersk": "naersk", - "nixpkgs": "nixpkgs_6", + "flake-utils": [ + "utils" + ], + "naersk": "naersk_2", + "nixpkgs": [ + "nixpkgs" + ], "xess": "xess" }, "locked": { diff --git a/flake.nix b/flake.nix index b1ebab3..758f07c 100644 --- a/flake.nix +++ b/flake.nix @@ -9,11 +9,20 @@ utils.url = "github:numtide/flake-utils"; # my apps - xe-printerfacts.url = "git+https://tulpa.dev/cadey/printerfacts.git?ref=main"; + xe-printerfacts = { + url = "git+https://tulpa.dev/cadey/printerfacts.git?ref=main"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "utils"; + }; + xe-mara = { + url = "git+https://tulpa.dev/Xe/mara.git?ref=main"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.utils.follows = "utils"; + }; }; - outputs = - { self, nixpkgs, deploy-rs, home-manager, agenix, xe-printerfacts, ... }: + outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, xe-printerfacts + , xe-mara, ... }: let pkgs = nixpkgs.legacyPackages."x86_64-linux"; mkSystem = extraModules: @@ -33,6 +42,7 @@ ./common xe-printerfacts.nixosModules."${system}".printerfacts + xe-mara.nixosModules."${system}" ] ++ extraModules; }; in { diff --git a/hosts/chrysalis/default.nix b/hosts/chrysalis/default.nix index 3ae36fa..bb7e310 100644 --- a/hosts/chrysalis/default.nix +++ b/hosts/chrysalis/default.nix @@ -49,5 +49,7 @@ addresses = true; }; }; + + within.services.mara-bot.enable = true; }