From 67c8c07db521ae27c7773dc64173b336496c7282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Tue, 30 Aug 2022 22:01:06 -0300
Subject: [PATCH] remove amdvlk driver

---
 hosts/monolith.nix       | 18 +++++++++++-------
 system/configuration.nix | 20 ++++++++------------
 user/fish.nix            |  8 ++------
 user/home.nix            |  5 ++---
 user/hyprland.nix        |  5 +----
 user/kakoune.nix         |  4 +---
 user/sway.nix            |  4 +---
 user/waybar.nix          |  4 +---
 8 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/hosts/monolith.nix b/hosts/monolith.nix
index e47cbab..fa3f901 100644
--- a/hosts/monolith.nix
+++ b/hosts/monolith.nix
@@ -6,16 +6,20 @@
   boot.initrd.availableKernelModules =
     [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" "amdgpu" ];
+  boot.kernelModules = [
+    "kvm-amd"
+    # "amdgpu"
+  ];
 
   hardware.opengl.driSupport = true;
-  # For 32 bit applications
+  # # For 32 bit applications
   hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
-  # For 32 bit applications
-  # Only available on unstable
-  hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
-  environment.variables = { AMD_VULKAN_ICD = "RADV"; };
+
+  # hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
+  # # For 32 bit applications
+  # # Only available on unstable
+  # hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
+  # environment.variables = { AMD_VULKAN_ICD = "RADV"; };
 
   boot.extraModulePackages = [ ];
   fileSystems."/" = {
diff --git a/system/configuration.nix b/system/configuration.nix
index 89745f6..c8be56f 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -49,9 +49,7 @@ in {
   };
 
   programs.adb.enable = true;
-  services.udev.packages = [
-    pkgs.android-udev-rules
-  ];
+  services.udev.packages = [ pkgs.android-udev-rules ];
 
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   # Configure network proxy if necessary
@@ -237,16 +235,14 @@ in {
   networking.firewall.enable = false;
   security.sudo.wheelNeedsPassword = false;
   nix = {
-    binaryCaches = [
-      "https://cache.nixos.org/"
-      "https://lelgenio.cachix.org"
-    ];
-    binaryCachePublicKeys = [
-      "lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
-    ];
+    binaryCaches = [ "https://cache.nixos.org/" "https://lelgenio.cachix.org" ];
+    binaryCachePublicKeys =
+      [ "lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc=" ];
     settings = {
-      substituters = ["https://hyprland.cachix.org"];
-      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+      substituters = [ "https://hyprland.cachix.org" ];
+      trusted-public-keys = [
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      ];
     };
     package = pkgs.nixFlakes; # or versioned attributes like nixVersions.nix_2_8
     extraOptions = ''
diff --git a/user/fish.nix b/user/fish.nix
index dc03aff..58c675a 100644
--- a/user/fish.nix
+++ b/user/fish.nix
@@ -19,9 +19,7 @@ in {
           rustup default stable &>/dev/null &
         end
       '';
-      shellAliases = {
-        rm = "trash";
-      };
+      shellAliases = { rm = "trash"; };
       shellAbbrs = {
         v = "kak";
         ns = "nix develop --command $SHELL";
@@ -57,8 +55,6 @@ in {
       ".config/fish/conf.d/prompt.fish".source = ./fish_prompt.fish;
     };
     programs.command-not-found.enable = true;
-    home.packages = with pkgs; [
-      trash-cli
-    ];
+    home.packages = with pkgs; [ trash-cli ];
   };
 }
diff --git a/user/home.nix b/user/home.nix
index fd83cc0..0e3c8a5 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -1,6 +1,5 @@
-{ config, pkgs, lib, inputs,... }:
-let
-  inherit (import ./variables.nix) key theme color accent font;
+{ config, pkgs, lib, inputs, ... }:
+let inherit (import ./variables.nix) key theme color accent font;
 
 in {
   imports = [
diff --git a/user/hyprland.nix b/user/hyprland.nix
index cd0eee8..b9ef26c 100644
--- a/user/hyprland.nix
+++ b/user/hyprland.nix
@@ -122,9 +122,6 @@
       '';
     };
     home.file.".config/eww".source = ./eww;
-    home.packages = with pkgs; [
-      eww-wayland
-      jq
-    ];
+    home.packages = with pkgs; [ eww-wayland jq ];
   };
 }
diff --git a/user/kakoune.nix b/user/kakoune.nix
index cf80e79..046c241 100644
--- a/user/kakoune.nix
+++ b/user/kakoune.nix
@@ -120,9 +120,7 @@ in {
         Hint = "blue";
       }));
     };
-    home.file = {
-      ".config/kak-lsp/kak-lsp.toml".source = ./kak/kak-lsp.toml;
-    };
+    home.file = { ".config/kak-lsp/kak-lsp.toml".source = ./kak/kak-lsp.toml; };
     home.packages = with pkgs; [ kakoune terminal ranger bmenu ];
     home.sessionVariables = {
       EDITOR = "kak";
diff --git a/user/sway.nix b/user/sway.nix
index d2c1e53..b30827b 100644
--- a/user/sway.nix
+++ b/user/sway.nix
@@ -433,8 +433,6 @@ in {
         Install = { WantedBy = [ "sway-session.target" ]; };
       };
     };
-    home.file = {
-      ".local/share/backgrounds".source = ./backgrounds;
-    };
+    home.file = { ".local/share/backgrounds".source = ./backgrounds; };
   };
 }
diff --git a/user/waybar.nix b/user/waybar.nix
index 7267dd2..28661fc 100644
--- a/user/waybar.nix
+++ b/user/waybar.nix
@@ -231,8 +231,6 @@ in {
         }
       '';
     };
-    home.packages = with pkgs; [
-      waybar
-    ];
+    home.packages = with pkgs; [ waybar ];
   };
 }