From dc8d08342da19bf43672638203636e908e64b20f Mon Sep 17 00:00:00 2001 From: "sascha.koenig" Date: Wed, 29 Oct 2025 11:21:37 +0100 Subject: [PATCH] flake update --- flake.lock | 74 ++++---- home/features/desktop/coding.nix | 165 +++++++++++------- home/features/desktop/hyprland.nix | 1 - home/features/desktop/office.nix | 1 + home/features/desktop/wayland.nix | 1 - home/jannik.mueller/home.nix | 20 ++- home/sascha.koenig/home.nix | 20 ++- hosts/AZLT124-L/configuration.nix | 2 +- hosts/common/extraServices/virtualisation.nix | 10 -- overlays/default.nix | 2 +- 10 files changed, 162 insertions(+), 134 deletions(-) diff --git a/flake.lock b/flake.lock index 72a73de..88c8e23 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1758687491, - "narHash": "sha256-sy8Q+MfBe+MZzYj4MJwBDe4lkLnmhy1POO86hWZgqO8=", + "lastModified": 1761645416, + "narHash": "sha256-wTQzbbQ6XHtvNJVuhJj+ytZDRyNtwUKbrIfIvMvKNfQ=", "owner": "numtide", "repo": "blueprint", - "rev": "7ecaeb70f63d14a397c73b38f57177894bb795c8", + "rev": "633af1961cae8e02bc6195e6e599a6b09bf75217", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -229,11 +229,11 @@ ] }, "locked": { - "lastModified": 1759711004, - "narHash": "sha256-B39NxeKCnK3DJlmJKIts6njcXcVVASLUChDNmRl4dxQ=", + "lastModified": 1761666354, + "narHash": "sha256-fHr+tIYBJccNF8QWqgowfRmEAtAMSt1deZIRNKL8A7c=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f4021da5d2bb5ea7cb782ff413ecb7062066820", + "rev": "ca2ab1d877a24d5a437dad62f56b8b2c02e964e9", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759661061, - "narHash": "sha256-LAd1fNNIL19HrOm1cVeoKP5v8si932HsX1ZDwJh9O8o=", + "lastModified": 1760467504, + "narHash": "sha256-KzUZPZxIF6FmQW/Zpt8NtbPQ4lnkj/jdBYqBw5xE1L0=", "ref": "refs/heads/master", - "rev": "27d92a238ba9b9df117680c2080e082a2732bfc5", - "revCount": 7, + "rev": "a5f30c83b37d3171d5a8c1d2daf2c46829e04803", + "revCount": 9, "type": "git", "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1759718309, - "narHash": "sha256-ciD2siuGn9iI6Kp4eIWcFwy8neop39GNfzHMXPygsEA=", + "lastModified": 1761709005, + "narHash": "sha256-HELoO4tW6ledgLoSumCFlbA97BMyh7LlcOfbo4iOx0c=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "11f67f2bd1c839ba5c907bb919508816879dab35", + "rev": "02c480ceac8d9f62208c9d6419c6eb2384e7532d", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1759222546, - "narHash": "sha256-NqwPJ95lhBNnMqkEFFQB3zaD7rCSBaGwX/MhykTbEno=", + "lastModified": 1760107790, + "narHash": "sha256-7zuh0xtYZnfyibIRCiK4KthXNZIV/9pa7wSjNJUV3Qk=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "5d57604924b1c63efd87b8552f9685aec45c792d", + "rev": "25d23ef77d2c54ad1c08caafee022834265804dc", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -490,11 +490,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "type": "github" }, "original": { @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1759724112, - "narHash": "sha256-42DBBV0eLlIHwu+xNX0xNcoFCX7hqkKjAs5kgxZZi/w=", + "lastModified": 1761715485, + "narHash": "sha256-ft0Vvc30pxutYfbksBf+2uJGiooU7KMhMpxh9oIR/s4=", "owner": "nix-community", "repo": "NUR", - "rev": "af3cd64344dd497054e393e288bdb32cc9621e7f", + "rev": "d1ab8d590333242385ad525489dc8ffa3ffb3168", "type": "github" }, "original": { @@ -610,11 +610,11 @@ ] }, "locked": { - "lastModified": 1758728421, - "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", + "lastModified": 1761311587, + "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", + "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", "type": "github" }, "original": { diff --git a/home/features/desktop/coding.nix b/home/features/desktop/coding.nix index 5b25c81..075eec7 100644 --- a/home/features/desktop/coding.nix +++ b/home/features/desktop/coding.nix @@ -12,103 +12,134 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ + nur.repos.charmbracelet.crush bruno filezilla insomnia + opencode ]; programs.zed-editor = { enable = true; userSettings = { - features = { - inline_prediction_provider = "zed"; - edit_prediction_provider = "zed"; - copilot = false; - }; - telemetry = { - metrics = false; - }; - lsp = { - rust_analyzer = { - binary = {path_lookup = true;}; - }; - }; - languages = { - Nix = { - language_servers = ["nixd"]; - formatter = { - external = { - command = "alejandra"; - arguments = ["-q" "-"]; - }; - }; - }; - Python = { - language_servers = ["pyrefly"]; - formatter = { - external = { - command = "black"; - arguments = ["-"]; - }; - }; - }; - }; - lsp = { - "pyrefly" = { - command = { - path = "pyrefly"; - args = ["--lsp"]; - env = {}; - }; - settings = {}; + agent_servers = { + your_agent = { + command = "path_to_executable"; + args = []; + env = {}; }; }; + auto_update = false; + buffer_font_family = "FiraCode Nerd Font"; + buffer_font_size = 16; context_servers = { - "some-context-server" = { - command = { - path = "some-command"; - args = ["arg-1" "arg-2"]; - env = {}; - }; + browsermcp = { + source = "custom"; + enabled = true; + command = "npx"; + args = ["@browsermcp/mcp@latest"]; + }; + some-context-server = { + source = "custom"; + command = "some-command"; + args = ["arg-1" "arg-2"]; + env = {}; settings = {}; }; }; - assistant = { - version = "2"; - default_model = { - provider = "anthropic"; - model = "Claude 3.7 Sonnet"; - }; + features = { + copilot = false; + edit_prediction_provider = "zed"; + inline_prediction_provider = "zed"; }; + format_on_save = "on"; language_models = { - anthropic = { - version = "1"; - api_url = "https://api.anthropic.com"; + openai_compatible = { + AZ = { + api_url = "https://llm.az-gruppe.com"; + available_models = [ + { + name = "claude-4-5-sonnet"; + display_name = null; + max_tokens = 200000; + max_output_tokens = 32000; + max_completion_tokens = 200000; + capabilities = { + tools = true; + images = false; + parallel_tool_calls = false; + prompt_cache_key = false; + }; + } + ]; + }; }; - openai = { - version = "1"; - api_url = "https://api.openai.com/v1"; + anthropic = { + api_url = "https://api.anthropic.com"; }; ollama = { api_url = "http://localhost:11434"; }; + openai = { + api_url = "https://api.openai.com/v1"; + }; }; + languages = { + Nix = { + formatter = { + external = { + arguments = ["-q" "-"]; + command = "alejandra"; + }; + }; + language_servers = ["nixd"]; + }; + Python = { + formatter = { + external = { + arguments = ["-"]; + command = "black"; + }; + }; + language_servers = ["pyrefly"]; + }; + }; + load_direnv = "shell_hook"; + lsp = { + pyrefly = { + command = { + args = ["--lsp"]; + env = {}; + path = "pyrefly"; + }; + settings = {}; + }; + rust_analyzer = { + binary = { + path_lookup = true; + }; + }; + }; + show_edit_predictions = true; ssh_connections = [ { + args = ["-i" "~/.ssh/m3tam3re"]; host = "152.53.85.162"; nickname = "m3-atlas"; - args = ["-i" "~/.ssh/m3tam3re"]; } ]; - auto_update = false; - format_on_save = "on"; - vim_mode = true; - load_direnv = "shell_hook"; + telemetry = { + metrics = false; + }; theme = "Dracula"; - buffer_font_family = "FiraCode Nerd Font"; ui_font_size = 16; - buffer_font_size = 16; - show_edit_predictions = true; + vim_mode = true; + agent = { + default_model = { + model = "Claude 3.7 Sonnet"; + provider = "anthropic"; + }; + }; }; }; }; diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index 421de69..55170c7 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -50,7 +50,6 @@ in { "hypridle" "wl-paste --type text --watch cliphist store" # Stores only text data "wl-paste --type image --watch cliphist store" # Stores only image data "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\"" - "xwaylandvideobridge" ]; env = [ diff --git a/home/features/desktop/office.nix b/home/features/desktop/office.nix index 9244a32..4ff9d12 100644 --- a/home/features/desktop/office.nix +++ b/home/features/desktop/office.nix @@ -12,6 +12,7 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ + anytype evince libreoffice-fresh xournalpp diff --git a/home/features/desktop/wayland.nix b/home/features/desktop/wayland.nix index e6b674a..17169fe 100644 --- a/home/features/desktop/wayland.nix +++ b/home/features/desktop/wayland.nix @@ -14,7 +14,6 @@ in { grim hyprcursor hyprlock - kdePackages.xwaylandvideobridge nwg-displays nwg-look qt6.qtwayland diff --git a/home/jannik.mueller/home.nix b/home/jannik.mueller/home.nix index 81a5902..266a4ae 100644 --- a/home/jannik.mueller/home.nix +++ b/home/jannik.mueller/home.nix @@ -44,20 +44,23 @@ programs.git = { enable = true; - difftastic.enable = true; - userName = "jannik.mueller"; - userEmail = "jannik.mueller@azintec.com"; - aliases = { - st = "status"; - logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; - }; - extraConfig = { + settings = { + user = { + name = "jannik.mueller"; + email = "jannik.mueller@azintec.com"; + }; core.excludesfile = "~/.gitignore_global"; init.defaultBranch = "master"; pull.rebase = false; }; + aliases = { + 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.difftastic.enable = true; + programs.jujutsu = { enable = true; settings = { @@ -102,6 +105,7 @@ }; programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = { "git.az-gruppe.com" = { hostname = "152.53.186.119"; diff --git a/home/sascha.koenig/home.nix b/home/sascha.koenig/home.nix index 9fe314f..fc1d070 100644 --- a/home/sascha.koenig/home.nix +++ b/home/sascha.koenig/home.nix @@ -44,20 +44,23 @@ programs.git = { enable = true; - difftastic.enable = true; - userName = "sascha.koenig"; - userEmail = "sascha.koenig@azintec.com"; - aliases = { - st = "status"; - logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; - }; - extraConfig = { + settings = { + user = { + name = "sascha.koenig"; + email = "sascha.koenig@azintec.com"; + }; core.excludesfile = "~/.gitignore_global"; init.defaultBranch = "master"; pull.rebase = false; }; + aliases = { + 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.difftastic.enable = true; + programs.jujutsu = { enable = true; settings = { @@ -102,6 +105,7 @@ }; programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = { "git.az-gruppe.com" = { hostname = "152.53.186.119"; diff --git a/hosts/AZLT124-L/configuration.nix b/hosts/AZLT124-L/configuration.nix index 517390a..2aa4e56 100644 --- a/hosts/AZLT124-L/configuration.nix +++ b/hosts/AZLT124-L/configuration.nix @@ -14,7 +14,7 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.initrd.kernelModules = ["amdgpu" "hid_asus"]; - boot.kernelPackages = pkgs.linuxPackages_6_16; + boot.kernelPackages = pkgs.linuxPackages_6_17; boot.extraModprobeConfig = '' options hid_asus enable_touchpad=1 ''; diff --git a/hosts/common/extraServices/virtualisation.nix b/hosts/common/extraServices/virtualisation.nix index f9dcd85..e5b67e1 100644 --- a/hosts/common/extraServices/virtualisation.nix +++ b/hosts/common/extraServices/virtualisation.nix @@ -17,16 +17,6 @@ in { package = pkgs.qemu_kvm; runAsRoot = true; swtpm.enable = true; - ovmf = { - enable = true; - packages = [ - (pkgs.OVMF.override { - secureBoot = true; - tpmSupport = true; - }) - .fd - ]; - }; }; }; }; diff --git a/overlays/default.nix b/overlays/default.nix index f0cb062..fcabd9b 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -3,7 +3,7 @@ additions = final: prev: (import ../pkgs {pkgs = final;}) // { - crush = inputs.nix-ai-tools.packages.${prev.system}.crush; + #crush = inputs.nix-ai-tools.packages.${prev.system}.crush; }; # This one contains whatever you want to overlay