From a784ba021f92fea0d8181e7c4cbc5424082b3c1b Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Mon, 28 Oct 2024 11:00:04 +0100
Subject: [PATCH] feat: fix nixfmt

---
 common/nvim/init.lua       | 19 +++++++++++++++++-
 common/nvim/nvim.nix       | 41 ++++++++++++++++++++------------------
 modules/plasma/default.nix |  5 ++++-
 3 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/common/nvim/init.lua b/common/nvim/init.lua
index 699b624..30598cb 100644
--- a/common/nvim/init.lua
+++ b/common/nvim/init.lua
@@ -435,11 +435,28 @@ require("lazy").setup({
 
       require("lazy-lsp").setup({
         configs = {
+          nixd = {
+            settings = {
+              nixd = {
+                options = {
+                  nixos = {
+                    expr = "(builtins.getFlake \"/home/noa/nixos/\").nixosConfigurations.lambdaOS.options",
+                  },
+                  home_manager = {
+                    expr = "(builtins.getFlake \"/home/noa/nixos/\").homeConfigurations.\"noa@lambdaOS\".options",
+                  },
+                },
+                formatting = {
+                  command = { "nixfmt" }
+                },
+              },
+            },
+          },
           nil_ls = {
             settings = {
               ['nil'] = {
                 formatting = {
-                  command = { "nixfmt" },
+                  command = { "nixfmt" }
                 },
               },
             },
diff --git a/common/nvim/nvim.nix b/common/nvim/nvim.nix
index df51558..4129986 100644
--- a/common/nvim/nvim.nix
+++ b/common/nvim/nvim.nix
@@ -1,28 +1,31 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 {
   options.modules.apps.neovim = {
     enableLanguages = lib.mkEnableOption "enable LSP languages";
   };
 
   config = {
-    programs.neovim =
-      {
-        enable = true;
-        extraPackages = with pkgs; [
-          ripgrep
-          luarocks
-          gnumake
-          wget
-          nixpkgs-fmt
-          tree-sitter
-          fd
-        ];
-        defaultEditor = true;
-        viAlias = true;
-        vimAlias = true;
+    programs.neovim = {
+      enable = true;
+      extraPackages = with pkgs; [
+        ripgrep
+        luarocks
+        gnumake
+        wget
+        tree-sitter
+        fd
+        nixfmt-rfc-style
+      ];
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
 
-        extraLuaConfig = lib.fileContents
-          ./init.lua;
-      };
+      extraLuaConfig = lib.fileContents ./init.lua;
+    };
   };
 }
diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix
index cad526b..33ef304 100644
--- a/modules/plasma/default.nix
+++ b/modules/plasma/default.nix
@@ -9,7 +9,10 @@ in
 
 
   config = lib.mkIf cfg.enable {
-		services.desktopManager.plasma6.enable = true;
+		services = {
+			desktopManager.plasma6.enable = true;
+			displayManager.defaultSession = "hyprland";
+		};
 
 		xdg.portal.config.common.default = "*";
 	};