feat: changed some shit up

nixos/default.nix

@@ -75,11 +75,6 @@ in {
         inherit
           (modules)
           hyprland
-          geoclue2
-          greetd
-          swaylock
-          thunar
-          wayland
           ;
       };
     };

nixos/modules/environment.nix

@@ -5,6 +5,7 @@
       inherit
         (pkgs)
         git
+        grim
         pijul
         sshfs
         tomb
@@ -19,6 +20,10 @@
       WLR_DRM_NO_ATOMIC = "1";
       NIXPKGS_ALLOW_INSECURE = "1";
       NIXPKGS_ALLOW_UNFREE = "1";
+      FLAMESHOT_ENABLE_WAYLAND = "1";
+      USE_WAYLAND_GRIM = "1";
+      USE_WAYLAND_CLIPBOARD = "1";
+      GTK_THEME = "catppuccin-macchiato-mauve-compact";
     };
   };
 }

nixos/modules/hyprland.nix

@@ -1,17 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  programs.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-    # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-  };
-  xdg.portal = {
-    enable = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ];
-  };
-}

nixos/modules/hyprland/default.nix

@@ -0,0 +1,17 @@
+{
+  imports =
+    map
+    (file: ./${file}.nix)
+    [
+      "geoclue2"
+      "greetd"
+      "network"
+      "hypridle"
+      "hyprland"
+      "hyprlock"
+      "regreet"
+      # "swaylock"
+      "thunar"
+      "wayland"
+    ];
+}

nixos/modules/hyprland/hypridle.nix

@@ -0,0 +1,10 @@
+{
+  flake,
+  pkgs,
+  ...
+}: {
+  services.hypridle = {
+    enable = true;
+    package = flake.inputs.hypridle.packages.${pkgs.system}.hypridle;
+  };
+}

nixos/modules/hyprland/hyprland.nix

@@ -0,0 +1,27 @@
+{
+  pkgs,
+  flake,
+  ...
+}: {
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
+    package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
+  };
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+    ];
+  };
+  nix = {
+    settings = {
+      substituters = [
+        "https://hyprland.cachix.org"
+      ];
+      trusted-public-keys = [
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      ];
+    };
+  };
+}

nixos/modules/hyprland/hyprlock.nix

@@ -0,0 +1,10 @@
+{
+  flake,
+  pkgs,
+  ...
+}: {
+  programs.hyprlock = {
+    enable = true;
+    package = flake.inputs.hyprlock.packages.${pkgs.system}.hyprlock;
+  };
+}

nixos/modules/hyprland/regreet.nix

@@ -0,0 +1,43 @@
+{
+  pkgs,
+  flake,
+  ...
+}: let
+  inherit (flake.config.aesthetics.themes.theme) font;
+in {
+  programs.regreet = {
+    enable = true;
+    package = pkgs.greetd.regreet;
+    # font = {
+    #   name = font;
+    #   size = 11;
+    #   package = builtins.attrValues {
+    #     inherit
+    #       (pkgs.nerd-fonts)
+    #       monaspace
+    #       ;
+    #   };
+    # };
+    theme = {
+      name = "catppuccin-macchiato-mauve-compact";
+      package = pkgs.catppuccin-gtk.override {
+        size = "compact";
+        variant = "macchiato";
+        accents = [
+          "mauve"
+        ];
+      };
+    };
+    cursorTheme = {
+      name = "catppuccin-macchiato-dark-cursors";
+      package = pkgs.catppuccin-cursors.macchiatoDark;
+    };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.catppuccin-papirus-folders.override {
+        flavor = "macchiato";
+        accent = "mauve";
+      };
+    };
+  };
+}

nixos/modules/hyprland/wayland.nix

@@ -8,7 +8,7 @@
       extraPortals = builtins.attrValues {
         inherit
           (pkgs)
-          xdg-desktop-portal-hyprland
+          # xdg-desktop-portal-hyprland
           xdg-desktop-portal-wlr
           xdg-desktop-portal-kde
           xdg-desktop-portal-gtk

nixos/modules/nix.nix

@@ -21,10 +21,8 @@
     };
     settings = {
       substituters = [
-        "https://hyprland.cachix.org"
       ];
       trusted-public-keys = [
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       ];
     };
   };

nixos/modules/regreet.nix

@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  programs.regreet = {
-    enable = true;
-    package = pkgs.greetd.regreet;
-  };
-}