use upstream hyprland and greetd

system/global/home.nix

@@ -67,29 +67,145 @@
     { event = "lock"; command = "${pkgs.swaylock}/bin/swaylock"; }
   ];
 
+  wayland.windowManager.hyprland = {
+    enable = true;
+    systemdIntegration = true;
+    # https://wiki.hyprland.org/Configuring/Variables/
+    extraConfig = ''
+      env = GDK_BACKEND,wayland,x11
+      env = QT_QPA_PLATFORM,wayland;xcb
+      env = SDL_VIDEODRIVER,wayland
+      env = CLUTTER_BACKEND,wayland
+      env = XDG_CURRENT_DESKTOP,Hyprland
+      env = XDG_SESSION_TYPE,wayland
+      env = XDG_SESSION_DESKTOP,Hyprland
+      env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+      env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+      env = NIXOS_OZONE_WL,1
+
+      input {
+        kb_layout = gb
+        kb_options = caps:escape
+
+	touchpad {
+          natural_scroll = yes
+          scroll_factor = 0.5
+	}
+      }
+
+      bind = SUPER, RETURN,  exec, foot
+      bind = SUPER_SHIFT, Q, killactive,
+      bind = SUPER_SHIFT, E, exit,
+      bind = SUPER, d,       exec, wofi --show drun
+      bind = SUPER, Z,       exec, swaylock -f
+      bind = SUPER, M,       exec, foot -e ncmpcpp
+      bind = SUPER, E,       exec, foot -e neomutt
+      bind = SUPER, O,       exec, pcmanfm
+
+      bind = SUPER, h, movefocus,l
+      bind = SUPER, l, movefocus,r
+
+      bindm = SUPER, mouse:272, movewindow
+      bindm = SUPER, mouse:273, resizewindow
+
+      bind = SUPER, j,     layoutmsg,cyclenext
+      bind = SUPER, k,     layoutmsg,cycleprev
+      bind = SUPER, space, layoutmsg,swapwithmaster
+      bind = SUPER, F,     fullscreen,
+      bind = SUPER, V,     togglefloating,
+
+      bind = SUPER_SHIFT, P, exec,~/.local/scripts/bwmenu
+      bind = SUPER_SHIFT, S, exec,~/.local/scripts/screenshot
+
+      bind =,XF86AudioRaiseVolume,  exec,amixer sset Master 5%+ && amixer sset Master unmute
+      bind =,XF86AudioLowerVolume,  exec,amixer sset Master 5%-
+      bind =,XF86AudioPlay,         exec,~/.local/scripts/play-pause
+      bind =,XF86AudioNext,         exec,playerctl next
+      bind =,XF86AudioPrev,         exec,playerctl previous
+      bind =,XF86MonBrightnessUp,   exec,~/.local/scripts/brightness-up
+      bind =,XF86MonBrightnessDown, exec,~/.local/scripts/brightness-down
+
+      bind = SUPER,1,workspace,1
+      bind = SUPER,2,workspace,2
+      bind = SUPER,3,workspace,3
+      bind = SUPER,4,workspace,4
+      bind = SUPER,5,workspace,5
+      bind = SUPER,6,workspace,6
+      bind = SUPER,7,workspace,7
+      bind = SUPER,8,workspace,8
+      bind = SUPER,9,workspace,9
+      bind = SUPER,0,workspace,10
+
+      bind = SUPER_SHIFT,1,movetoworkspace,1
+      bind = SUPER_SHIFT,2,movetoworkspace,2
+      bind = SUPER_SHIFT,3,movetoworkspace,3
+      bind = SUPER_SHIFT,4,movetoworkspace,4
+      bind = SUPER_SHIFT,5,movetoworkspace,5
+      bind = SUPER_SHIFT,6,movetoworkspace,6
+      bind = SUPER_SHIFT,7,movetoworkspace,7
+      bind = SUPER_SHIFT,8,movetoworkspace,8
+      bind = SUPER_SHIFT,9,movetoworkspace,9
+      bind = SUPER_SHIFT,0,movetoworkspace,10
+
+      gestures {
+        workspace_swipe = yes
+      }
+
+      decoration {
+        rounding = 5
+        blur = 0
+      }
+
+      bezier=overshot, 0.05, 0.9, 0.1, 1.1
+      animations {
+        enabled = 1
+        animation = windows,    1, 5, default
+        animation = border,     1, 5, default
+        animation = fade,       1, 10,default
+        animation = workspaces, 1, 3, overshot
+      }
+      
+      general {
+        resize_on_border = yes
+        layout = master
+      }
+    '';
+  };
   programs.waybar.enable = true;
   programs.waybar.settings = {
     mainBar = {
       layer = "top";
       position = "top";
-      height = 30;
+      height = 36;
       modules-left = [ "wlr/taskbar" "hyprland/window" ];
-      modules-right = [ "mpd" "pulseaudio" "clock" "tray" ];
+      modules-right = [ "mpris" "wireplumber" "clock" "tray" ];
       clock = {
         format = "📅 {:%a %b-%d %I:%M %p}";
       };
-      pulseaudio = {
+      wireplumber = {
         format-muted = "🔇 {volume}%";
         format = "{icon} {volume}";
         format-icons.default = ["🔈" "🔉" "🔊"];
         on-click = "pavucontrol";
       };
-      mpd = {
-        server = "192.168.1.2";
-        on-click = "foot -e ncmpcpp";
+      mpris = {
+        format= "{player_icon} {title}";
+        format-paused= "{status_icon} {title}";
+        player-icons = {
+          default = "▶️";
+          mpv = "🎵";
+        };
+        status-icons = {
+          paused = "⏸️";
+        };
+        on-click = "~/.local/scripts/play-pause";
       };
     };
   };
+  programs.waybar.systemd = {
+    enable = true;
+    target = "hyprland-session.target";
+  };
 
   services.udiskie = {
     enable = true;
@@ -123,6 +239,8 @@
     bindings = [
       { key = "j"; command = "scroll_down"; }
       { key = "k"; command = "scroll_up"; }
+      { key = "l"; command = "select_item"; }
+      { key = "k"; command = "scroll_up"; }
       { key = "J"; command = [ "select_item" "scroll_down" ]; }
       { key = "K"; command = [ "select_item" "scroll_up" ]; }
     ];
@@ -192,8 +310,8 @@
     };
   };
 
-  services.nextcloud-client.enable = true;
-  services.nextcloud-client.startInBackground = true;
+  # services.nextcloud-client.enable = true;
+  # services.nextcloud-client.startInBackground = true;
 
   programs.rbw = {
     enable = true;

system/global/system.nix

@@ -40,17 +40,16 @@
 
   i18n.defaultLocale = "en_GB.UTF-8";
 
-  # Configure graphical stuff
-  services.xserver = {
-    enable = true;
-    layout = "gb";
-    libinput.enable = true;
+  services.xserver.layout = "gb";
 
-    # the only display manager that works?
-    displayManager.gdm.enable = true;
-    displayManager.autoLogin = {
-      enable = true;
-      user = "tristan";
+  services.greetd = {
+    enable = true;
+    settings = rec {
+      initial_session = {
+        command = "Hyprland";
+        user = "tristan";
+      };
+      default_session = initial_session;
     };
   };
 
@@ -78,7 +77,7 @@
   };
   
   environment.shellAliases = {
-    code = "codium --ozone-platform=wayland";
+    code = "codium";
   };
 
   environment.systemPackages = with pkgs; [