wip

hosts/common/features/networking.nix

@@ -9,7 +9,7 @@
 
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
     openFirewall = true;
   };
 

hosts/common/features/wayland.nix

@@ -1,12 +1,22 @@
 { inputs, pkgs, ... }:
 {
-  environment.systemPackages = [
-    pkgs.wl-clipboard
+  environment.systemPackages = with pkgs; [
+    wl-clipboard
+    hyprland
   ];
 
   # thumbnail support for images
   services.tumbler.enable = true;
 
+  environment.etc."xdg/wayland-sessions/hyprland.desktop".text = ''
+    [Desktop Entry]
+    Name=Hyprland
+    Comment=Hyprland Wayland Compositor
+    Exec=Hyprland
+    Type=Application
+    DesktopNames=Hyprland
+  '';
+
   nix.settings = {
     substituters = [ "https://hyprland.cachix.org" ];
     trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];

hosts/common/features/x11.nix

@@ -16,28 +16,26 @@ in
     autoRepeatDelay = 250;
     autoRepeatInterval = 30;
   };
-  # services.xserver.displayManager.sessionPackages = [ hyprland-session ];
+  services.displayManager.sessionPackages = with pkgs; [
+    hyprland
+  ];
 
-  # services.xserver.windowManager.gnome.enable = true;
-  # services.xserver.windowManager.gnome.wayland = false;
-  # hardware.opengl.enable = true;
-  #
-  # environment.systemPackages = with pkgs; [
-  #   xorg.xhost
-  #   xorg.xrandr
-  #   xorg.xinit
-  #   gnome-session
-  #   gnome-shell
-  # ];
-  #
-  # xdg = {
-  #   portal = {
-  #     enable = true;
-  #   };
-  # };
+  services.desktopManager = {
+    gnome.enable = true;
+  };
+  services.xserver.windowManager = {
+    # gnome.enable = true;
+    i3 = {
+      enable = true;
+      extraPackages = with pkgs; [
+        dmenu
+        i3status
+      ];
+    };
+  };
+  programs.i3lock.enable = true;
 
   services.displayManager.gdm.enable = true;
-  services.desktopManager.gnome.enable = true;
   programs.dconf.enable = true;
   services = {
     sysprof.enable = true;

hosts/desktop/default.nix

@@ -34,9 +34,9 @@
 
   programs.zsh.enable = true;
 
-  environment.variables = {
-    GDK_SCALE = 2;
-  };
+  # environment.variables = {
+  #   GDK_SCALE = 2;
+  # };
 
   users.users.naps62 = {
     isNormalUser = true;