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>";
-        action = "<cmd>Oil<cr>";
+      key = "<leader>e";
-        key = "<leader>e";
+      options = { silent = true; };
-        options = {
+    }];
-          silent = true;
-        };
-      }
-    ];
 
     options = {
       hlsearch = false;
@@ -47,21 +40,30 @@
       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-;>";
+          };
         };
       };
 
@@ -77,11 +79,11 @@
         enable = true;
         signs = {
           add.text = "▎";
-	      change.text =  "▎";
+          change.text = "▎";
-	      changedelete.text = "▎";
+          changedelete.text = "▎";
-	      delete.text = "▎";
+          delete.text = "▎";
-	      topdelete.text = "▎";
+          topdelete.text = "▎";
-	      untracked.text = "▎";
+          untracked.text = "▎";
         };
         onAttach.function = ''
           function(buffer)
@@ -95,32 +97,30 @@
             map("n", "]g", gs.next_hunk, "Next git hunk")
             map("n", "[g", gs.prev_hunk, "Previous git hunk")
           end
-          '';
+        '';
       };
 
       mini = {
         enable = true;
-	    modules = {
+        modules = {
-          statusline = {
+          statusline = { set_vim_settings = false; };
-	      set_vim_settings = false;
+          comment = { };
-	      };
+          notify = { };
-	      comment = {};
+        };
-	      notify = {};
-	    };
       };
 
-      telescope = { 
+      telescope = {
         enable = true;
-	    extensions = {
+        extensions = {
-	      fzf-native = {
+          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,46 +161,43 @@
           		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;
+        autoEnableSources = true;
-	    sources = [
+        sources =
-	      {name = "nvim_lsp";}
+          [ { name = "nvim_lsp"; } { name = "path"; } { name = "snippy"; } ];
-	      {name = "path";}
-          {name = "snippy";}
-	    ];
         snippet.expand = "snippy";
-	    mapping = {
+        mapping = {
           "<C-l>" = "cmp.mapping.confirm({ select = false })";
           "<C-j>" = {
             action = ''
-              function(fallback)
+                  function(fallback)
-                if cmp.visible then
+                    if cmp.visible then
-                  cmp.select_next_item()
+                      cmp.select_next_item()
-                else
+                    else
-          	  fallback()
+              	  fallback()
-                end
+                    end
-              end
+                  end
             '';
             modes = [ "i" "s" ];
           };
           "<C-k>" = {
             action = ''
-              function(fallback)
+                  function(fallback)
-                if cmp.visible then
+                    if cmp.visible then
-                  cmp.select_prev_item()
+                      cmp.select_prev_item()
-                else
+                    else
-          	  fallback()
+              	  fallback()
-                end
+                    end
-              end
+                  end
             '';
             modes = [ "i" "s" ];
           };
@@ -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 = {