non important commit

configuration/modules/desktop.nix

@@ -1,8 +1,4 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     wl-clipboard
     libsForQt5.qt5.qtquickcontrols2
@@ -24,8 +20,8 @@
     hyprland = {
       enable = true;
       withUWSM = true;
-      package = inputs.hyprland.packages."x86_64-linux".hyprland;
-      portalPackage = inputs.hyprland.packages."x86_64-linux".xdg-desktop-portal-hyprland;
+      package = pkgs.hyprland;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
     };
   };
 

flake.nix

@@ -15,10 +15,6 @@
       url = "github:danth/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";

home/modules/nvf.nix

@@ -71,13 +71,8 @@
         html = {
           enable = true;
           lsp.servers = [
-<<<<<<< HEAD
-            "superhtml"
-            "emmet-ls"
-=======
             "emmet-ls"
             "superhtml"
->>>>>>> d8e7e28 (dunno)
           ];
         };