From 436928b187b114f35b289d9027c3bf3ac78cbb1b Mon Sep 17 00:00:00 2001 From: Sascha Koenig Date: Tue, 23 Dec 2025 09:25:17 +0100 Subject: [PATCH] flake update --- flake.lock | 64 +++++++++++++-------------- flake.nix | 1 - home/m3tam3re/home-server.nix | 13 ++++-- hosts/common/extraServices/ollama.nix | 8 ++-- hosts/m3-ares/configuration.nix | 2 +- hosts/m3-atlas/services/n8n.nix | 2 +- 6 files changed, 47 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index dbaf3ab..32d665d 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1765326679, - "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1765337252, - "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", + "lastModified": 1766387499, + "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", "owner": "nix-community", "repo": "home-manager", - "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", + "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", "type": "github" }, "original": { @@ -249,8 +249,8 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1765432513, - "narHash": "sha256-pUOV+WXo6eIMhsQi2RzEPUnSwp34guVhWjvhypeszlI=", + "lastModified": 1766477294, + "narHash": "sha256-lPOh0PpB/fmMsaBqaF1x/iJd68V6zmgKGARjgKBHPS4=", "path": "/home/m3tam3re/p/nix/nixpkgs", "type": "path" }, @@ -266,11 +266,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765423017, - "narHash": "sha256-ZXiMZWSet5gpnTGpc02JQHygDaaBwBEWzgUPx0YEm0c=", + "lastModified": 1766477099, + "narHash": "sha256-um/JKPgz0vn1dxIaaIU2VIl94IBHX5wHxqz5+P0cTw8=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "6a717d02c0ded2f96568da6a35ab74962cbbf807", + "rev": "fdae97a33784d617b7a8e45766daabf17d693d69", "type": "github" }, "original": { @@ -413,11 +413,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1765429017, - "narHash": "sha256-w0XQHkVx0qcWJRktzuerRSZZI/dQbuJiAFrQWEH4+lw=", + "lastModified": 1766476350, + "narHash": "sha256-JbSaOKi9jBGu1KG+BANYiocKsc+EI8Qb4MUKgtXnaTE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2b4ce9a00fcb6458016c1fd626f336970017ea0", + "rev": "48c44c67646d5a8c7c168e1ded8adf6fd8f3831b", "type": "github" }, "original": { @@ -429,11 +429,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764939437, - "narHash": "sha256-4TLFHUwXraw9Df5mXC/vCrJgb50CRr3CzUzF0Mn3CII=", + "lastModified": 1766399428, + "narHash": "sha256-vS6LSOMDOB3s+L6tqw9IGujxnmUAZQnEG+Vi640LayI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00d2457e2f608b4be6fe8b470b0a36816324b0ae", + "rev": "a6c3a6141ec1b367c58ead3f7f846c772a25f4e5", "type": "github" }, "original": { @@ -461,11 +461,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { @@ -477,11 +477,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1765270179, - "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", + "lastModified": 1766314097, + "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", + "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { @@ -547,11 +547,11 @@ ] }, "locked": { - "lastModified": 1765427325, - "narHash": "sha256-vJ/2MeUNpVjb2XoSZratGgSNi/6oHhoASUYRTA+8hI0=", + "lastModified": 1766476441, + "narHash": "sha256-IUN09o1u22yEv3YaLUq5BE9xvVNsqHRrINUTrZxxnwM=", "owner": "nix-community", "repo": "NUR", - "rev": "aa58652d7a8e7463aa2cc5ecf5096204b557efab", + "rev": "1a2c4782c53dccd364e404fc0eec7fddee46d815", "type": "github" }, "original": { @@ -683,11 +683,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9494076..59f6cb6 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,6 @@ hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; nix-colors.url = "github:misterio77/nix-colors"; - nix-ai-tools.url = "github:numtide/nix-ai-tools"; }; outputs = { diff --git a/home/m3tam3re/home-server.nix b/home/m3tam3re/home-server.nix index c11a86f..78f6e3d 100644 --- a/home/m3tam3re/home-server.nix +++ b/home/m3tam3re/home-server.nix @@ -81,12 +81,17 @@ programs.git = { enable = true; - userName = "m3tam3re"; - userEmail = "m@m3tam3re.com"; - aliases = {st = "status";}; - extraConfig = { + settings = { + user = { + name = "m3tm3re"; + email = "p@m3ta.dev"; + }; core.excludesfile = "~/.gitignore_global"; init.defaultBranch = "master"; + alias = { + st = "status"; + logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; + }; }; }; # programs.zellij-ps = { diff --git a/hosts/common/extraServices/ollama.nix b/hosts/common/extraServices/ollama.nix index bad2bb6..e61a337 100644 --- a/hosts/common/extraServices/ollama.nix +++ b/hosts/common/extraServices/ollama.nix @@ -12,12 +12,12 @@ in { config = mkIf cfg.enable { services.ollama = { enable = true; - acceleration = + package = if config.services.xserver.videoDrivers == ["amdgpu"] - then "rocm" + then pkgs.ollama-rocm else if config.services.xserver.videoDrivers == ["nvidia"] - then "cuda" - else null; + then pkgs.ollama-cuda + else pkgs.ollama-cpu; host = "[::]"; openFirewall = true; environmentVariables = { diff --git a/hosts/m3-ares/configuration.nix b/hosts/m3-ares/configuration.nix index d2cb4be..88b17ce 100644 --- a/hosts/m3-ares/configuration.nix +++ b/hosts/m3-ares/configuration.nix @@ -63,7 +63,7 @@ # Enable the GNOME Desktop Environment. # services.xserver.displayManager.gdm.enable = true; # services.xserver.desktopManager.gnome.enable = true; - displayManager.gdm.enable = true; + # displayManager.gdm.enable = true; # Configure keymap in X11 # services.xserver.xkb.layout = "us"; # services.xserver.xkb.options = "eurosign:e,caps:escape"; diff --git a/hosts/m3-atlas/services/n8n.nix b/hosts/m3-atlas/services/n8n.nix index af10765..a7bccc8 100644 --- a/hosts/m3-atlas/services/n8n.nix +++ b/hosts/m3-atlas/services/n8n.nix @@ -1,7 +1,7 @@ {config, ...}: { services.n8n = { enable = true; - webhookUrl = "https://wf.m3tam3re.com"; + environment.WEBHOOK_URL = "https://wf.m3tam3re.com"; }; systemd.services.n8n.serviceConfig = { EnvironmentFile = ["${config.age.secrets.n8n-env.path}"];