From 85d9d23582a7cf5ee1dd3dd7b7115e08d9a95f6b Mon Sep 17 00:00:00 2001
From: Ari Gato <ar@is-a.cat>
Date: Tue, 7 May 2024 00:19:20 +0200
Subject: [PATCH] chore: fmt, renames

---
 flake.nix             |  3 ++-
 modules/common.nix    |  9 +++------
 modules/graphical.nix | 21 ++++++++++-----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index df24ba5..15d95bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,8 @@
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     lix = {
-      url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
+      url =
+        "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
       flake = false;
     };
     lix-module = {
diff --git a/modules/common.nix b/modules/common.nix
index 6c6c894..14d51b4 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -84,12 +84,9 @@ in {
         else
           [ ]);
       trusted-substituters = config.nix.settings.substituters;
-      extra-substituters = [
-        "https://cache.lix.systems"
-      ];
-      trusted-public-keys = [
-        "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
-      ];
+      extra-substituters = [ "https://cache.lix.systems" ];
+      trusted-public-keys =
+        [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ];
     };
   };
   nixpkgs.config.allowUnfree = true;
diff --git a/modules/graphical.nix b/modules/graphical.nix
index e9f325d..2d9edf1 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -82,22 +82,21 @@ in {
 
   services.xserver = {
     enable = true;
-
     xkb.layout = "pl";
     xkb.options = "ctrl:nocaps";
-    libinput.enable = true;
   };
 
+  services.libinput.enable = true;
   services.displayManager = {
-      sddm = {
-        enable = lib.mkDefault true;
-        wayland.enable = true;
-        settings.Wayland.SessionDir =
-          "/run/current-system/sw/share/wayland-sessions";
-        settings.X11.SessionDir = lib.mkForce "";
-      };
-      defaultSession = "plasma";
+    sddm = {
+      enable = lib.mkDefault true;
+      wayland.enable = true;
+      settings.Wayland.SessionDir =
+        "/run/current-system/sw/share/wayland-sessions";
+      settings.X11.SessionDir = lib.mkForce "";
     };
+    defaultSession = "plasma";
+  };
 
   boot = {
     loader.timeout = 0;
@@ -187,7 +186,7 @@ in {
     kate
     keybase-gui
     kolourpaint
-    nixfmt
+    nixfmt-classic
     okular
     paprefs
     pavucontrol