home-manager/modules/nvim.nix

@@ -1,5 +1,8 @@
-{ inputs, pkgs, ... }: {
-  imports = [ inputs.nixvim.homeManagerModules.nixvim ];
+{ inputs, pkgs, ... }:
+{
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+  ];
 
   # Nixvim
   programs.nixvim = {
@@ -7,11 +10,15 @@
     viAlias = true;
     vimAlias = true;
 
-    keymaps = [{
-      action = "<cmd>Oil<cr>";
-      key = "<leader>e";
-      options = { silent = true; };
-    }];
+    keymaps = [
+      { 
+        action = "<cmd>Oil<cr>";
+        key = "<leader>e";
+        options = {
+          silent = true;
+        };
+      }
+    ];
 
     options = {
       hlsearch = false;
@@ -40,30 +47,21 @@
       splitright = true;
     };
 
-    globals = {
+    globals = { 
       mapleader = " ";
       maplocalleader = ";";
     };
 
-    extraConfigLuaPre = ''
-      vim.loader.enable()
-    '';
-
     extraConfigLuaPost = ''
       vim.notify = require("mini.notify").make_notify()
-    '';
+      '';
     plugins = {
-      harpoon = {
+      harpoon = { 
         enable = true;
         keymaps = {
           addFile = "<leader>a";
           toggleQuickMenu = "<C-e>";
-          navFile = {
-            "1" = "<C-j>";
-            "2" = "<C-k>";
-            "3" = "<C-l>";
-            "4" = "<C-;>";
-          };
+          navFile = { "1" = "<C-j>"; "2" = "<C-k>"; "3" = "<C-l>"; "4" = "<C-;>"; };
         };
       };
 
@@ -79,11 +77,11 @@
         enable = true;
         signs = {
           add.text = "▎";
-          change.text = "▎";
-          changedelete.text = "▎";
-          delete.text = "▎";
-          topdelete.text = "▎";
-          untracked.text = "▎";
+	      change.text =  "▎";
+	      changedelete.text = "▎";
+	      delete.text = "▎";
+	      topdelete.text = "▎";
+	      untracked.text = "▎";
         };
         onAttach.function = ''
           function(buffer)
@@ -97,30 +95,32 @@
             map("n", "]g", gs.next_hunk, "Next git hunk")
             map("n", "[g", gs.prev_hunk, "Previous git hunk")
           end
-        '';
+          '';
       };
 
       mini = {
         enable = true;
-        modules = {
-          statusline = { set_vim_settings = false; };
-          comment = { };
-          notify = { };
-        };
+	    modules = {
+          statusline = {
+	      set_vim_settings = false;
+	      };
+	      comment = {};
+	      notify = {};
+	    };
       };
 
-      telescope = {
+      telescope = { 
         enable = true;
-        extensions = {
-          fzf-native = {
+	    extensions = {
+	      fzf-native = {
             enable = true;
             fuzzy = true;
             overrideGenericSorter = true;
             overrideFileSorter = true;
             caseMode = "smart_case";
           };
-          ui-select.enable = true;
-        };
+	      ui-select.enable = true;
+	    };
         keymaps = {
           "<leader>pf" = "find_files";
           "<C-p>" = "git_files";
@@ -161,43 +161,46 @@
           		numhl = "",
           	})
           end
-
+          
           sign_define({ name = "DiagnosticSignError", text = "E" })
           sign_define({ name = "DiagnosticSignWarn", text = "W" })
           sign_define({ name = "DiagnosticSignHint", text = "H" })
           sign_define({ name = "DiagnosticSignInfo", text = "I" })
-        '';
+          '';
       };
 
       nvim-cmp = {
         enable = true;
-        autoEnableSources = true;
-        sources =
-          [ { name = "nvim_lsp"; } { name = "path"; } { name = "snippy"; } ];
+	    autoEnableSources = true;
+	    sources = [
+	      {name = "nvim_lsp";}
+	      {name = "path";}
+          {name = "snippy";}
+	    ];
         snippet.expand = "snippy";
-        mapping = {
+	    mapping = {
           "<C-l>" = "cmp.mapping.confirm({ select = false })";
           "<C-j>" = {
             action = ''
-                  function(fallback)
-                    if cmp.visible then
-                      cmp.select_next_item()
-                    else
-              	  fallback()
-                    end
-                  end
+              function(fallback)
+                if cmp.visible then
+                  cmp.select_next_item()
+                else
+          	  fallback()
+                end
+              end
             '';
             modes = [ "i" "s" ];
           };
           "<C-k>" = {
             action = ''
-                  function(fallback)
-                    if cmp.visible then
-                      cmp.select_prev_item()
-                    else
-              	  fallback()
-                    end
-                  end
+              function(fallback)
+                if cmp.visible then
+                  cmp.select_prev_item()
+                else
+          	  fallback()
+                end
+              end
             '';
             modes = [ "i" "s" ];
           };
@@ -213,6 +216,8 @@
         keywords = [ "bold" ];
       };
     };
-    extraPlugins = with pkgs.vimPlugins; [ vim-snippets ];
+    extraPlugins = with pkgs.vimPlugins; [
+      vim-snippets
+    ];
   };
 }

nixos/configuration.nix

@@ -71,9 +71,6 @@
     settings = { General = { InputMethod = ""; }; };
   };
 
-  # Set default sddm session to plasma wayland
-  services.xserver.displayManager.defaultSession = "plasmawayland";
-
   # Setup plasma with excluding a couple unnecesarry packages
   services.xserver.desktopManager.plasma5.enable = true;
   environment.plasma5.excludePackages = with pkgs.libsForQt5; [
@@ -115,11 +112,8 @@
   # Open Tablet Driver setup
   hardware.opentabletdriver.enable = true;
 
-  # load amdgpu at boot
-  boot.initrd.kernelModules = [ "amdgpu" ];
-
   # Load nvidia driver for Xorg and Wayland
-  services.xserver.videoDrivers = [ "amdgpu" "nvidia" ];
+  services.xserver.videoDrivers = [ "nvidia" ];
 
   # Steam settings
   programs.steam = {