From b3f6cad3e2fafeef8405834f819e8baf658f827c Mon Sep 17 00:00:00 2001 From: m3ta-chiron Date: Mon, 28 Sep 2026 18:14:50 +0200 Subject: [PATCH] chore: bump m3ta-home (dms require detection fix) --- flake.lock | 8 +++--- hosts/common/users/m3tam3re.nix | 2 +- hosts/m3-ares/configuration.nix | 3 +++ hosts/m3-ares/services/default.nix | 2 -- hosts/m3-ares/services/greetd.nix | 38 ---------------------------- hosts/m3-kratos/configuration.nix | 3 ++- hosts/m3-kratos/services/default.nix | 4 +-- hosts/m3-kratos/services/greetd.nix | 38 ---------------------------- 8 files changed, 11 insertions(+), 87 deletions(-) delete mode 100644 hosts/m3-ares/services/greetd.nix delete mode 100644 hosts/m3-kratos/services/greetd.nix diff --git a/flake.lock b/flake.lock index d516d9f..f378b55 100644 --- a/flake.lock +++ b/flake.lock @@ -761,11 +761,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1790317192, - "narHash": "sha256-4heG9h4htsN5cOSqClVIXneRwpTD9qfO7DV4zptwEfQ=", + "lastModified": 1790611994, + "narHash": "sha256-cO4pI7T9EgH5Ow/2GKCpSqqCdRCjHn4+d3ndJDB08dU=", "ref": "refs/heads/master", - "rev": "a660e920b6061c4268d0738e6626dcf9f32e67b8", - "revCount": 140, + "rev": "2e75be49f49e93201876e9688d64abe4c79514e4", + "revCount": 142, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, diff --git a/hosts/common/users/m3tam3re.nix b/hosts/common/users/m3tam3re.nix index bd23954..4f5c6b6 100644 --- a/hosts/common/users/m3tam3re.nix +++ b/hosts/common/users/m3tam3re.nix @@ -88,7 +88,6 @@ desktop = { wm = { hyprland.enable = true; - rofi.enable = true; wayland.enable = true; dms.enable = true; }; @@ -120,6 +119,7 @@ profiles.gaming = { steam.enable = true; gamescope.enable = true; + emulators.enable = true; }; profiles.media = { obs.enable = true; diff --git a/hosts/m3-ares/configuration.nix b/hosts/m3-ares/configuration.nix index 8d0662c..869d1a4 100644 --- a/hosts/m3-ares/configuration.nix +++ b/hosts/m3-ares/configuration.nix @@ -61,6 +61,9 @@ # services.xserver.displayManager.gdm.enable = true; # services.xserver.desktopManager.gnome.enable = true; # displayManager.gdm.enable = true; + + # No display manager — keyring unlocks at TTY login instead. + security.pam.services.login.enableGnomeKeyring = true; # Configure keymap in X11 # services.xserver.xkb.layout = "us"; # services.xserver.xkb.options = "eurosign:e,caps:escape"; diff --git a/hosts/m3-ares/services/default.nix b/hosts/m3-ares/services/default.nix index 8f9f82c..e3615c9 100644 --- a/hosts/m3-ares/services/default.nix +++ b/hosts/m3-ares/services/default.nix @@ -1,7 +1,6 @@ {pkgs, ...}: { imports = [ ./containers - ./greetd.nix ./netbird.nix #./n8n.nix ./mem0.nix @@ -48,6 +47,5 @@ userServices = true; }; }; - displayManager.gdm.enable = true; }; } diff --git a/hosts/m3-ares/services/greetd.nix b/hosts/m3-ares/services/greetd.nix deleted file mode 100644 index a675ad4..0000000 --- a/hosts/m3-ares/services/greetd.nix +++ /dev/null @@ -1,38 +0,0 @@ -# greetd login manager for m3-kratos (replaces broken GDM on nixos-unstable). -# Uses tuigreet as the greeter, launching Hyprland after authentication. -{ - pkgs, - config, - lib, - ... -}: let - tuigreet = "${lib.getExe pkgs.tuigreet}"; - # Use start-hyprland wrapper to avoid Hyprland startup warnings - # withUWSM=true is set in programs.nix; start-hyprland handles this correctly - hyprlandCmd = "${config.programs.hyprland.package}/bin/start-hyprland"; -in { - services.greetd = { - enable = true; - - settings = { - default_session = { - user = "greeter"; - # Minimal config: verified supported flags only - # The --time and --remember are tested; power commands omitted - # to avoid potential quoting/parsing issues - command = builtins.concatStringsSep " " [ - tuigreet - "--time" - "--remember" - "--asterisks" - "--cmd ${hyprlandCmd}" - ]; - }; - }; - }; - - # Required for --remember to persist username between logins - systemd.tmpfiles.rules = [ - "d /var/cache/tuigreet 0755 greeter greeter - -" - ]; -} diff --git a/hosts/m3-kratos/configuration.nix b/hosts/m3-kratos/configuration.nix index 36d6ea9..5b496b0 100644 --- a/hosts/m3-kratos/configuration.nix +++ b/hosts/m3-kratos/configuration.nix @@ -21,7 +21,8 @@ boot.initrd.kernelModules = ["amdgpu"]; services.xserver.videoDrivers = ["amdgpu"]; security.polkit.enable = true; - security.pam.services.gdm.enableGnomeKeyring = true; + # No display manager — keyring unlocks at TTY login instead. + security.pam.services.login.enableGnomeKeyring = true; networking.hostName = "m3-kratos"; # Define your hostname. networking.hostId = "458bd616"; # networking.extraHosts = '' diff --git a/hosts/m3-kratos/services/default.nix b/hosts/m3-kratos/services/default.nix index b703ec1..4e13146 100644 --- a/hosts/m3-kratos/services/default.nix +++ b/hosts/m3-kratos/services/default.nix @@ -1,9 +1,8 @@ {pkgs, ...}: { imports = [ ./containers - # ./greetd.nix # ./mem0.nix - ./n8n.nix + # ./n8n.nix ./netbird.nix ./postgres.nix ./sound.nix @@ -30,6 +29,5 @@ userServices = true; }; }; - displayManager.gdm.enable = true; }; } diff --git a/hosts/m3-kratos/services/greetd.nix b/hosts/m3-kratos/services/greetd.nix deleted file mode 100644 index a675ad4..0000000 --- a/hosts/m3-kratos/services/greetd.nix +++ /dev/null @@ -1,38 +0,0 @@ -# greetd login manager for m3-kratos (replaces broken GDM on nixos-unstable). -# Uses tuigreet as the greeter, launching Hyprland after authentication. -{ - pkgs, - config, - lib, - ... -}: let - tuigreet = "${lib.getExe pkgs.tuigreet}"; - # Use start-hyprland wrapper to avoid Hyprland startup warnings - # withUWSM=true is set in programs.nix; start-hyprland handles this correctly - hyprlandCmd = "${config.programs.hyprland.package}/bin/start-hyprland"; -in { - services.greetd = { - enable = true; - - settings = { - default_session = { - user = "greeter"; - # Minimal config: verified supported flags only - # The --time and --remember are tested; power commands omitted - # to avoid potential quoting/parsing issues - command = builtins.concatStringsSep " " [ - tuigreet - "--time" - "--remember" - "--asterisks" - "--cmd ${hyprlandCmd}" - ]; - }; - }; - }; - - # Required for --remember to persist username between logins - systemd.tmpfiles.rules = [ - "d /var/cache/tuigreet 0755 greeter greeter - -" - ]; -}