From c3dd5dda65576c0c465a6853b4859a24c1c3ff80 Mon Sep 17 00:00:00 2001
From: marc <marc@sastre.cat>
Date: Sun, 6 Nov 2022 15:35:47 +0100
Subject: [PATCH] Modified polybar

---
 config/.config/alacritty/alacritty.yml        |   3 +
 config/.config/polybar/bars/bars.ini          |  51 ++++
 config/.config/polybar/bars/colours.ini       |  61 +++++
 .../.config/polybar/bars/modules/battery.ini  |  31 +++
 config/.config/polybar/bars/modules/date.ini  |  13 +
 .../.config/polybar/bars/modules/i3-mode.ini  |   7 +
 .../.config/polybar/bars/modules/padding.ini  |  13 +
 .../.config/polybar/bars/modules/volume.ini   |  15 ++
 .../polybar/bars/modules/workspaces.ini       |  22 ++
 config/.config/polybar/config.ini             |   1 +
 home/hosts/reykjavik.nix                      |   5 +
 home/modules/app/default.nix                  |   1 +
 home/modules/app/spotify.nix                  |  17 ++
 home/modules/desktop/i3.nix                   |  56 +++++
 home/modules/desktop/polybar.nix              | 227 +++---------------
 home/profiles/desktop.nix                     |   2 +
 system/hosts/reykjavik/default.nix            |  16 +-
 system/modules/bluetooth.nix                  |  17 ++
 system/modules/default.nix                    |   1 +
 system/profiles/common.nix                    |   1 +
 20 files changed, 353 insertions(+), 207 deletions(-)
 create mode 100644 config/.config/polybar/bars/bars.ini
 create mode 100644 config/.config/polybar/bars/colours.ini
 create mode 100644 config/.config/polybar/bars/modules/battery.ini
 create mode 100644 config/.config/polybar/bars/modules/date.ini
 create mode 100644 config/.config/polybar/bars/modules/i3-mode.ini
 create mode 100644 config/.config/polybar/bars/modules/padding.ini
 create mode 100644 config/.config/polybar/bars/modules/volume.ini
 create mode 100644 config/.config/polybar/bars/modules/workspaces.ini
 create mode 100644 config/.config/polybar/config.ini
 create mode 100644 home/modules/app/spotify.nix
 create mode 100644 system/modules/bluetooth.nix

diff --git a/config/.config/alacritty/alacritty.yml b/config/.config/alacritty/alacritty.yml
index 550e3d0..d743a78 100644
--- a/config/.config/alacritty/alacritty.yml
+++ b/config/.config/alacritty/alacritty.yml
@@ -1,4 +1,7 @@
+window:
+  opacity: 0.85
 font:
+  size: 8
   normal:
     family: Iosevka Nerd Font
     style: Regular
