format code

2 files changed, 46 insertions, 18 deletions

diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index e929af8..53911ec 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -69,8 +69,8 @@
 
           cursor.blink = true;
           main = {
-            dpi-aware = true;
-            font = "FiraCode Nerd Font Mono:size=8";
+            dpi-aware = lib.mkDefault true;
+            font = lib.mkDefault "FiraCode Nerd Font Mono:size=8";
           };
 
           mouse.hide-when-typing = true;
@@ -94,8 +94,8 @@
           };
 
           main = {
-            dpi-aware = true;
-            font = "Fira Code:size=6";
+            dpi-aware = lib.mkDefault true;
+            font = lib.mkDefault "Fira Code:size=6";
             show-actions = true;
             sort-result = false;
             terminal = "foot -a '{cmd}' -T '{cmd}' {cmd}";
@@ -122,6 +122,7 @@
           "sidebar.animation.enabled" = false;
           "sidebar.new-sidebar.has-used" = true;
           "sidebar.verticalTabs" = true;
+          # this keeps getting randomly reset at runtime. why? idfk.
           "sidebar.visibility" = "hide-sidebar";
         };
       };
diff --git a/modules/user/desktop/swayfx.nix b/modules/user/desktop/swayfx.nix
index d9e3db6..2454f23 100644
--- a/modules/user/desktop/swayfx.nix
+++ b/modules/user/desktop/swayfx.nix
@@ -11,6 +11,7 @@
   config = {
     home.packages = with pkgs; [
       grim
+      rose-pine-cursor
       slurp
     ];
 
@@ -44,14 +45,22 @@
 
             backlight = {
               format = "{icon}";
-              format-icons = [ "" "󰖨" ];
+              format-icons = [
+                ""
+                "󰖨"
+              ];
               tooltip-format = "{percent}%";
             };
 
             battery = {
               format = "{icon}";
               format-critical = "{icon} ({capacity}%)";
-              format-icons = [ "" "" "" "" ];
+              format-icons = [
+                ""
+                ""
+                ""
+                ""
+              ];
               format-time = "{H}h{m}m";
               format-warning = "{icon} ({capacity}%)";
               states = {
@@ -97,7 +106,12 @@
               format-disabled = "󰀝";
               format-disconnected = "󰌙";
               format-ethernet = "󰌗 {ipaddr}/{cidr}";
-              format-icons = [ "󰤟" "󰤢" "󰤥" "󰤨" ];
+              format-icons = [
+                "󰤟"
+                "󰤢"
+                "󰤥"
+                "󰤨"
+              ];
               format-wifi = "{icon}";
               interval = 1;
               tooltip-format = "{ifname} tx: {bandwidthUpBytes} rx: {bandwidthDownBytes}";
@@ -115,21 +129,31 @@
               disable-scroll = true;
               format = "";
               persistent-workspaces = {
-                "1" = [ "DP-1" "eDP-1" ];
-                "2" = [ "DP-2" "eDP-1" ];
-                "3" = [];
-                "4" = [];
-                "5" = [];
-                "6" = [];
-                "7" = [];
-                "8" = [];
-                "9" = [];
+                "1" = [
+                  "DP-1"
+                  "eDP-1"
+                ];
+                "2" = [
+                  "DP-2"
+                  "eDP-1"
+                ];
+                "3" = [ ];
+                "4" = [ ];
+                "5" = [ ];
+                "6" = [ ];
+                "7" = [ ];
+                "8" = [ ];
+                "9" = [ ];
               };
             };
 
             wireplumber = {
               format = "{icon}";
-              format-icons = [ "󰕿" "󰖀" "󰕾" ];
+              format-icons = [
+                "󰕿"
+                "󰖀"
+                "󰕾"
+              ];
               format-muted = "󰸈";
               on-click = "wpctl set-mute @DEFAULT_SINK@ toggle";
               tooltip-format = "{node_name} - {volume}%";
@@ -311,7 +335,10 @@
             window.titlebar = false;
             workspaceOutputAssign = [
               {
-                output = [ "DP-1" "eDP-1" ];
+                output = [
+                  "DP-1"
+                  "eDP-1"
+                ];
                 workspace = "1";
               }
               {