update

6 files changed, 32 insertions, 28 deletions

diff --git a/modules/global.nix b/modules/global.nix
index 3dfae3e..c1e4883 100644
--- a/modules/global.nix
+++ b/modules/global.nix
@@ -102,6 +102,7 @@ in
         elan
         dmenu
         berkeley-mono
+        fanwood
       ] ++ (lib.optional cfg.notNixOS nixgl.auto.nixGLDefault)
         ++ (lib.optionals cfg.wayland 
         [
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index 60495fb..3de80ac 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -49,8 +49,8 @@ in
         right = "i";
 
         fonts = {
-          names = [ "BerkeleyMonoPatched Nerd Font" ];
-          style = "Bold";
+          names = [ "GoMono Nerd Font Propo" ];
+          # style = "Bold";
           size = 10.0;
         };
 
@@ -118,7 +118,7 @@ in
           mode = "hide";
           hiddenState = "hide";
           fonts = {
-            names = [ "BerkeleyMonoPatched Nerd Font Propo" ];
+            names = [ "GoMono Nerd Font Propo" ];
             size = "10.0";
           };
           extraConfig = ''
@@ -131,7 +131,7 @@ in
             focusedWorkspace = {
               border = scheme.base00; # "#0d0d0d";
               background = scheme.base00; # "#0d0d0d";
-              text = scheme.base0E;
+              text = scheme.base05;
             };
             activeWorkspace = {
               border = scheme.base00; # "#0d0d0d";
diff --git a/modules/tmux/default.nix b/modules/tmux/default.nix
index 9ab9ab3..b14563b 100644
--- a/modules/tmux/default.nix
+++ b/modules/tmux/default.nix
@@ -120,11 +120,14 @@ in
 
         set -g status-style bg='${scheme.base00}',fg='${scheme.base03}'
         set-window-option -g window-status-style fg='${scheme.base03}',bg='${scheme.base00}'
-        set-window-option -g window-status-current-style fg='${scheme.base0E}',bg='${scheme.base00}'
+        set-window-option -g window-status-current-style fg='${scheme.base05}',bg='${scheme.base00}'
 
         set -g pane-border-style fg='${scheme.base01}'
         set -g pane-active-border-style fg='${scheme.base01}'
-
+        set -g status-right ""
+        set -g status-left ""
+        set -g status-justify centre
+        set -g status-position top
       '';
     };
   };
diff --git a/modules/tofi.nix b/modules/tofi.nix
index 801aecf..62c821d 100644
--- a/modules/tofi.nix
+++ b/modules/tofi.nix
@@ -15,17 +15,23 @@ in
       enable = true;
       settings = {
         # font = "ComicShannsMono Nerd Font Mono 10";
-        font = "BerkeleyMonoPatched Nerd Font 10";
-        "font-size" = 15;
-
-        width = "60%";
-        height = "50%";
-
-        "text-color" = scheme.base05;
+        # font = "GoMono Nerd Font Propo";
+        font = "Fanwood Text";
+        "font-size" = 24;
+
+        # width = "60%";
+        # height = "50%";
+        width = "100%";
+        height = "100%";
+        padding-left = "35%";
+        padding-top = "35%";
+
+        input-color = scheme.base05;
+        "text-color" = scheme.base02;
         "placeholder-color" = scheme.base00;
 
-        "selection-background" = scheme.base01; #151515
-        "selection-color" = scheme.base0B;
+        "selection-background" = scheme.base00; #151515
+        "selection-color" = scheme.base05;
         "selection-background-padding"= "0, -1";
 
         "text-cursor-style"="bar";
@@ -34,17 +40,11 @@ in
         "prompt-text"="\"\"";
 
         "background-color"=scheme.base00;
+        num-results = 5;
 
-        "outline-width" = 2;
-        "outline-color" = scheme.base01;
-
-        "border-width"=0;
-        "border-color"="#00000000";
-
-
-        "corner-radius"=8;
-
-        "text-cursor" = true;
+        "outline-width" = 0;
+        "border-width" = 0;
+        hide-cursor = true;
         "hidden-character" = "";
         terminal = "foot";
         ascii-input = true;
diff --git a/modules/zsh/default.nix b/modules/zsh/default.nix
index be2a35c..ea0dce9 100644
--- a/modules/zsh/default.nix
+++ b/modules/zsh/default.nix
@@ -41,7 +41,7 @@ in
         ls = "eza";
         ll = "eza -l";
         hide = "swayhide";
-        lg = "lazygit";
+        lg = "NO_COLOR= lazygit";
         gdb = "gdb -q";
         py = "ipython3";
       };
diff --git a/void/home.nix b/void/home.nix
index 9efc627..e1661ac 100644
--- a/void/home.nix
+++ b/void/home.nix
@@ -18,9 +18,9 @@
 
     zsh.theme = "simple";
     foot.enable = true;
-    colors.mountain.enable = true;
+    # colors.mountain.enable = true;
     # colors.default-dark.enable = true;
-    # colors.tomorrow.enable = true;
+    colors.tomorrow.enable = true;
     # colors.google-dark.enable = true;
     # colors.grayscale-dark.enable = true;
     # colors.grayscale-light.enable = true;