diff --git a/config/.config/polybar/bars/bars.ini b/config/.config/polybar/bars/bars.ini
new file mode 100644
index 0000000..e0f53cc
--- /dev/null
+++ b/config/.config/polybar/bars/bars.ini
@@ -0,0 +1,51 @@
+include-file = colours.ini
+include-directory = modules
+
+[bar/base]
+dpi      = 96
+width    = 100%
+height   = 32
+offset-x = 0
+offset-y = 0
+
+font-0 = "Iosevka:size=10;2"
+font-1 = "Iosevka:size=16;2"
+font-2 = "Iosevka:size=22;4"
+
+background = ${colours.trans}
+foreground = ${colours.white}
+
+border-bottom-size  = 5
+border-top-size     = 5
+
+border-left-size  = 10
+border-right-size = 10
+
+border-bottom-colour = ${colours.trans}
+border-top-colour    = ${colours.trans}
+
+border-left-colour  = ${colours.trans}
+border-right-colour = ${colours.trans}
+
+spacing            = 0
+padding-left       = 0
+padding-right      = 0
+module-margin-left = 0
+
+[bar/bottom]
+inherit = bar/base
+bottom = true
+
+modules-left  = workspaces 
+modules-right = volume paddinglite battery
+
+tray-position = center
+tray-maxsize = 28
+
+[bar/top]
+inherit = bar/base
+bottom = false
+
+modules-left  =  
+modules-center = date
+modules-right = i3-mode
diff --git a/config/.config/polybar/bars/colours.ini b/config/.config/polybar/bars/colours.ini
new file mode 100644
index 0000000..cd798fe
--- /dev/null
+++ b/config/.config/polybar/bars/colours.ini
@@ -0,0 +1,61 @@
+[colours]
+trans = #0000
+white = #fff
+black = #000
+gray = #555
+
+blue- = #498AD4
+blue  = #2B6CB6
+blue+ = #173B63
+
+xanadu- = #B3BCB6
+xanadu  = #808F85
+xanadu+ = #606C64
+
+green- = #CAE2CE
+green  = #91C499
+green+ = #61A86D
+
+linen- = #F9F5F0
+linen  = #F2E9DC
+linen+ = #DEC6A6
+
+pear- = #E8EB5C
+pear  = #CFD11A
+pear+ = #8F9112
+
+orange- = #FEB548
+orange  = #F18F01
+orange+ = #A26201
+
+[colours/date]
+bg = ${colours.pear}
+fg = ${colours.gray}
+
+[colours/battery]
+full-bg = ${colours.green+}
+full-fg = ${colours.gray} 
+charging-bg = ${colours.green}
+charging-fg = ${colours.gray} 
+discharging-bg = ${colours.green}
+discharging-fg = ${colours.gray} 
+low-bg = ${colours.orange}
+low-fg = ${colours.gray} 
+
+[colours/workspaces]
+focused-bg = ${colours.linen+}
+focused-fg = ${colours.gray}
+unfocused-bg = ${colours.linen}
+unfocused-fg = ${colours.gray}
+urgent-bg = ${colours.orange-}
+urgent-fg = ${colours.gray}
+
+[colours/i3-mode]
+bg = ${colours.orange}
+fg = ${colours.gray}
+
+[colours/volume]
+volume-bg = ${colours.blue}
+volume-fg = ${colours.white}
+muted-bg = ${colours.blue-}
+muted-fg = ${colours.white}
diff --git a/config/.config/polybar/bars/modules/battery.ini b/config/.config/polybar/bars/modules/battery.ini
new file mode 100644
index 0000000..42cc947
--- /dev/null
+++ b/config/.config/polybar/bars/modules/battery.ini
@@ -0,0 +1,31 @@
+[module/battery]
+type          = internal/battery
+full-at       = 100
+low-at        = 20
+battery       = BAT0
+adapter       = ADP0
+poll-interval = 5
+
+format-full = <label-full>
+label-full            = "%{T2}%{T-} %percentage%%"
+label-full-background = ${colours/battery.full-bg}
+label-full-foreground = ${colours/battery.full-fg}
+label-full-padding    = 1
+
+format-charging = <label-charging>
+label-charging            = "%{T2}%{T-} %percentage%%"
+label-charging-background = ${colours/battery.charging-bg}
+label-charging-foreground = ${colours/battery.charging-fg}
+label-charging-padding    = 1
+
+format-discharging = <label-discharging>
+label-discharging            = "%{T2}%{T-} %percentage%%"
+label-discharging-background = ${colours/battery.discharging-bg}
+label-discharging-foreground = ${colours/battery.discharging-fg}
+label-discharging-padding    = 1
+
+format-low = <label-low>
+label-low            = "%{T2}%{T-} %percentage%%"
+label-low-background = ${colours/battery.low-bg}
+label-low-foreground = ${colours/battery.low-fg}
+label-low-padding    = 1
diff --git a/config/.config/polybar/bars/modules/date.ini b/config/.config/polybar/bars/modules/date.ini
new file mode 100644
index 0000000..b98c120
--- /dev/null
+++ b/config/.config/polybar/bars/modules/date.ini
@@ -0,0 +1,13 @@
+[module/date]
+type     = internal/date
+interval = 1.0
+date     = %A, %d %B %Y
+time     = %H:%M:%S
+label    = %date% · %time%
+
+format         = <label>
+format-padding = 0
+
+label-background = ${colours/date.bg}
+label-foreground = ${colours/date.fg}
+label-padding    = 1
diff --git a/config/.config/polybar/bars/modules/i3-mode.ini b/config/.config/polybar/bars/modules/i3-mode.ini
new file mode 100644
index 0000000..edf9a79
--- /dev/null
+++ b/config/.config/polybar/bars/modules/i3-mode.ini
@@ -0,0 +1,7 @@
+[module/i3-mode]
+type            = internal/i3
+format          = <label-mode>
+
+label-mode-background = ${colours/i3-mode.bg}
+label-mode-foreground = ${colours/i3-mode.fg}
+label-mode-padding    = 2
diff --git a/config/.config/polybar/bars/modules/padding.ini b/config/.config/polybar/bars/modules/padding.ini
new file mode 100644
index 0000000..628207f
--- /dev/null
+++ b/config/.config/polybar/bars/modules/padding.ini
@@ -0,0 +1,13 @@
+[module/padding]
+type               = custom/text
+content            = ||
+content-padding    = 1
+content-foreground = ${colours.trans}
+content-background = ${colours.trans}
+
+[module/paddinglite]
+type               = custom/text
+content            = |
+content-padding    = .5
+content-foreground = ${colours.trans}
+content-background = ${colours.trans}
diff --git a/config/.config/polybar/bars/modules/volume.ini b/config/.config/polybar/bars/modules/volume.ini
new file mode 100644
index 0000000..b0e1b40
--- /dev/null
+++ b/config/.config/polybar/bars/modules/volume.ini
@@ -0,0 +1,15 @@
+[module/volume]
+type = internal/pulseaudio
+interval = 5
+
+format-volume = <label-volume>
+label-volume = %{T2}墳%{T-} %percentage%%
+label-volume-padding = 1
+label-volume-foreground = ${colours/volume.volume-fg}
+label-volume-background = ${colours/volume.volume-bg}
+
+format-muted = <label-muted>
+label-muted = %{T2}ﱝ%{T-} muted
+label-muted-padding = 1
+label-muted-foreground = ${colours/volume.muted-fg}
+label-muted-background = ${colours/volume.muted-bg}
diff --git a/config/.config/polybar/bars/modules/workspaces.ini b/config/.config/polybar/bars/modules/workspaces.ini
new file mode 100644
index 0000000..9b62119
--- /dev/null
+++ b/config/.config/polybar/bars/modules/workspaces.ini
@@ -0,0 +1,22 @@
+[module/workspaces]
+type            = internal/i3
+format          = <label-state>
+index-sort      = true
+wrapping-scroll = false
+strip-wsnumbers = true
+pin-workspaces = true
+
+label-focused            = %index%
+label-focused-background = ${colours/workspaces.focused-bg}
+label-focused-foreground = ${colours/workspaces.focused-fg}
+label-focused-padding    = 2
+
+label-unfocused            = %index%
+label-unfocused-background = ${colours/workspaces.unfocused-bg}
+label-unfocused-foreground = ${colours/workspaces.unfocused-fg}
+label-unfocused-padding    = 2
+
+label-urgent            = %index%
+label-urgent-background = ${colours/workspaces.urgent-bg}
+label-urgent-foreground = ${colours/workspaces.urgent-fg}
+label-urgent-padding    = 2
diff --git a/config/.config/polybar/config.ini b/config/.config/polybar/config.ini
new file mode 100644
index 0000000..c72cb6d
--- /dev/null
+++ b/config/.config/polybar/config.ini
@@ -0,0 +1 @@
+include-file = bars/bars.ini
diff --git a/home/hosts/reykjavik.nix b/home/hosts/reykjavik.nix
index 0a523c8..aeb6100 100644
--- a/home/hosts/reykjavik.nix
+++ b/home/hosts/reykjavik.nix
@@ -4,6 +4,11 @@
   home.stateVersion = "22.05";
 
   samfelag = {
+    modules = {
+      app = {
+        spotify.enable = true;
+      };
+    };
     profiles = {
       desktop.enable = true;
       gaming.enable = true;
diff --git a/home/modules/app/default.nix b/home/modules/app/default.nix
index 5ff3bea..7c971d7 100644
--- a/home/modules/app/default.nix
+++ b/home/modules/app/default.nix
@@ -3,5 +3,6 @@
 {
   imports = [
    ./alacritty.nix
+   ./spotify.nix
   ];
 }
diff --git a/home/modules/app/spotify.nix b/home/modules/app/spotify.nix
new file mode 100644
index 0000000..513ca16
--- /dev/null
+++ b/home/modules/app/spotify.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.samfelag.modules.app.spotify;
+in
+{
+  options.samfelag.modules.app.spotify = {
+    enable = mkEnableOption "spotify";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      spotify
+    ];
+  };
+}
diff --git a/home/modules/desktop/i3.nix b/home/modules/desktop/i3.nix
index 7ae07cf..e40311c 100644
--- a/home/modules/desktop/i3.nix
+++ b/home/modules/desktop/i3.nix
@@ -17,6 +17,8 @@ let
     };
   });
 
