From 476b42f8afcb520ab3be0a30f0e0fda0650d46ca Mon Sep 17 00:00:00 2001
From: ISnortPennies <ISnortPennies@protonmail.com>
Date: Fri, 27 Jan 2023 23:53:02 -0500
Subject: [PATCH] switch to webcord, got from master branch waiting for it to
 add to unstable

---
 flake.nix                                     |  7 +++----
 home-manager/config/discord/settings.json.old | 16 ----------------
 modules/fonts.nix                             |  3 +++
 modules/packages.nix                          |  2 +-
 4 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 home-manager/config/discord/settings.json.old

diff --git a/flake.nix b/flake.nix
index 9427884..31359ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs-master.url = "github:nixos/nixpkgs";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -21,6 +22,7 @@
   outputs = {
     self,
     nixpkgs,
+    nixpkgs-master,
     home-manager,
     spicetify-nix,
     suckless,
@@ -39,13 +41,10 @@
           t-rex-miner = final.callPackage ./pkgs/t-rex-miner {};
           afk-cmds = final.callPackage ./pkgs/afk-cmds {};
           parrot = final.callPackage ./pkgs/parrot {};
+          webcord = inputs.nixpkgs-master.legacyPackages.${system}.webcord;
           nerdfonts-overpass = prev.nerdfonts.override {
             fonts = ["Overpass"];
           };
-          discord = prev.discord.override {
-            withOpenASAR = true;
-            nss = prev.nss_latest;
-          };
         })
         suckless.overlays.all
       ];
diff --git a/home-manager/config/discord/settings.json.old b/home-manager/config/discord/settings.json.old
deleted file mode 100644
index f1eae8a..0000000
--- a/home-manager/config/discord/settings.json.old
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "openasar": {
-    "setup": true,
-    "noTyping": true,
-    "themeSync": true,
-    "quickstart": true,
-    "css": "@import url('https://mwittrien.github.io/BetterDiscordAddons/Themes/DiscordRecolor/DiscordRecolor.css');\n\n:root {\n  --accentcolor: 121,218,200;\n  --accentcolor2: 255,84,84;\n  --linkcolor: 128,160,255;\n  --mentioncolor: 227,199,138;\n  --textbrightest: 255,255,255;\n  --textbrighter: 222,222,222;\n  --textbright: 185,185,185;\n  --textdark: 140,140,140;\n  --textdarker: 115,115,115;\n  --textdarkest: 80,80,80;\n  --font: Overpass;\n  --backgroundaccent: 50,52,55;\n  --backgroundprimary: 0,0,0;\n  --backgroundsecondary: 0,0,0;\n  --backgroundsecondaryalt: 0,0,0;\n  --backgroundtertiary: 50,52,55;\n  --backgroundfloating: 50,52,55;\n  --settingsicons: 1;\n}"
-  },
-  "IS_MAXIMIZED": false,
-  "IS_MINIMIZED": false,
-  "MIN_WIDTH": 0,
-  "MIN_HEIGHT": 0,
-  "OPEN_ON_STARTUP": false,
-  "MINIMIZE_TO_TRAY": false,
-  "SKIP_HOST_UPDATE": true
-}
diff --git a/modules/fonts.nix b/modules/fonts.nix
index 8c2b022..f5fdd42 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -1,6 +1,7 @@
 {pkgs, ...}: {
   fonts = {
     fonts = with pkgs; [overpass nerdfonts-overpass material-design-icons];
+    fontDir.enable = true;
     fontconfig = {
       enable = true;
       defaultFonts = {
@@ -8,6 +9,8 @@
         sansSerif = ["Overpass" "Overpass Nerd Font" "Material Design Icons"];
         monospace = ["Overpass Mono" "OverpassMono Nerd Font" "Material Design Icons"];
       };
+      hinting.enable = true;
+      antialias = true;
     };
   };
 }
diff --git a/modules/packages.nix b/modules/packages.nix
index fff4a2a..37670ac 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -14,7 +14,7 @@
     vlc #play stuff
     bitwarden #store stuff
     qbittorrent #steal stuff
-    discord # talk to people (gross)
+    webcord # talk to people (gross)
     feh #for wallpaper
     xfce.mousepad
     brightnessctl #brightness control for laptop