From a110de432cfa2df1a7539278178fe78d2081c679 Mon Sep 17 00:00:00 2001
From: atagen <atagen@boss.co>
Date: Sat, 12 Aug 2023 01:36:11 +1000
Subject: [PATCH] fix helix, spiral sway config, bar tweaks

---
 home/home.nix | 100 ++++++++++++++++++++------------------------------
 1 file changed, 39 insertions(+), 61 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index 7964fb7..8b86767 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -89,7 +89,7 @@ in {
     config = {
       anchor_to_edges = true;
       position = "top";
-      height = 10;
+      height = 8;
       icon_theme = icons.name;
 
       start = [
@@ -104,7 +104,7 @@ in {
         }
       ];
       center = [
-        { type = "focused"; icon_size = 10; }
+        { type = "focused"; icon_size = 8; }
       ];
       end = [
         { type = "music";
@@ -133,12 +133,10 @@ in {
         normal.black
         normal.black
         normal.black
-        # normal.yellow
-        # bright.yellow
         util.fg
         normal.red
         fonts.sans.name
-        (builtins.toString fonts.sans.size)
+        "10"# (builtins.toString fonts.sans.size)
       ]
       (builtins.readFile dots/ironbar.css));
   };
@@ -146,6 +144,9 @@ in {
   wayland.windowManager.sway = {
     enable = true;
     package = pkgs.sway;
+    extraConfig = ''
+      default_orientation vertical
+    '';
     config = with pkgs.rice; {
       bars = [];
       # reintroduces flicker
@@ -172,6 +173,21 @@ in {
         border = borders.thickness;
         hideEdgeBorders = "smart";
         titlebar = false;
+        commands = [
+          {
+            command = "split toggle";
+            criteria = {
+              class = ".*";
+              app_id = ".*";
+            };
+          }
+          {
+            command = "move scratchpad";
+            criteria = {
+              app_id = "org.keepassxc.KeePassXC";
+            };
+          }
+        ];
       };
       workspaceAutoBackAndForth = false;
       input = {
@@ -226,8 +242,7 @@ in {
         "Mod4+Shift+minus" = "move scratchpad";
         "Mod4+minus" = "scratchpad show";
         "Mod4+Shift+q" = "kill";
-        "Mod4+Shift+v" = "split horizontal";
-        "Mod4+v" = "split vertical";
+        "Mod4+v" = "split toggle";
         "XF86AudioMute" = "exec swayosd --output-volume mute-toggle";
         "XF86AudioRaiseVolume" = "exec swayosd --output-volume raise";
         "XF86AudioLowerVolume" = "exec swayosd --output-volume lower";
@@ -250,9 +265,9 @@ in {
         };
         focusedInactive = {
           background = normal.black;
-          border = normal.blue;
-          childBorder = normal.blue;
-          indicator = normal.blue;
+          border = util.bg;
+          childBorder = util.bg;
+          indicator = util.bg;
           text = normal.white;
         };
         placeholder = {
@@ -576,16 +591,13 @@ in {
         };
         "label" = bright.cyan;
         "module" = bright.cyan;
-
         "diff.plus" = bright.green;
         "diff.delta" = bright.yellow;
         "diff.minus" = bright.red;
-
         "warning" = bright.yellow;
         "error" = bright.red;
         "info" = bright.cyan;
         "hint" = bright.blue;
-
         "ui.background" = {bg = util.bg;};
         "ui.linenr" = {fg = normal.cyan;};
         "ui.linenr.selected" = {
@@ -644,7 +656,6 @@ in {
         "ui.virtual.whitespace" = bright.black;
         "ui.virtual.ruler" = {bg = normal.black;};
         "ui.virtual.inlay-hint" = {fg = normal.magenta;};
-
         "diagnostic.warning" = {
           underline = {
             color = bright.yellow;
@@ -669,7 +680,6 @@ in {
             style = "curl";
           };
         };
-
         "markup.heading" = bright.cyan;
         "markup.bold" = {modifiers = ["bold"];};
         "markup.italic" = {modifiers = ["italic"];};
@@ -680,59 +690,26 @@ in {
         };
         "markup.link.text" = bright.red;
         "markup.raw" = bright.red;
-
-        # old theme
-
-        # "ui.background" = { bg = util.bg; };
-        # "ui.menu" = { fg = bright.cyan; bg = normal.black; };
-        # "ui.menu.selected" = { modifiers = [ "reversed" ]; };
-        # "ui.linenr" = { fg = bright.cyan; bg = normal.black; };
-        # "ui.popup" = { bg = bright.black; };
-        # "ui.linenr.selected" = { fg = normal.yellow; bg = normal.black; modifiers = [ "bold" ]; };
-        # "ui.selection" = { fg = bright.yellow; bg = normal.blue; };
-        # "ui.selection.primary" = { modifiers = [ "reversed" ]; };
-        # "comment" = { fg = bright.magenta; modifiers = [ "italics" ]; };
-        # "ui.statusline" = { fg = bright.cyan; bg = normal.black; };
-        # "ui.statusline.inactive" = { modifiers = [ "reversed" ]; };
-        # "ui.help" = { fg = normal.white; bg = bright.black; };
-        # # "ui.cursor" = { modifiers = [ "reversed" ]; };
-        # "variable" = normal.green;
-        # "variable.builtin" = normal.green;
-        # "constant.numeric" = normal.blue;
-        # "constant" = normal.cyan;
-        # "constant" = { fg = normal.cyan; modifiers = ["bold"]; };
-        # "attributes" = normal.yellow;
-        # "type" = normal.yellow;
-        # "ui.cursor.match" = { fg = normal.yellow; modifiers = [ "underlined" ]; };
-        # "string" = normal.green;
-        # "variable.other.member" = normal.red;
-        # "constant.character.escape" = { fg = normal.cyan; modifiers = ["bold"]; };
-        # "function" = { bright.blue; modifiers = ["bold"]; };
-        # "constructor" = { fg = normal.blue; modifiers = ["bold"]; };
-        # "special" = normal.blue;
-        # "keyword" = normal.magenta;
-        # "label" = normal.magenta;
-        # "namespace" = normal.blue;
-        # "diff.plus" = normal.green;
-        # "diff.delta" = normal.yellow;
-        # "diff.minus" = normal.red;
-        # "diagnostic" = { modifiers = [ "underlined" ]; };
-        # "ui.gutter" = { bg = normal.black; };
-        # "info" = normal.blue;
-        # "hint" = normal.magenta;
-        # "debug" = normal.magenta;
-        # "warning" = normal.yellow;
-        # "error" = normal.red;
       };
     };
+
     settings = {
       theme = "nix-rice";
       editor.lsp.display-messages = true;
     };
+
     languages = {
+
       language = [
         {
           name = "rust";
+          language-servers = [ "rust-analyzer" ];
+        }
+      ];
+
+      # having tons of fun backporting the old config style to the new config schema!!!!
+      language-server = { 
+        rust-analyzer = {
           config = {
             cargo = {
               buildScripts = {
@@ -743,11 +720,12 @@ in {
               enable = true;
             };
             check = {
-              command = "clippy"; # as i walk through the valley of the sha
+              command = "clippy";
             };
           };
-        }
-      ];
+        };
+      };
+
     };
   };