From 2ddcd122410c154f77e4ca949b0790dd5bfc66a0 Mon Sep 17 00:00:00 2001 From: iFargle Date: Thu, 8 Feb 2024 19:40:29 +0900 Subject: [PATCH] Tsting dynamic themes for nixvim --- home-manager/common/software/cli/nixvim.nix | 20 +++++++++---------- stylix/green/default.nix | 2 ++ stylix/green/home-manager/nixvim.nix | 3 +++ stylix/gruvbox/home-manager/nixvim.nix | 3 +++ stylix/stylix/home-manager/nixvim.nix | 3 +++ .../tokyo-day/home-manager/home-manager.nix | 3 +++ stylix/tokyo-night/home-manager/nixvim.nix | 3 +++ 7 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 stylix/green/home-manager/nixvim.nix create mode 100644 stylix/gruvbox/home-manager/nixvim.nix create mode 100644 stylix/stylix/home-manager/nixvim.nix create mode 100644 stylix/tokyo-day/home-manager/home-manager.nix create mode 100644 stylix/tokyo-night/home-manager/nixvim.nix diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix index 00354554..28085c8a 100644 --- a/home-manager/common/software/cli/nixvim.nix +++ b/home-manager/common/software/cli/nixvim.nix @@ -1,7 +1,7 @@ -{ inputs, pkgs, config, lib, ... }: { +{ inputs, pkgs, config, lib, theme, ... }: { imports = [ inputs.nixvim.homeManagerModules.nixvim - ]; + ] ++ lib.optional (builtins.isString theme) ../../../../stylix/${theme}/home-manager.nix; programs.nixvim = { enable = true; @@ -67,7 +67,6 @@ gitsigns.enable = true; toggleterm.enable = true; rainbow-delimiters.enable = true; - dashboard.enable = true; fidget.enable = true; git-worktree = { @@ -84,27 +83,27 @@ action = "find_files"; desc = "Search files by name"; }; - "ss" = { + "s" = { action = "live_grep"; desc = "[S]earch by live grep"; }; - "sb" = { + "b" = { action = "buffers"; desc = "[S]earch open [B]uffers by file name"; }; - "sh" = { + "h" = { action = "help_tags"; desc = "[S]earch [H]elp"; }; - "sw" = { + "w" = { action = "grep_string"; desc = "[S]earch for [W]ord under cursor"; }; - "sg" = { + "g" = { action = "buffers"; desc = "[S]earch [G]it files"; }; - "sr" = { + "r" = { action = "oldfiles"; desc = "[S]earch [R]ecently opened files by name"; }; @@ -138,7 +137,8 @@ }; # TODO: Add this to stylix configs - colorscheme = lib.mkForce "everforest"; + # colorscheme = lib.mkForce "everforest"; + colorscheme = lib.mkForce "catpuccin-mocha"; colorschemes = { tokyonight.enable = true; diff --git a/stylix/green/default.nix b/stylix/green/default.nix index 1fa0be8e..14eebbde 100644 --- a/stylix/green/default.nix +++ b/stylix/green/default.nix @@ -4,4 +4,6 @@ polarity = "dark"; base16Scheme = ./everforest-dark-hard.yaml; }; + + } \ No newline at end of file diff --git a/stylix/green/home-manager/nixvim.nix b/stylix/green/home-manager/nixvim.nix new file mode 100644 index 00000000..ee4c99d5 --- /dev/null +++ b/stylix/green/home-manager/nixvim.nix @@ -0,0 +1,3 @@ +{ ... }: { + programs.nixvim.colorscheme = lib.mkForce 500 "everforest"; +} \ No newline at end of file diff --git a/stylix/gruvbox/home-manager/nixvim.nix b/stylix/gruvbox/home-manager/nixvim.nix new file mode 100644 index 00000000..c9c19f80 --- /dev/null +++ b/stylix/gruvbox/home-manager/nixvim.nix @@ -0,0 +1,3 @@ +{ ... }: { + programs.nixvim.colorscheme = lib.mkForce 500 "gruvbox"; +} \ No newline at end of file diff --git a/stylix/stylix/home-manager/nixvim.nix b/stylix/stylix/home-manager/nixvim.nix new file mode 100644 index 00000000..190f9b9c --- /dev/null +++ b/stylix/stylix/home-manager/nixvim.nix @@ -0,0 +1,3 @@ +{ ... }: { + programs.nixvim.colorscheme = lib.mkForce 500 "catpuccin-mocha"; +} \ No newline at end of file diff --git a/stylix/tokyo-day/home-manager/home-manager.nix b/stylix/tokyo-day/home-manager/home-manager.nix new file mode 100644 index 00000000..a3de039d --- /dev/null +++ b/stylix/tokyo-day/home-manager/home-manager.nix @@ -0,0 +1,3 @@ +{ ... }: { + programs.nixvim.colorscheme = lib.mkForce 500 "tokyonight-day"; +} \ No newline at end of file diff --git a/stylix/tokyo-night/home-manager/nixvim.nix b/stylix/tokyo-night/home-manager/nixvim.nix new file mode 100644 index 00000000..74c3d9be --- /dev/null +++ b/stylix/tokyo-night/home-manager/nixvim.nix @@ -0,0 +1,3 @@ +{ ... }: { + programs.nixvim.colorscheme = lib.mkForce 500 "tokyonight-night"; +} \ No newline at end of file