cyberbox: add greetd for hikari, remove X.org

3 files changed, 29 insertions, 14 deletions

diff --git a/abbenay/configuration.nix b/abbenay/configuration.nix
index 2aabaa7..deed080 100644
--- a/abbenay/configuration.nix
+++ b/abbenay/configuration.nix
@@ -10,6 +10,9 @@
   services.avahi.nssmdns = true;
 
   services.xserver = {
+    enable = true;
+    layout = "de";
+    xkbOptions = "eurosign:e,caps:escape";
     displayManager.gdm.enable = true;
     desktopManager.gnome.enable = true;
   };
diff --git a/common/desktop.nix b/common/desktop.nix
index 10c16ea..f7d6b8f 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -32,9 +32,9 @@
   hardware.pulseaudio.enable = true;
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
-  services.xserver.layout = "de";
-  services.xserver.xkbOptions = "eurosign:e,caps:escape";
+  # services.xserver.enable = true;
+  # services.xserver.layout = "de";
+  # services.xserver.xkbOptions = "eurosign:e,caps:escape";
 
   users.mutableUsers = false;
   users.defaultUserShell = pkgs.fish;
diff --git a/cyberbox/configuration.nix b/cyberbox/configuration.nix
index 7bac46a..8e36ed0 100644
--- a/cyberbox/configuration.nix
+++ b/cyberbox/configuration.nix
@@ -42,27 +42,39 @@
 
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  # services.xserver.enable = true;
 
   # entrypoint for emacs configured with home-manager
   # (must be available on the user's $PATH)
-  services.xserver.windowManager.session = pkgs.lib.singleton {
-    name = "exwm";
-    start = "emacs -l ${pkgs.writeText "emacs-exwm-load" ''
-      (require 'exwm-config)
-      (exwm-config-default)
-      (defvar inexwm t)
-    ''}";
+  # services.xserver.windowManager.session = pkgs.lib.singleton {
+  #   name = "exwm";
+  #   start = "emacs -l ${pkgs.writeText "emacs-exwm-load" ''
+  #     (require 'exwm-config)
+  #     (exwm-config-default)
+  #     (defvar inexwm t)
+  #   ''}";
+  # };
+
+  services.greetd = {
+    enable = true;
+    settings.default_session = {
+      command = "hikari -c ~/hikari.conf";
+      user = "stuebinm";
+    };
+    restart = false;
   };
-
-
+  hardware.opengl.enable = true;
+  fonts.enableDefaultFonts = true;
+  programs.xwayland.enable = false;
+  # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
+  # xdf.portal.enable = true;
 
   # Enable sound.
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
+  # services.xserver.libinput.enable = true;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions