Add amdgpu to boot, make plasma wayland session default.

home-manager/modules/nvim.nix

@@ -1,8 +1,5 @@
-{ inputs, pkgs, ... }:
+{ inputs, pkgs, ... }: {
-{
+  imports = [ inputs.nixvim.homeManagerModules.nixvim ];
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-  ];
 
   # Nixvim
   programs.nixvim = {
@@ -10,15 +7,11 @@
     viAlias = true;
     vimAlias = true;
 
-    keymaps = [
+    keymaps = [{
-      { 
       action = "<cmd>Oil<cr>";
       key = "<leader>e";
-        options = {
+      options = { silent = true; };
-          silent = true;
+    }];
-        };
-      }
-    ];
 
     options = {
       hlsearch = false;
@@ -52,6 +45,10 @@
       maplocalleader = ";";
     };
 
+    extraConfigLuaPre = ''
+      vim.loader.enable()
+    '';
+
     extraConfigLuaPost = ''
       vim.notify = require("mini.notify").make_notify()
     '';
@@ -61,7 +58,12 @@
         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-;>";
+          };
         };
       };
 
@@ -101,11 +103,9 @@
       mini = {
         enable = true;
         modules = {
-          statusline = {
+          statusline = { set_vim_settings = false; };
-	      set_vim_settings = false;
+          comment = { };
-	      };
+          notify = { };
-	      comment = {};
-	      notify = {};
         };
       };
 
@@ -172,11 +172,8 @@
       nvim-cmp = {
         enable = true;
         autoEnableSources = true;
-	    sources = [
+        sources =
-	      {name = "nvim_lsp";}
+          [ { name = "nvim_lsp"; } { name = "path"; } { name = "snippy"; } ];
-	      {name = "path";}
-          {name = "snippy";}
-	    ];
         snippet.expand = "snippy";
         mapping = {
           "<C-l>" = "cmp.mapping.confirm({ select = false })";
@@ -216,8 +213,6 @@
         keywords = [ "bold" ];
       };
     };
-    extraPlugins = with pkgs.vimPlugins; [
+    extraPlugins = with pkgs.vimPlugins; [ vim-snippets ];
-      vim-snippets
-    ];
   };
 }

nixos/configuration.nix

@@ -71,6 +71,9 @@
     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; [
@@ -112,8 +115,11 @@
   # 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 = [ "nvidia" ];
+  services.xserver.videoDrivers = [ "amdgpu" "nvidia" ];
 
   # Steam settings
   programs.steam = {