From 9783d22db20fce5c55e50cc4c1c4c86643aa54e3 Mon Sep 17 00:00:00 2001
From: fredrikr79 <fredrikrobertsen7@gmail.com>
Date: Fri, 15 Aug 2025 14:49:56 +0200
Subject: [PATCH] fix all evaluation warnings

---
 configuration.nix | 35 +++++++++++++--------------
 home.nix          | 61 +++++++++++++++++++++++++----------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 03f05bb..5aabcb8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -83,10 +83,8 @@ in
   # };
 
   # TTY settings
-  i18n = {
-    # luckily this also changes the keyboard layout at boot (for e.g full disk encryption passwords)
-    consoleKeyMap = "dvorak-programmer";
-  };
+  # luckily this also changes the keyboard layout at boot (for e.g full disk encryption passwords)
+  console.keyMap = "dvorak-programmer";
 
   # GUI settings, this includes login screen
   #services.xserver.layout = "us";
@@ -109,9 +107,9 @@ in
     autoRepeatInterval = 24;
     
     # DVORAK + NO
-    layout = "us,no";
-    xkbVariant = "dvp,";
-    xkbOptions = "compose:menu, grp:alt_shift_toggle, lv3:ralt_switch";
+    xkb.layout = "us,no";
+    xkb.variant = "dvp,";
+    xkb.options = "compose:menu, grp:alt_shift_toggle, lv3:ralt_switch";
 
     exportConfiguration = true;
 
@@ -130,8 +128,8 @@ in
         ];
       };
     };
+
     displayManager = {
-      defaultSession = "none+xmonad";
       lightdm = {
         enable = true;
         greeters.enso = {
@@ -145,7 +143,15 @@ in
       # sessionCommands = '' '';
     };
 
-    libinput = {
+    synaptics = {
+      minSpeed = "7.0";
+      maxSpeed = "8.0";
+    };
+  };
+
+  services.displayManager.defaultSession = "none+xmonad";
+
+  services.libinput = {
       enable = true;
 
       mouse = {
@@ -160,12 +166,6 @@ in
       };
     };
 
-    synaptics = {
-      minSpeed = "7.0";
-      maxSpeed = "8.0";
-    };
-  };
-
 
   # Enable CUPS to print documents.
   # services.printing.enable = true;
@@ -202,7 +202,7 @@ in {
 };
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.libinput.enable = true;
+  # services.libinput.enable = true;
 
   services.blueman.enable = true;
 
@@ -422,9 +422,6 @@ in {
       # (nerdfonts.override { fonts = [ "FiraCode" "Monoid" ]; })
       nerd-fonts.fira-code
       nerd-fonts.droid-sans-mono
-    ];
-
-    fonts = with pkgs; [
       noto-fonts
       ubuntu_font_family
       unifont
diff --git a/home.nix b/home.nix
index 502bd79..fbb8ea0 100644
--- a/home.nix
+++ b/home.nix
@@ -60,7 +60,7 @@ in {
     haskell-language-server
     haskellPackages.hoogle
     cabal-cli
-    nixfmt
+    nixfmt-rfc-style
     black
     python312Packages.pyflakes
     isort
@@ -292,7 +292,7 @@ in {
       # settings = {
       #     disable_background = true;
       # };
-      colorterm = false;
+      settings.colorterm = false;
     };
 
     viAlias = true;
@@ -345,30 +345,30 @@ in {
             timeoutMs = 500;
             lspFallback = true;
           };
-        };
 
-        formattersByFt = {
-          typst = [ "typstyle " ]; # "typstfmt"];
-          python = [ "black" ];
-          markdown = [ "prettier" ];
-        };
+          formatters_by_ft = {
+            typst = [ "typstyle " ]; # "typstfmt"];
+            python = [ "black" ];
+            markdown = [ "prettier" ];
+          };
 
-        formatters = {
-          prettier = {
-            command = "prettier";
-            filetypes = [ "markdown" ];
-          };
-          # typstfmt = {
-          #     command = "typstfmt";
-          #     filetypes = ["typst"];
-          # };
-          typstyle = {
-            command = "typstyle";
-            filetypes = [ "typst" ];
-          };
-          black = {
-            command = "black";
-            filetypes = [ "python" ];
+          formatters = {
+            prettier = {
+              command = "prettier";
+              filetypes = [ "markdown" ];
+            };
+            # typstfmt = {
+            #     command = "typstfmt";
+            #     filetypes = ["typst"];
+            # };
+            typstyle = {
+              command = "typstyle";
+              filetypes = [ "typst" ];
+            };
+            black = {
+              command = "black";
+              filetypes = [ "python" ];
+            };
           };
         };
       };
@@ -538,9 +538,12 @@ in {
         };
         servers = {
           pyright.enable = true;
-          nil-ls.enable = true;
-          lua-ls.enable = true;
-          hls.enable = true;
+          nil_ls.enable = true;
+          lua_ls.enable = true;
+          hls = {
+            enable = true;
+            installGhc = true;
+          };
           tinymist = {
             enable = true;
             settings = {
@@ -587,7 +590,7 @@ in {
 
       comment.enable = true;
 
-      surround.enable = true;
+      vim-surround.enable = true;
 
       presence-nvim.enable = true;
 
@@ -1105,7 +1108,7 @@ in {
     font.size = 16;
     # font.package = pkgs.monocraft;
     shellIntegration.enableZshIntegration = true;
-    theme = "Dracula";
+    themeFile = "Dracula";
   };
 
   programs.emacs = {