Merge branch 'worktree-docker-gui-fix'

This commit is contained in:
2026-07-28 09:59:40 +10:00
+5 -5
View File
@@ -1,6 +1,10 @@
{ config, pkgs, lib, inputs, vars, ... }: { config, pkgs, lib, inputs, vars, ... }:
{ {
imports = [
../docker/enable-service.nix
];
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
docker = prev.docker_29; docker = prev.docker_29;
@@ -8,10 +12,6 @@
}) })
]; ];
imports = [
../docker/enable-service.nix
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inputs.nixos-conf-editor.packages.${pkgs.stdenv.hostPlatform.system}.nixos-conf-editor inputs.nixos-conf-editor.packages.${pkgs.stdenv.hostPlatform.system}.nixos-conf-editor
nodejs nodejs
@@ -29,7 +29,7 @@
]; ];
boot.loader.grub.useOSProber = true; boot.loader.grub.useOSProber = true;
programs.direnv.enable = true; programs.direnv.enable = true;
services = { services = {
xserver = { xserver = {
enable = true; enable = true;