From decd75c77d137f6d5ff8d07b073daa6d337a9fe3 Mon Sep 17 00:00:00 2001
From: emily <ek@kyouma.net>
Date: Wed, 14 Aug 2024 18:33:20 +0200
Subject: [PATCH] Rename options

---
 config/common/users/emily/default.nix | 4 ++--
 config/hosts/ryuuko/configuration.nix | 5 +++--
 config/profiles/graphical/default.nix | 2 --
 config/profiles/graphical/nixvim.nix  | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/config/common/users/emily/default.nix b/config/common/users/emily/default.nix
index bf2dc50..beb809e 100644
--- a/config/common/users/emily/default.nix
+++ b/config/common/users/emily/default.nix
@@ -42,8 +42,8 @@
       libnotify
       slurp
       grim
-      gnome.simple-scan
-      cinnamon.nemo
+      simple-scan
+      nemo
       imagemagick_light
 
       #ubuntu_font_family
diff --git a/config/hosts/ryuuko/configuration.nix b/config/hosts/ryuuko/configuration.nix
index 0aa61d5..fd68f8d 100644
--- a/config/hosts/ryuuko/configuration.nix
+++ b/config/hosts/ryuuko/configuration.nix
@@ -27,8 +27,9 @@
   hardware.gpgSmartcards.enable = true;
   hardware.nitrokey.enable = true;
 
-  hardware.opengl = {
-    driSupport32Bit = true;
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
     extraPackages = with pkgs; [ 
       intel-media-driver 
       libvdpau-va-gl
diff --git a/config/profiles/graphical/default.nix b/config/profiles/graphical/default.nix
index 0023224..be5b0c5 100644
--- a/config/profiles/graphical/default.nix
+++ b/config/profiles/graphical/default.nix
@@ -10,8 +10,6 @@
 
   kyouma.machine-type.graphical = true;
 
-  hardware.opengl.enable = true;
-  
   boot.plymouth.enable = true;
 
   security.pam.services.hyprlock = {};
diff --git a/config/profiles/graphical/nixvim.nix b/config/profiles/graphical/nixvim.nix
index 9f348f8..508e1c4 100644
--- a/config/profiles/graphical/nixvim.nix
+++ b/config/profiles/graphical/nixvim.nix
@@ -162,7 +162,7 @@
       servers = {
         bashls.enable = true;
         lua-ls.enable = true;
-        nil_ls = {
+        nil-ls = {
           enable = true;
           settings.formatting.command = [ "nixfmt" "-w" "140" ];
         };
@@ -201,7 +201,7 @@
     plugins.treesitter = {
       enable = true;
       nixGrammars = true;
-      indent = true;
+      settings.indent.enable = true;
     };
     plugins.airline.enable = true;
     plugins.cmp-buffer.enable = true;