diff --git a/flake.lock b/flake.lock index 85adfcc..3cac47b 100644 --- a/flake.lock +++ b/flake.lock @@ -76,6 +76,25 @@ "type": "github" } }, + "herdr": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1793278609, + "narHash": "sha256-0B58jR/v1vxbK7cwoq++SnOCsED0sHDkgqVMvsrjezE=", + "owner": "herdrdev", + "repo": "herdr", + "rev": "ee5bfb5041bb3e4a49d591c72308aae3c81ecdde", + "type": "github" + }, + "original": { + "owner": "herdrdev", + "repo": "herdr", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -100,7 +119,7 @@ "hyprcursor-rose-pine": { "inputs": { "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -206,6 +225,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1779911860, + "narHash": "sha256-ubcLAcKBDCZjhxw/kH5DL5GdBZQdzLqpkTe7HonvJVs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c0a89c379b4ac67c7b13b051ddbd4e0dbc9b0eaf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -221,7 +256,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1790920529, "narHash": "sha256-nQyFkMR78WP6PiXKkDW2SjqzLf/spQqjRuxRGSbcV8k=", @@ -237,7 +272,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1790822859, "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=", @@ -253,7 +288,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1790185690, "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", @@ -272,7 +307,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1791104861, @@ -292,14 +327,36 @@ "inputs": { "agenix": "agenix", "emacs-overlay": "emacs-overlay", + "herdr": "herdr", "home-manager": "home-manager", "hyprcursor-rose-pine": "hyprcursor-rose-pine", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", "zen-browser": "zen-browser" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "herdr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1783577481, + "narHash": "sha256-EWMxOWrJ031f8f/lrcEmhTRs4npw1/5N3Hcjin846c8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "4cdea398dc491b082dccdce0fad1ed0b75fa3394", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1689347949, @@ -350,7 +407,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1790843023, diff --git a/flake.nix b/flake.nix index 0d9e62d..d5e190a 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,9 @@ # - More stuff ------------------------------- zen-browser.url = "github:youwen5/zen-browser-flake"; + # - Herdr ------------------------------------- + herdr.url = "github:herdrdev/herdr"; + }; outputs = inputs @ { self, nixpkgs, home-manager, ... }: diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix index 10b6d1a..89c6ca1 100644 --- a/hosts/reykjavik/default.nix +++ b/hosts/reykjavik/default.nix @@ -95,6 +95,10 @@ in dev.docker.enable = true; dev.docker.users = ["marc"]; + # - AI --------------------------------------- + ai.claude.enable = true; + ai.herdr.enable = true; + # - Other apps ------------------------------- app.anki.enable = true; app.spotify.enable = true; diff --git a/modules/dev/claude.nix b/modules/ai/claude.nix similarity index 60% rename from modules/dev/claude.nix rename to modules/ai/claude.nix index ceb260f..5486d4a 100644 --- a/modules/dev/claude.nix +++ b/modules/ai/claude.nix @@ -1,15 +1,15 @@ { config, lib, pkgs, ... }: let - cfg = config.samfelag.modules.dev.claude; + cfg = config.samfelag.modules.ai.claude; in { - options.samfelag.modules.dev.claude = with lib.types; { + options.samfelag.modules.ai.claude = with lib.types; { enable = lib.mkEnableOption "claude"; }; config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ - claude + claude-code ]; }; } diff --git a/modules/ai/herdr.nix b/modules/ai/herdr.nix new file mode 100644 index 0000000..80fb5ff --- /dev/null +++ b/modules/ai/herdr.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, inputs, system, ... }: + +let + cfg = config.samfelag.modules.ai.herdr; +in +{ + options.samfelag.modules.ai.herdr = with lib.types; { + enable = lib.mkEnableOption "herdr"; + }; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ + inputs.herdr.packages.${system}.default + ]; + }; +}