From e39c2a165eb6af1509427c51bfe003ddd3ed80cc Mon Sep 17 00:00:00 2001 From: "Adrian G L (aider)" Date: Mon, 1 Dec 2025 14:42:39 +0100 Subject: [PATCH] fix: resolve NixOS and Home Manager deprecation warnings --- home/git.nix | 2 +- home/sshconfig.nix | 5 ++++- home/zed.nix | 4 ++-- hosts/legolas/configuration.nix | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/home/git.nix b/home/git.nix index cd7abaa..98f112b 100644 --- a/home/git.nix +++ b/home/git.nix @@ -7,7 +7,7 @@ { programs.git = { enable = true; - extraConfig = { + settings = { pull.rebase = true; push.autoSetupRemote = true; color.ui = "auto"; diff --git a/home/sshconfig.nix b/home/sshconfig.nix index 8cd3671..9537176 100644 --- a/home/sshconfig.nix +++ b/home/sshconfig.nix @@ -17,10 +17,13 @@ programs.ssh = { enable = true; - compression = true; + # compression moved to matchBlocks."*" + # Default config is deprecated, disabling it and managing defaults manually if needed + enableDefaultConfig = false; matchBlocks = { "*" = { + compression = true; identityFile = [ "~/.ssh/nixos" "~/.ssh/id_ed25519" diff --git a/home/zed.nix b/home/zed.nix index ae417e7..115595e 100644 --- a/home/zed.nix +++ b/home/zed.nix @@ -9,7 +9,7 @@ home.packages = with pkgs; [ nodejs - copilot-language-server-fhs + copilot-language-server github-copilot-cli nixd nodejs-slim @@ -22,7 +22,7 @@ extraPackages = with pkgs; [ nodejs - copilot-language-server-fhs + copilot-language-server github-copilot-cli nixd nodejs-slim diff --git a/hosts/legolas/configuration.nix b/hosts/legolas/configuration.nix index a6004c9..06c3b96 100644 --- a/hosts/legolas/configuration.nix +++ b/hosts/legolas/configuration.nix @@ -67,7 +67,7 @@ enableSSHSupport = true; }; - services.xserver.desktopManager.gnome.enable=true; + services.desktopManager.gnome.enable=true; # This option defines the first version of NixOS you have installed on this particular machine,