Stop using stylix for theming (#309)

* Format lua files * Remove stylix * Set bat theme * Set fzf theme * Set helix theme * Set wezterm theme * Set zellij theme
francishamel · Sep 8, 2024 · 7675155 · 7675155
1 parent bf57e60
commit 7675155
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 303 deletions.
diff --git a/devshell/flake-module.nix b/devshell/flake-module.nix
@@ -19,6 +19,7 @@
         deadnix.enable = true;
         nixpkgs-fmt.enable = true;
         prettier.enable = true;
+        stylua.enable = true;
       };
     };
   };

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -14,8 +14,6 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
 
     nixos-flake.url = "github:srid/nixos-flake";
-
-    stylix.url = "github:danth/stylix";
   };
 
   outputs = inputs@{ self, ... }:

diff --git a/home-manager/flake-module.nix b/home-manager/flake-module.nix
@@ -14,7 +14,6 @@
           ./modules/helix.nix
           ./modules/ssh.nix
           ./modules/starship.nix
-          ./modules/stylix.nix
           ./modules/terminal.nix
           ./modules/vscode.nix
           ./modules/wezterm.nix

diff --git a/home-manager/modules/bat.nix b/home-manager/modules/bat.nix
@@ -1,5 +1,8 @@
 { ... }:
 
 {
-  programs.bat.enable = true;
+  programs.bat = {
+    enable = true;
+    config.theme = "Nord";
+  };
 }
diff --git a/home-manager/modules/fzf.nix b/home-manager/modules/fzf.nix
@@ -1,13 +1,15 @@
 { pkgs, ... }:
 
 {
-  home.packages = [
-    pkgs.zsh-fzf-tab
-  ];
+  home = {
+    packages = [ pkgs.zsh-fzf-tab ];
+    sessionVariables.FZF_DEFAULT_OPTS = "--color=bg+:#3B4252,bg:#2E3440,spinner:#81A1C1,hl:#616E88,fg:#D8DEE9,header:#616E88,info:#81A1C1,pointer:#81A1C1,marker:#81A1C1,fg+:#D8DEE9,prompt:#81A1C1,hl+:#81A1C1";
+  };
 
-  programs.zsh.initExtra = ''
-    source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
-  '';
-
-  programs.fzf.enable = true;
+  programs = {
+    fzf.enable = true;
+    zsh.initExtra = ''
+      source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
+    '';
+  };
 }
diff --git a/home-manager/modules/helix.nix b/home-manager/modules/helix.nix
@@ -55,6 +55,7 @@ in
           end = "no_op";
         };
       };
+      theme = "nord";
     };
   };
 }
diff --git a/home-manager/modules/stylix.nix b/home-manager/modules/stylix.nix
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ in @@
               end = "no_op";
             };
           };
+          theme = "nord";
         };
       };
     }