diff --git a/cmd/planterette/build.nix b/cmd/planterette/build.nix index b5c5080..13f3144 100644 --- a/cmd/planterette/build.nix +++ b/cmd/planterette/build.nix @@ -215,15 +215,14 @@ stdenv.mkDerivation { # create binary cache closureInfo="${ closureInfo { - rootPaths = - [ - homeManagerConfiguration.activationPackage - launcher - ] - ++ optionals gpu [ - mesaWrappers - nixGL - ]; + rootPaths = [ + homeManagerConfiguration.activationPackage + launcher + ] + ++ optionals gpu [ + mesaWrappers + nixGL + ]; } }" echo "copying application paths..." diff --git a/flake.lock b/flake.lock index f7df8c0..ffed1e9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1748665073, - "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "lastModified": 1753479839, + "narHash": "sha256-E/rPVh7vyPMJUFl2NAew+zibNGfVbANr8BP8nLRbLkQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "rev": "0b9bf983db4d064764084cd6748efb1ab8297d1e", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749024892, - "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { diff --git a/nixos.nix b/nixos.nix index bae7d72..511cfbd 100644 --- a/nixos.nix +++ b/nixos.nix @@ -82,7 +82,8 @@ in own = [ "${id}.*" "org.mpris.MediaPlayer2.${id}.*" - ] ++ ext.own; + ] + ++ ext.own; inherit (ext) call broadcast; }; @@ -175,27 +176,26 @@ in auto_etc = true; cover = [ "/var/run/nscd" ]; - symlink = + symlink = [ + [ + "*/run/current-system" + "/run/current-system" + ] + ] + ++ optionals (isGraphical && config.hardware.graphics.enable) ( [ [ - "*/run/current-system" - "/run/current-system" + config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument + "/run/opengl-driver" ] ] - ++ optionals (isGraphical && config.hardware.graphics.enable) ( + ++ optionals (app.multiarch && config.hardware.graphics.enable32Bit) [ [ - [ - config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument - "/run/opengl-driver" - ] + config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver-32"."L+".argument + /run/opengl-driver-32 ] - ++ optionals (app.multiarch && config.hardware.graphics.enable32Bit) [ - [ - config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver-32"."L+".argument - /run/opengl-driver-32 - ] - ] - ); + ] + ); }; }; diff --git a/package.nix b/package.nix index bf35e06..8bd5d92 100644 --- a/package.nix +++ b/package.nix @@ -83,18 +83,17 @@ buildGoModule rec { # nix build environment does not allow acls env.GO_TEST_SKIP_ACL = 1; - buildInputs = - [ - libffi - libseccomp - acl - wayland - ] - ++ (with xorg; [ - libxcb - libXau - libXdmcp - ]); + buildInputs = [ + libffi + libseccomp + acl + wayland + ] + ++ (with xorg; [ + libxcb + libXau + libXdmcp + ]); nativeBuildInputs = [ pkg-config @@ -130,17 +129,16 @@ buildGoModule rec { } ''; - passthru.targetPkgs = - [ - go - gcc - xorg.xorgproto - util-linux + passthru.targetPkgs = [ + go + gcc + xorg.xorgproto + util-linux - # for go generate - wayland-protocols - wayland-scanner - ] - ++ buildInputs - ++ nativeBuildInputs; + # for go generate + wayland-protocols + wayland-scanner + ] + ++ buildInputs + ++ nativeBuildInputs; } diff --git a/test/sandbox/case/device.nix b/test/sandbox/case/device.nix index f879f0c..1c31116 100644 --- a/test/sandbox/case/device.nix +++ b/test/sandbox/case/device.nix @@ -173,13 +173,6 @@ in } null; } null; ".local" = fs "800001ed" { - share = fs "800001ed" { - dbus-1 = fs "800001ed" { - services = fs "800001ed" { - "ca.desrt.dconf.service" = fs "80001ff" null null; - } null; - } null; - } null; state = fs "800001ed" { ".keep" = fs "80001ff" null ""; home-manager = fs "800001ed" { gcroots = fs "800001ed" { current-home = fs "80001ff" null null; } null; } null; diff --git a/test/sandbox/case/mapuid.nix b/test/sandbox/case/mapuid.nix index f5e3b4d..d235d51 100644 --- a/test/sandbox/case/mapuid.nix +++ b/test/sandbox/case/mapuid.nix @@ -199,13 +199,6 @@ in } null; } null; ".local" = fs "800001ed" { - share = fs "800001ed" { - dbus-1 = fs "800001ed" { - services = fs "800001ed" { - "ca.desrt.dconf.service" = fs "80001ff" null null; - } null; - } null; - } null; state = fs "800001ed" { ".keep" = fs "80001ff" null ""; home-manager = fs "800001ed" { gcroots = fs "800001ed" { current-home = fs "80001ff" null null; } null; } null; diff --git a/test/sandbox/case/pdlike.nix b/test/sandbox/case/pdlike.nix index 01b5fe1..3ec23d7 100644 --- a/test/sandbox/case/pdlike.nix +++ b/test/sandbox/case/pdlike.nix @@ -200,13 +200,6 @@ in } null; } null; ".local" = fs "800001ed" { - share = fs "800001ed" { - dbus-1 = fs "800001ed" { - services = fs "800001ed" { - "ca.desrt.dconf.service" = fs "80001ff" null null; - } null; - } null; - } null; state = fs "800001ed" { ".keep" = fs "80001ff" null ""; home-manager = fs "800001ed" { gcroots = fs "800001ed" { current-home = fs "80001ff" null null; } null; } null; diff --git a/test/sandbox/case/preset.nix b/test/sandbox/case/preset.nix index 78b1ea9..7d006cc 100644 --- a/test/sandbox/case/preset.nix +++ b/test/sandbox/case/preset.nix @@ -199,13 +199,6 @@ in } null; } null; ".local" = fs "800001ed" { - share = fs "800001ed" { - dbus-1 = fs "800001ed" { - services = fs "800001ed" { - "ca.desrt.dconf.service" = fs "80001ff" null null; - } null; - } null; - } null; state = fs "800001ed" { ".keep" = fs "80001ff" null ""; home-manager = fs "800001ed" { gcroots = fs "800001ed" { current-home = fs "80001ff" null null; } null; } null; diff --git a/test/sandbox/case/tty.nix b/test/sandbox/case/tty.nix index 2ddb54a..9da0d35 100644 --- a/test/sandbox/case/tty.nix +++ b/test/sandbox/case/tty.nix @@ -200,13 +200,6 @@ in } null; } null; ".local" = fs "800001ed" { - share = fs "800001ed" { - dbus-1 = fs "800001ed" { - services = fs "800001ed" { - "ca.desrt.dconf.service" = fs "80001ff" null null; - } null; - } null; - } null; state = fs "800001ed" { ".keep" = fs "80001ff" null ""; home-manager = fs "800001ed" { gcroots = fs "800001ed" { current-home = fs "80001ff" null null; } null; } null;