From 4577adc53ffeeb760564285cf8c44422bf81f095 Mon Sep 17 00:00:00 2001
From: marc <marc@sastre.cat>
Date: Mon, 7 Nov 2022 19:40:18 +0100
Subject: [PATCH] More polybar changes and added discord

---
 .../.config/polybar/bars/modules/wireless.ini   |  4 ++--
 config/.config/polybar/scripts/bluetooth.sh     |  3 +--
 flake.nix                                       |  2 ++
 home/hosts/reykjavik.nix                        |  1 +
 home/modules/app/default.nix                    |  1 +
 home/modules/app/discord.nix                    | 17 +++++++++++++++++
 home/modules/desktop/i3.nix                     |  1 -
 overlays/default.nix                            |  3 +++
 overlays/discord.nix                            |  6 ++++++
 9 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 home/modules/app/discord.nix
 create mode 100644 overlays/default.nix
 create mode 100644 overlays/discord.nix

diff --git a/config/.config/polybar/bars/modules/wireless.ini b/config/.config/polybar/bars/modules/wireless.ini
index 5f181cb..4b48f99 100644
--- a/config/.config/polybar/bars/modules/wireless.ini
+++ b/config/.config/polybar/bars/modules/wireless.ini
@@ -11,13 +11,13 @@ accumulate-stats = true
 speed-unit = ''
 
 format-connected = <label-connected>
-label-connected = %essid% (%local_ip%)
+label-connected = %{T2}直%{T-} %essid% (%local_ip%)
 label-connected-background = ${colours/wireless.connected-bg}
 label-connected-foreground = ${colours/wireless.connected-fg}
 label-connected-padding = 1
 
 format-disconnected = <label-disconnected>
-label-disconnected = not connected
+label-disconnected = %{T2}睊
 label-disconnected-background = ${colours/wireless.disconnected-bg}
 label-disconnected-foreground = ${colours/wireless.disconnected-fg}
 label-disconnected-padding = 1
diff --git a/config/.config/polybar/scripts/bluetooth.sh b/config/.config/polybar/scripts/bluetooth.sh
index 491cd72..390a293 100755
--- a/config/.config/polybar/scripts/bluetooth.sh
+++ b/config/.config/polybar/scripts/bluetooth.sh
@@ -25,8 +25,7 @@ bluetooth_print() {
 
         printf '\n'
     else
-	# ""
-        echo ""
+        echo " -"
     fi
 }
 
diff --git a/flake.nix b/flake.nix
index 3dfe5e1..2480a25 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,6 +18,7 @@
       pkgs = import nixpkgs {
         inherit system;
         config.allowUnfree = true;
+        overlays = import ./overlays;
       };
       lib = nixpkgs.lib;
     in {
@@ -26,6 +27,7 @@
         # - Kopavogur ----------------------------
         kopavogur = lib.nixosSystem {
           inherit system;
+          inherit pkgs;
           modules = [
 
             ./system/modules
diff --git a/home/hosts/reykjavik.nix b/home/hosts/reykjavik.nix
index aeb6100..e0b72df 100644
--- a/home/hosts/reykjavik.nix
+++ b/home/hosts/reykjavik.nix
@@ -6,6 +6,7 @@
   samfelag = {
     modules = {
       app = {
+        discord.enable = true;
         spotify.enable = true;
       };
     };
diff --git a/home/modules/app/default.nix b/home/modules/app/default.nix
index 7c971d7..cef464b 100644
--- a/home/modules/app/default.nix
+++ b/home/modules/app/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
    ./alacritty.nix
+   ./discord.nix
    ./spotify.nix
   ];
 }
diff --git a/home/modules/app/discord.nix b/home/modules/app/discord.nix
new file mode 100644
index 0000000..bfa293b
--- /dev/null
+++ b/home/modules/app/discord.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.samfelag.modules.app.discord;
+in
+{
+  options.samfelag.modules.app.discord = {
+    enable = mkEnableOption "discord";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      discord
+    ];
+  };
+}
diff --git a/home/modules/desktop/i3.nix b/home/modules/desktop/i3.nix
index bf26292..6814009 100644
--- a/home/modules/desktop/i3.nix
+++ b/home/modules/desktop/i3.nix
@@ -52,7 +52,6 @@ in {
 
     xsession.windowManager.i3 = {
       enable = true;
-      package = pkgs.i3-gaps;
 
       config = {
         modifier = mod;
diff --git a/overlays/default.nix b/overlays/default.nix
new file mode 100644
index 0000000..5295c90
--- /dev/null
+++ b/overlays/default.nix
@@ -0,0 +1,3 @@
+[
+  (import ./discord.nix)
+]
diff --git a/overlays/discord.nix b/overlays/discord.nix
new file mode 100644
index 0000000..6fcd63d
--- /dev/null
+++ b/overlays/discord.nix
@@ -0,0 +1,6 @@
+self: super:
+{
+  discord = super.discord.overrideAttrs (_: {
+    src = builtins.fetchTarball https://discord.com/api/download?platform=linux&format=tar.gz;
+  });
+}