From 56690260ef1e5f69ff69b82f9408e4e54d926371 Mon Sep 17 00:00:00 2001
From: Kyren223 <Kyren223@proton.me>
Date: Thu, 26 Dec 2024 19:12:44 +0200
Subject: [PATCH] Removed formatters and self formmated some stuff, also nixd
 is broken idk why will try to fix it later

---
 .../lua/custom/config/language-servers.lua    | 34 +++++++++----------
 .config/nvim/lua/custom/plugins/conform.lua   |  2 --
 hosts/laptop-nixos/configuration.nix          | 16 +++------
 hosts/laptop-nixos/home.nix                   | 12 +++----
 4 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/.config/nvim/lua/custom/config/language-servers.lua b/.config/nvim/lua/custom/config/language-servers.lua
index 7cc4946..d3e71ce 100644
--- a/.config/nvim/lua/custom/config/language-servers.lua
+++ b/.config/nvim/lua/custom/config/language-servers.lua
@@ -137,21 +137,21 @@ return {
             },
         },
     }, -- zig
-    nixd = {
-        mason = false,
-        cmd = { 'nixd' },
-        settings = {
-            nixd = {
-                nixpkgs = { expr = 'import <nixpkgs> { }' },
-                options = {
-                    nixos = {
-                        expr = '(builtins.getFlake "/home/kyren/dotfiles/flake.nix").nixosConfigurations.laptop-nixos.options',
-                    },
-                    home_manager = {
-                        expr = '(builtins.getFlake "/home/kyren/dotfiles/flake.nix").homeConfigurations.laptop-nixos.options',
-                    },
-                },
-            },
-        },
-    },
+    -- nixd = {
+    --     mason = false,
+    --     cmd = { 'nixd' },
+    --     settings = {
+    --         nixd = {
+    --             nixpkgs = { expr = 'import <nixpkgs> { }' },
+    --             -- options = {
+    --             --     nixos = {
+    --             --         expr = '(builtins.getFlake \\"/home/kyren/dotfiles/flake.nix").nixosConfigurations.laptop-nixos.options',
+    --             --     },
+    --             --     home_manager = {
+    --             --         expr = '(builtins.getFlake \\"/home/kyren/dotfiles/flake.nix").homeConfigurations.laptop-nixos.options',
+    --             --     },
+    --             -- },
+    --         },
+    --     },
+    -- },
 }
diff --git a/.config/nvim/lua/custom/plugins/conform.lua b/.config/nvim/lua/custom/plugins/conform.lua
index 84a2385..fe3356f 100644
--- a/.config/nvim/lua/custom/plugins/conform.lua
+++ b/.config/nvim/lua/custom/plugins/conform.lua
@@ -24,8 +24,6 @@ return {
             ['css'] = { 'prettierd', 'prettier', stop_after_first = true },
             ['javascript'] = { 'prettierd', 'prettier', stop_after_first = true },
             ['typescript'] = { 'prettierd', 'prettier', stop_after_first = true },
-            -- ['nix'] = { 'nixfmt' },
-            -- ['nix'] = { 'alejandra' },
         },
         format_on_save = function(bufnr)
             -- Disable with a global or buffer local variable
diff --git a/hosts/laptop-nixos/configuration.nix b/hosts/laptop-nixos/configuration.nix
index 6e2be58..3047df5 100644
--- a/hosts/laptop-nixos/configuration.nix
+++ b/hosts/laptop-nixos/configuration.nix
@@ -1,14 +1,8 @@
-# Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, inputs, ... }:
-
-{
-  imports =
-    [
-      ./hardware-configuration.nix
-      inputs.home-manager.nixosModules.default
-    ];
+{ config, pkgs, inputs, ... }: {
+  imports = [
+    ./hardware-configuration.nix
+    inputs.home-manager.nixosModules.default
+  ];
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
diff --git a/hosts/laptop-nixos/home.nix b/hosts/laptop-nixos/home.nix
index f4e9958..b502cf3 100644
--- a/hosts/laptop-nixos/home.nix
+++ b/hosts/laptop-nixos/home.nix
@@ -1,6 +1,4 @@
-{ config, pkgs, inputs, ... }:
-
-{
+{ config, pkgs, inputs, ... }: {
   home.username = "kyren";
   home.homeDirectory = "/home/kyren";
 
@@ -70,7 +68,7 @@
     tokei
     graphviz
     kdePackages.kmines # Minesweeper for fun lol
-    kdePackages.kpat # Solitaire 
+    kdePackages.kpat # Solitaire
     # btw missing the card/brick thing with weird symbols, not sure what that game was called
     gimp
     kdePackages.korganizer
@@ -78,12 +76,10 @@
     gitleaks
     rar
     gomodifytags
-    nixfmt-rfc-style
-    alejandra
-    nixd
   ];
 
-  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+  # For nixd LSP to recognize what nixpkgs version I use
+  nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.