feat: switched back to hyprland

nixos/default.nix

@@ -58,18 +58,22 @@ in {
           (modules)
           syncthing
           ollama
-          edgedb
           plasma
-          sddm
+          # sddm
           ;
       };
     };
 
-    laptop = {
+    hyprland = {
       imports = builtins.attrValues {
         inherit
           (modules)
-          gnome
+          hyprland
+          geoclue2
+          greetd
+          swaylock
+          thunar
+          wayland
           ;
       };
     };

nixos/modules/audio.nix

@@ -1,5 +1,4 @@
 {
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services = {
     pipewire = {
@@ -9,5 +8,6 @@
       pulse.enable = true;
       jack.enable = true;
     };
+    pulseaudio.enable = false;
   };
 }

nixos/modules/bluetooth.nix

@@ -8,4 +8,5 @@
       disabledPlugins = ["sap"];
     };
   };
+  services.blueman.enable = true;
 }

nixos/modules/environment.nix

@@ -18,6 +18,7 @@
       WLR_DRM_NO_ATOMIC = "1";
       NIXPKGS_ALLOW_INSECURE = "1";
       NIXPKGS_ALLOW_UNFREE = "1";
+      GRIM_DEFAULT_DIR = "$HOME/Pictures/screenshots/";
     };
   };
 }

nixos/modules/fonts.nix

@@ -1,11 +1,17 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  flake,
+  ...
+}: let
+  inherit (flake.config.aesthetics.themes.theme) font;
+in {
   fonts = {
     fontconfig = {
       enable = true;
       defaultFonts = {
-        # serif = [];
-        # monospace = [];
-        # sansSerif = [];
+        serif = [font];
+        monospace = [font];
+        sansSerif = [font];
         emoji = ["Noto Fonts Color Emoji"];
       };
       antialias = true;
@@ -17,9 +23,6 @@
         ;
       inherit
         (pkgs.nerd-fonts)
-        jetbrains-mono
-        droid-sans-mono
-        victor-mono
         monaspace
         ;
     };

nixos/modules/geoclue2.nix

@@ -0,0 +1,3 @@
+{
+  services.geoclue2.enable = true;
+}

nixos/modules/greetd.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  flake,
+  lib,
+  ...
+}: let
+  inherit (flake.config.people) user0;
+in {
+  services = {
+    greetd = {
+      enable = true;
+      vt = 7;
+      settings = let
+        default_session = {
+          command = "${lib.meta.getExe config.programs.hyprland.package}";
+          user = user0;
+        };
+      in {
+        inherit
+          default_session
+          ;
+        initial_session = default_session;
+      };
+    };
+  };
+}

nixos/modules/home-manager.nix

@@ -2,7 +2,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    backupFileExtension = "backup2";
+    backupFileExtension = "backup";
     extraSpecialArgs = {
       inherit flake;
     };

nixos/modules/hyprland.nix

@@ -0,0 +1,15 @@
+{
+  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/nix.nix

@@ -19,5 +19,9 @@
       dates = "weekly";
       options = "--delete-older-than 10d";
     };
+    settings = {
+      substituters = ["https://hyprland.cachix.org"];
+      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+    };
   };
 }

nixos/modules/swaylock.nix

@@ -0,0 +1,3 @@
+{
+  security.pam.services.swaylock.text = "auth include login";
+}

nixos/modules/thunar.nix

@@ -0,0 +1,10 @@
+{pkgs, ...}: {
+  programs.thunar = {
+    enable = true;
+    plugins = [
+      pkgs.xfce.thunar-archive-plugin
+      pkgs.xfce.thunar-volman
+      pkgs.xfce.thunar-media-tags-plugin
+    ];
+  };
+}

nixos/modules/wayland.nix

@@ -0,0 +1,22 @@
+{pkgs, ...}: {
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  xdg = {
+    portal = {
+      enable = true;
+
+      extraPortals = builtins.attrValues {
+        inherit
+          (pkgs)
+          xdg-desktop-portal-hyprland
+          xdg-desktop-portal-wlr
+          xdg-desktop-portal-kde
+          xdg-desktop-portal-gtk
+          ;
+      };
+
+      wlr.enable = true;
+      xdgOpenUsePortal = true;
+    };
+  };
+}