+  system_mode = "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown";
+
 in {
 
   options.samfelag.modules.desktop.i3 = {
@@ -44,6 +46,8 @@ in {
 
     xsession.windowManager.i3 = {
       enable = true;
+      package = pkgs.i3-gaps;
+
       config = {
         modifier = mod;
 
@@ -57,11 +61,43 @@ in {
 
 	bars = [ ];
 
+        window = {
+          border = 1;
+          titlebar = false;
+        };
+
+        # gaps = {
+        #   inner = 10;
+        #   outer = 5;
+        # };
+
 	startup = [
           { command = "i3-msg workspace 1"; }
           { command = "systemctl --user restart polybar"; always = true; notification = false; }
         ];
 
+        modes = {
+          "resize" = {
+            "h" = "resize shrink width 10 px or 10 ppt";
+            "j" = "resize grow height 10 px or 10 ppt";
+            "k" = "resize shrink height 10 px or 10 ppt";
+            "l" = "resize grow width 10 px or 10 ppt";
+            
+            "Left"  = "resize shrink width 10 px or 10 ppt";
+            "Down"  = "resize grow height 10 px or 10 ppt";
+            "Up"    = "resize shrink height 10 px or 10 ppt";
+            "Right" = "resize grow width 10 px or 10 ppt";
+            
+            "Return" = "mode \"default\"";
+            "Escape" = "mode \"default\"";
+          };
+
+	  "${system_mode}" = {
+            "Return" = "mode \"default\"";
+            "Escape" = "mode \"default\"";
+          };
+        };
+
         keybindings = {
           "${mod}+q" = "kill";
 
@@ -107,6 +143,26 @@ in {
           "${mod}+Shift+c" = "reload";
           "${mod}+Shift+r" = "restart";
 
+          # - Modes ------------------------------
+          "${mod}+r" = "mode \"resize\"";
+          "${mod}+End" = "mode \"${system_mode}\"";
+
+          # - Media ------------------------------
+
+ 	  # Pulse Audio controls
+	  "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%";
+	  "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%";
+	  "Shift+XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1%";
+	  "Shift+XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1%";
+	  "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle";
+	  
+	  # Media player controls
+	  "XF86AudioPlay" = "exec playerctl play-pause";
+	  "XF86AudioPause" = "exec playerctl play-pause";
+	  "XF86AudioNext" = "exec playerctl next";
+	  "XF86AudioPrev" = "exec playerctl previous";
+          "XF86AudioStop" = "exec playerctl stop";
+
           # - Workspaces -------------------------
           "${mod}+1" = "workspace 1";
           "${mod}+2" = "workspace 2";
diff --git a/home/modules/desktop/polybar.nix b/home/modules/desktop/polybar.nix
index a49f58c..fcc6997 100644
--- a/home/modules/desktop/polybar.nix
+++ b/home/modules/desktop/polybar.nix
@@ -2,6 +2,14 @@
 
 let 
   cfg = config.samfelag.modules.desktop.polybar;
+  polybar_pkg = pkgs.polybar.override {
+    i3Support = true;
+    pulseSupport = true;
+  };
+  script = ''
+    polybar top &
+    polybar bottom &
+  '';
 in {
 
   options.samfelag.modules.desktop.polybar = {
@@ -12,211 +20,30 @@ in {
 
     # - Configuration ----------------------------
 
-    services.polybar = {
-      enable = true;
+    home.packages = [
+      polybar_pkg
+    ];
 
-      package = pkgs.polybar.override {
-        i3Support = true;
-        pulseSupport = true;
+    xdg.configFile."polybar/config.ini".source = ../../../config/.config/polybar/config.ini;
+    xdg.configFile."polybar/bars".source = ../../../config/.config/polybar/bars;
+
+    systemd.user.services.polybar = {
+      Unit = {
+        Description = "Polybar status bar";
+        PartOf = [ "tray.target" ];
+        X-Restart-Triggers = [ "${config.xdg.configFile."polybar/config.ini".source}" ];
       };
 
-      config = {
-
-        # - Colors -------------------------------
-
-        "colors" = {
-	  "background" = "#222";
-	  "background-alt" = "#444";
-	  "foreground" = "#dfdfdf";
-	  "foreground-alt" = "#555";
-	  "primary" = "#ffb52a";
-	  "secondary" = "#e60053";
-	  "alert" = "#bd2c40";
-        };
-
-        # - Mainbar ------------------------------
-        
-	"bar/mainbar-i3" = {
-	  "monitor" = "\${env:MONITOR}";
-	  "monitor-strict" = "false";
-	  "bottom" = "false";
-	  "fixed-center" = "true";
-	  "width" = "100%";
-	  "height" = "30";
-	  
-	  "background" = "\${colors.background}";
-	  "foreground" = "\${colors.foreground}";
-	  
-	  "radius" = "0.0";
-	  "line-size" = "2";
-	  "line-color" = "#000000";
-	  "border-color" = "#000000";
-	  
-	  "padding-left" = "1";
-	  "padding-right" = "1";
-	  
-	  "module-margin-left" = "0";
-	  "module-margin-right" = "0";
-	  
-	  "font-0" = "\"Iosevka:style=Regular:size=15;2\"";
-	  "font-1" = "\"Iosevka:size=16;3\"";
-	  "font-2" = "\"Iosevka:style=Regular:pixelsize=10;1\"";
-	  "font-3" = "\"Iosevka:style=Solid:pixelsize=10;1\"";
-	  "font-4" = "\"Iosevka:pixelsize=10;1\"";
-	  
-	  "modules-left" = "i3"; 
-	  "modules-center" = "date";
-	  "modules-right" = "wifi pulseaudio battery";
-	  
-	  "separator" = "\" : \"";
-	  
-	  "tray-position" = "left";
-	  "tray-detached" = "false";
-	  "tray-maxsize" = "20";
-	  "tray-background" = "\${colors.background}";
-	  "tray-offset-x" = "0";
-	  "tray-offset-y" = "0";
-	  "tray-padding" = "4";
-	  "tray-scale" = "1.0";
-	  
-	  "enable-ipc" = "true";
-	  
-	  "click-left" = "";
-	  "click-middle" = "";
-	  "click-right" = "";
-	  "scroll-up" = "i3wm-wsnext";
-	  "scroll-down" = "i3wm-wsprev";
-	  "double-click-left" = "";
-	  "double-click-middle" = "";
-	  "double-click-right" = "";
-	  
-	  "cursor-click" = "";
-	  "cursor-scroll" = "";
-        };
-
-        # - Module: i3 ---------------------------
-
-        "module/i3" = {
-	  "type" = "internal/i3";
-	  "format" = "<label-state> <label-mode>";
-	  "index-sort" = "true";
-	  "wrapping-scroll" = "false";
-	  
-	  "label-mode-padding" = "2";
-	  "label-mode-foreground" = "#000";
-	  "label-mode-background" = "\${colors.primary}";
-	  
-	  "label-focused" = "%index%";
-	  "label-focused-background" = "\${colors.background-alt}";
-	  "label-focused-underline" = "\${colors.secondary}";
-	  "label-focused-padding" = "2";
-	  
-	  "label-unfocused" = "%index%";
-	  "label-unfocused-padding" = "2";
-	  
-	  "label-visible" = "%index%";
-	  "label-visible-background" = "\${self.label-focused-background}";
-	  "label-visible-underline" = "\${colors.primary}";
-	  "label-visible-padding" = "\${self.label-focused-padding}";
-	  
-	  "label-urgent" = "%index%";
-	  "label-urgent-background" = "\${colors.alert}";
-	  "label-urgent-padding" = "2";
-        };
-	
-        # - Module: date -------------------------
-
-        "module/date" = {
-	  "type" = "internal/date";
-	  "interval" = "1";
-	  
-	  "date" = "%A, %d %B %Y";
-	  "time" = "%H:%M:%S";
-	  
-	  "time-alt" = "%H:%M:%S %Z (%z)";
-	  "date-alt" = "%Y-%m-%d";
-	  
-	  "format-prefix" = "";
-	  "format-prefix-foreground" = "\${colors.foreground-alt}";
-	  "format-underline" = "";
-	  
-	  "label" = "%date% · %time%";
-        };
-	
-        # - Module: pulseaudio -------------------
-
-        "module/pulseaudio" = {
-	  "type" = "internal/pulseaudio";
-	  
-	  "format-volume" = "<label-volume> <bar-volume>";
-	  "label-volume" = "VOL %percentage%%";
-	  "label-volume-foreground" = "\${colors.foreground-alt}";
-	  
-	  "label-muted" = "muted";
-	  "label-muted-foreground" = "#666";
-	  
-	  "bar-volume-width" = "10";
-	  "bar-volume-foreground-0" = "#55aa55";
-	  "bar-volume-foreground-1" = "#55aa55";
-	  "bar-volume-foreground-2" = "#55aa55";
-	  "bar-volume-foreground-3" = "#55aa55";
-	  "bar-volume-foreground-4" = "#55aa55";
-	  "bar-volume-foreground-5" = "#f5a70a";
-	  "bar-volume-foreground-6" = "#ff5555";
-	  "bar-volume-gradient" = "false";
-	  "bar-volume-indicator" = "|";
-	  "bar-volume-indicator-font" = "0";
-	  "bar-volume-fill" = "-";
-	  "bar-volume-fill-font" = "0";
-	  "bar-volume-empty" = "-";
-	  "bar-volume-empty-font" = "0";
-	  "bar-volume-empty-foreground" = "\${colors.foreground-alt}";
-        };
-
-        # - Module: battery ----------------------
-	
-	"module/battery" = {
-	  "type" = "internal/battery";
-	  "battery" = "BAT0";
-	  "adapter" = "AC";
-	  "full-at" = "98";
-	  
-	  "format-charging-prefix" = "\"▴\"";
-	  "format-charging" = "<label-charging>";
-	  "format-charging-foreground" = "#55aa55";
-	  "format-charging-underline" = "";
-	  
-	  "format-discharging-prefix" = "\"▾\"";
-	  "format-discharging" = "<label-discharging>";
-	  "format-discharging-foreground" = "#f5a70a";
-	  "format-discharging-underline" = "";
-	  
-	  "format-full" = "FULL BATTERY";
-	  "format-full-foreground" = "#55aa55";
-	  "format-full-underline" = "\${self.format-charging-underline}";
-	  
-	  "ramp-capacity-0" = "";
-	  "ramp-capacity-1" = "";
-	  "ramp-capacity-2" = "";
-	  "ramp-capacity-foreground" = "\${colors.foreground-alt}";
-        };
+      Service = {
+        Type = "forking";
+        Environment = "PATH=${polybar_pkg}/bin:/run/wrappers/bin";
+        ExecStart =
+          let scriptPkg = pkgs.writeShellScriptBin "polybar-start" script;
+          in "${scriptPkg}/bin/polybar-start";
+        Restart = "on-failure";
       };
 
-      script = "polybar --reload mainbar-i3 &";
-      #  #!/usr/bin/env bash
-
-      #  # Terminate already running bar instances
-      #  killall -q polybar
-      #  
-      #  # Wait until the processes have been shut down
-      #  while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
-      #  
-      #  for m in $(polybar --list-monitors | cut -d":" -f1); do
-      #  	WIRELESS=$(ls /sys/class/net/ | grep ^wl | awk 'NR==1{print $1}') MONITOR=$m polybar --reload mainbar-i3 &
-      #  done
-      #  
-      #  echo "Bars launched..."
-      # '';
+      Install = { WantedBy = [ "tray.target" ]; };
     };
   };
 }
diff --git a/home/profiles/desktop.nix b/home/profiles/desktop.nix
index 2f0f9fa..2bd0fa0 100644
--- a/home/profiles/desktop.nix
+++ b/home/profiles/desktop.nix
@@ -35,6 +35,8 @@ in
       app.alacritty.enable = true;
     };
 
+    services.picom.enable = true;
+
     home.packages = with pkgs; [
       rofi
       firefox
diff --git a/system/hosts/reykjavik/default.nix b/system/hosts/reykjavik/default.nix
index 12b0988..c34a7cb 100644
--- a/system/hosts/reykjavik/default.nix
+++ b/system/hosts/reykjavik/default.nix
@@ -10,15 +10,17 @@
 
   networking.hostName = "reykjavik";
 
-  samfelag.modules.user = {
-    name = "marc";
-  };
-
-  # - Bootloader ---------------------------------
-
   boot.loader.systemd-boot.enable = true;
 
-  # - Services -----------------------------------
+  # - Modules ------------------------------------
+
+  samfelag.modules = {
+    user.name = "marc";
+    bluetooth.enable = true;
+  };
+
+
+  # - Profiles -----------------------------------
 
   samfelag.profiles = {
     desktop = {
diff --git a/system/modules/bluetooth.nix b/system/modules/bluetooth.nix
new file mode 100644
index 0000000..536bf3c
--- /dev/null
+++ b/system/modules/bluetooth.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  cfg = config.samfelag.modules.bluetooth;
+in
+{
+  options.samfelag.modules.bluetooth = {
+    enable = lib.mkEnableOption "bluetooth";
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    hardware.bluetooth.enable = true;
+    services.blueman.enable = true;
+
+  };
+}
diff --git a/system/modules/default.nix b/system/modules/default.nix
index 3ea9db1..5bc5fb2 100644
--- a/system/modules/default.nix
+++ b/system/modules/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+   ./bluetooth.nix
    ./tailscale.nix
    ./user.nix
   ];
diff --git a/system/profiles/common.nix b/system/profiles/common.nix
index 888f468..57b5a9b 100644
--- a/system/profiles/common.nix
+++ b/system/profiles/common.nix
@@ -33,6 +33,7 @@
   environment.systemPackages = with pkgs; [
     curl
     git
+    htop
     pciutils
     psmisc
     vim