diff --git a/devices.nix b/devices.nix index 56fe308..0a9535e 100644 --- a/devices.nix +++ b/devices.nix @@ -42,7 +42,7 @@ in inherit (self.homeConfigurations) muede; }; distributedBuilds = { - isBuilder = true; + isBuilder = false; speedFactor = 14; hostPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHGKoZ68wwyVRmPB0SkvpJUyUMDWeFbC5Je9zukyEOh7"; clientPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAbojdhb3PfazSRmudvo381Y+zUFVLMa7AbWbfK/Zp2 muede-lpt2-nix-builds"; diff --git a/flake.lock b/flake.lock index d2e231e..80a671a 100644 --- a/flake.lock +++ b/flake.lock @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1785119570, - "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", + "lastModified": 1784350909, + "narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", + "rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3", "type": "github" }, "original": { @@ -380,11 +380,11 @@ ] }, "locked": { - "lastModified": 1785139861, - "narHash": "sha256-Ua1nyDpMgWdC6wIx8Damb+5itPw1XdBgH85mKtJhZa8=", + "lastModified": 1785067862, + "narHash": "sha256-kPwrauWi/wPpcxM4la3/WEfKwY8VChIK/Wl3CpWLYSs=", "ref": "refs/heads/main", - "rev": "80650041d91c6126125e9c73da33a585d32d3bd1", - "revCount": 2965, + "rev": "2cab121b359096f0957459dcd0b2a051af76eedd", + "revCount": 2924, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -478,11 +478,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1785133905, - "narHash": "sha256-cXE11IuEJe+Oqk+gnNIxUSfHW+ekrc8Mx48pNv0RvuI=", + "lastModified": 1784874881, + "narHash": "sha256-u4jhSIf/Un0qZB+Cn3hTTaHSI20XeAxYbA5o4faqdJs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "81b9856c2f1f5a425e5048219c0899cb48c52d3f", + "rev": "ef7a2a3d719af46b906c22a3ebfb7d65627b2cd2", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1785123958, - "narHash": "sha256-aA8MsHUcw/s65gGVhp1B/0OdnFIQDqnWXdL4g5UIAjs=", + "lastModified": 1784949765, + "narHash": "sha256-MB+0noLfsYMoMsBkyG5CKYZmSk7dSXendvvjfQFUiPw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "bced02518f7bfc62084db783c19e527541a44b53", + "rev": "242a696abba55b45d577b5292e90b597284f5f85", "type": "github" }, "original": { @@ -661,11 +661,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1785110946, - "narHash": "sha256-WWuWxmXKzGZWryswWlijP3Mjp6aGy4Ngmeil5nGMMjk=", + "lastModified": 1784872115, + "narHash": "sha256-THPEF2po0fsoH8gNtp+Ae0XFDJH3N/ol7xO3v6VMTJU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3498f786f97ac0bded21b34bae0bf3809b45aa3", + "rev": "335f0738cb2fa9708f3f428e39d2eae975d1338d", "type": "github" }, "original": { @@ -677,11 +677,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1785104993, - "narHash": "sha256-eKbrvPoAOFutbYMdbB3r5EQVmFxKv24iKqHPPUXA0gM=", + "lastModified": 1784856561, + "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8623c4c20aa4ca2f5fb81510d2944066c3fb0d96", + "rev": "597283ad8aa0b331c788e97c4c262d58877074ef", "type": "github" }, "original": { @@ -722,11 +722,11 @@ ] }, "locked": { - "lastModified": 1785138165, - "narHash": "sha256-JMQ1L59Z4M0KPKou9gS+rbYYhGEXIGtdPTX0kbbRx2o=", + "lastModified": 1785018925, + "narHash": "sha256-gxWMwgvV6W6V9PhfP1VmjYvzcdBd8Hcdt7LCFNYz7uY=", "owner": "nix-community", "repo": "NUR", - "rev": "15544328ef656ca54155e43fc73fb664e5b993c8", + "rev": "2e7a3ed8ee1f4f6a73eb697c21a6422317b61f25", "type": "github" }, "original": { @@ -1089,11 +1089,11 @@ ] }, "locked": { - "lastModified": 1785098705, - "narHash": "sha256-rRlSmihiLwPR3S7gtCo4a+UiiMQGrPpq+yMkWNgP7k8=", + "lastModified": 1784973633, + "narHash": "sha256-LisflXdXS3fOx576sahf3Shn88fYX0cOp58Ek3g28ag=", "owner": "vibec0re", "repo": "trollshell", - "rev": "e8b47086000b15177fdad316010613e1d05634d9", + "rev": "b032b5d50ee3ad539965ff4077485e67f84b92c8", "type": "github" }, "original": { diff --git a/homeConfigurations/muede/trollshell.nix b/homeConfigurations/muede/trollshell.nix index a039b25..38360aa 100644 --- a/homeConfigurations/muede/trollshell.nix +++ b/homeConfigurations/muede/trollshell.nix @@ -4,6 +4,5 @@ enable = true; weather.fallbackCity = "Berlin"; cliphist.enable = true; - stats.layout = "split"; }; } diff --git a/nixosModules/gnome.nix b/nixosModules/gnome.nix index 7debe99..6aed659 100644 --- a/nixosModules/gnome.nix +++ b/nixosModules/gnome.nix @@ -13,6 +13,20 @@ config = lib.mkIf config.my.gnome.enable ( lib.mkMerge [ { + # Workaround for GDM 50 + NixOS 26.05: greeter PAM session strips PATH so + # gdm-wayland-session can't find `gnome-session` and exits 70. + # https://github.com/NixOS/nixpkgs/issues/523332 — drop once #523948 lands. + # security.pam.services.gdm-launch-environment.rules.session.env-greeter = { + # control = "required"; + # modulePath = "${config.security.pam.package}/lib/security/pam_env.so"; + # settings.conffile = pkgs.writeText "gdm-launch-environment-env-conf" '' + # PATH DEFAULT="''${PATH}:${pkgs.gnome-session}/bin" + # XDG_DATA_DIRS DEFAULT="''${XDG_DATA_DIRS}:/run/current-system/sw/share" + # ''; + # settings.readenv = 0; + # order = 12200; + # }; + services = { xserver.excludePackages = [ pkgs.xterm ]; @@ -34,7 +48,6 @@ tinysparql.enable = false; localsearch.enable = false; sushi.enable = true; - gnome-browser-connector.enable = false; }; };