From a500d682bb6aac5f2d89b9ae36df9c17d39b7294 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Fri, 8 Dec 2023 12:48:48 -0500
Subject: [PATCH] refactor: remove mentions of x86

---
 common/default.nix                        | 12 ++++++------
 common/home/bash/programs.nix             |  9 +++++++--
 common/overlays/dracula-theme/default.nix | 14 --------------
 home/obs.nix                              |  8 ++++++--
 modules/ags/default.nix                   |  2 +-
 modules/hyprland/default.nix              |  2 +-
 6 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/common/default.nix b/common/default.nix
index 66f3a58..1fe33ee 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -68,21 +68,21 @@
   home-manager.users = let
     default = {
       imports = [
+        # Make the vars be the same on Nix and HM
+        ./vars.nix
+        ({osConfig, ...}: {vars = osConfig.vars;})
+
         nur.hmModules.nur
 
         ./home
         ./pkgs
-
-        # Make the vars be the same on Nix and HM
-        ./vars.nix
-        ({osConfig, ...}: {vars = osConfig.vars;})
       ];
 
       home.packages =
         [
           config.customPkgs.repl
-          nix-melt.packages.x86_64-linux.default
-          nurl.packages.x86_64-linux.default
+          nix-melt.packages.${pkgs.system}.default
+          nurl.packages.${pkgs.system}.default
         ]
         ++ (with config.nur.repos.rycee; [
           mozilla-addons-to-nix
diff --git a/common/home/bash/programs.nix b/common/home/bash/programs.nix
index 14c6f4d..936ab3c 100644
--- a/common/home/bash/programs.nix
+++ b/common/home/bash/programs.nix
@@ -40,8 +40,13 @@
       };
       themes = {
         dracula-bat = {
-          src = "${pkgs.dracula-theme}/bat";
-          file = "dracula-bat.tmTheme";
+          src = pkgs.fetchFromGitHub {
+            owner = "matt1432";
+            repo = "bat";
+            rev = "270bce892537311ac92494a2a7663e3ecf772092";
+            hash = "sha256-UyZ3WFfrEEBjtdb//5waVItmjKorkOiNGtu9eeB3lOw=";
+          };
+          file = "Dracula.tmTheme";
         };
       };
       extraPackages = with pkgs.bat-extras; [
diff --git a/common/overlays/dracula-theme/default.nix b/common/overlays/dracula-theme/default.nix
index 72cebe5..20899c4 100644
--- a/common/overlays/dracula-theme/default.nix
+++ b/common/overlays/dracula-theme/default.nix
@@ -15,13 +15,6 @@
     hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM=";
   };
 
-  bat-theme = pkgs.fetchFromGitHub {
-    owner = "matt1432";
-    repo = "bat";
-    rev = "270bce892537311ac92494a2a7663e3ecf772092";
-    hash = "sha256-UyZ3WFfrEEBjtdb//5waVItmjKorkOiNGtu9eeB3lOw=";
-  };
-
   wallpaper = pkgs.fetchurl {
     url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true";
     hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk=";
@@ -50,13 +43,6 @@ in {
           mkdir -p $out
           cp -a ./git-colors $out
 
-          # Bat colors
-          mkdir -p ./bat $out/bat
-          cp -a ${bat-theme}/Dracula.tmTheme ./bat/dracula-bat.tmTheme
-          chmod 777 ./bat/dracula-bat.tmTheme
-
-          cp -a ./bat/dracula-bat.tmTheme $out/bat
-
           # Plymouth
           cp -a ${plymouth}/dracula ./dracula
           chmod 777 ./dracula
diff --git a/home/obs.nix b/home/obs.nix
index 96578fe..ecbed81 100644
--- a/home/obs.nix
+++ b/home/obs.nix
@@ -1,5 +1,9 @@
-{nixpkgs-wayland, ...}: let
-  waypkgs = nixpkgs-wayland.packages.x86_64-linux;
+{
+  nixpkgs-wayland,
+  pkgs,
+  ...
+}: let
+  waypkgs = nixpkgs-wayland.packages.${pkgs.system};
 in {
   programs = {
     obs-studio = {
diff --git a/modules/ags/default.nix b/modules/ags/default.nix
index 15e0380..95c15da 100644
--- a/modules/ags/default.nix
+++ b/modules/ags/default.nix
@@ -23,7 +23,7 @@ in {
       programs.ags = {
         enable = true;
         configDir = symlink "${config.vars.configDir}/ags";
-        package = ags.packages.x86_64-linux.default;
+        package = ags.packages.${pkgs.system}.default;
         extraPackages = [pkgs.libgudev];
       };
 
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 96ba90f..a139c6c 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -53,7 +53,7 @@ in {
 
     wayland.windowManager.hyprland = {
       enable = true;
-      package = hyprland.packages.x86_64-linux.default;
+      package = hyprland.packages.${pkgs.system}.default;
 
       plugins =
         []