From 476ede9d253b2a1c7affb03fabe3d74e72e3fe95 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Thu, 9 Mar 2023 00:24:50 +0100
Subject: [PATCH] Finally make everything looks a bit better with icons

---
 home/modules/linux/graphical/default.nix  | 20 ++++++++++++++++++++
 home/modules/programs/my-sway/default.nix | 23 +++++++++++++++++++----
 nki-home/configuration.nix                | 11 ++++++-----
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix
index af8182b..1644ddb 100644
--- a/home/modules/linux/graphical/default.nix
+++ b/home/modules/linux/graphical/default.nix
@@ -76,6 +76,26 @@ in
       "x-scheme-handler/mid" = [ "userapp-Thunderbird-HPUL11.desktop" ];
     };
 
+    # Theming
+    ## GTK
+    gtk.enable = true;
+    gtk.cursorTheme = { inherit (config.home.pointerCursor) package name size; };
+    gtk.font.name = "Noto Sans";
+    gtk.font.size = 10;
+    gtk.iconTheme = {
+      package = pkgs.numix-icon-theme;
+      name = "Numix";
+    };
+    gtk.theme = {
+      package = pkgs.numix-gtk-theme;
+      name = "Numix";
+    };
+    ## Qt
+    qt.enable = true;
+    qt.platformTheme = "gnome";
+    qt.style.package = pkgs.adwaita-qt;
+    qt.style.name = "adwaita";
+
     home.sessionVariables = {
       # Set up Java font style
       _JAVA_OPTIONS = "-Dawt.useSystemAAFontSettings=lcd";
diff --git a/home/modules/programs/my-sway/default.nix b/home/modules/programs/my-sway/default.nix
index 767d6e3..174d2c1 100644
--- a/home/modules/programs/my-sway/default.nix
+++ b/home/modules/programs/my-sway/default.nix
@@ -347,6 +347,7 @@ in
           (if cfg.enableMpd then "mpd" else "custom/media")
           "tray"
           "pulseaudio"
+          "bluetooth"
           "network"
           "cpu"
           "memory"
@@ -425,6 +426,16 @@ in
             format-disconnected = "Disconnected ⚠";
             interval = 7;
           };
+          "bluetooth" = {
+            format = " {status}";
+            format-connected = " {device_alias}";
+            format-connected-battery = " {device_alias} {device_battery_percentage}%";
+            # format-device-preference= [ "device1", "device2" ], // preference list deciding the displayed devic;
+            tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected";
+            tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}";
+            tooltip-format-enumerate-connected = "{device_alias}\t{device_address}";
+            tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%";
+          };
           "pulseaudio" = {
             # scroll-step = 1;
             format = "{volume}% {icon}";
@@ -432,8 +443,8 @@ in
             format-muted = "";
             format-icons = {
               headphones = "";
-              handsfree = "";
-              headset = "";
+              handsfree = "";
+              headset = "";
               phone = "";
               portable = "";
               car = "";
@@ -524,7 +535,7 @@ in
           border-bottom: 3px solid #ffffff;
       }
 
-      #clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd {
+      #clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #bluetooth, #custom-media, #tray, #mode, #idle_inhibitor, #mpd {
           padding: 0 10px;
           margin: 0 5px;
       }
@@ -588,7 +599,11 @@ in
 
       #pulseaudio.muted {
           background: #90b1b1;
-          color: #2a5c45;
+      }
+
+      #bluetooth {
+          background: DarkSlateBlue;
+          color: white;
       }
 
       #custom-media {
diff --git a/nki-home/configuration.nix b/nki-home/configuration.nix
index e717af9..139a0db 100644
--- a/nki-home/configuration.nix
+++ b/nki-home/configuration.nix
@@ -142,11 +142,6 @@
 
     ## Wayland
     qt5.qtwayland
-
-    ## Enable nix-flakes
-    # (pkgs.writeShellScriptBin "nixFlakes" ''
-    #   exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
-    # '')
   ];
 
   # Nix config
@@ -192,7 +187,11 @@
   xdg.portal = {
     enable = true;
     wlr.enable = true;
+
+    # gtk portal needed to make gtk apps happy
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
+  programs.dconf.enable = true;
   services.gnome.gnome-keyring.enable = true;
 
   # Enable the OpenSSH daemon.
@@ -209,6 +208,8 @@
   #
   hardware.bluetooth.enable = true;
   hardware.bluetooth.package = pkgs.bluez5-experimental;
+  hardware.bluetooth.settings.General.Experimental = true;
+  services.blueman.enable = true;
 
   # Peripherals
   hardware.opentabletdriver.enable = true;