From 2b8738f3de469042d653350eee5101eb08e83205 Mon Sep 17 00:00:00 2001
From: Elisiei Yehorov <yehorovye@disroot.org>
Date: Mon, 19 Jan 2026 03:06:55 +0100
Subject: [PATCH] custom spicetify

---
 home/modules/ide/nvim/plugins/neo-tree.nix | 48 ++++++++++------------
 nixos/configuration.nix                    |  1 +
 nixos/modules/programs.nix                 | 15 +------
 nixos/modules/spicetify.nix                | 42 +++++++++++++++++++
 4 files changed, 66 insertions(+), 40 deletions(-)
 create mode 100644 nixos/modules/spicetify.nix

diff --git a/home/modules/ide/nvim/plugins/neo-tree.nix b/home/modules/ide/nvim/plugins/neo-tree.nix
index 260d70b..f3ea037 100644
--- a/home/modules/ide/nvim/plugins/neo-tree.nix
+++ b/home/modules/ide/nvim/plugins/neo-tree.nix
@@ -1,20 +1,17 @@
 {
   plugins.neo-tree = {
     enable = true;
-
     settings = {
       sources = [
         "filesystem"
         "buffers"
         "git_status"
       ];
-
       enable_diagnostics = true;
       enable_git_status = true;
       enable_modified_markers = true;
       enable_refresh_on_write = true;
       open_files_in_last_window = true;
-
       open_files_do_not_replace_types = [
         "terminal"
         "Trouble"
@@ -22,7 +19,6 @@
         "qf"
         "Outline"
       ];
-
       filesystem = {
         bind_to_cwd = false;
         follow_current_file = {
@@ -30,12 +26,10 @@
         };
         use_libuv_file_watcher = true;
       };
-
       window.mappings = {
         "l" = "open";
         "h" = "close_node";
         "<space>" = "none";
-
         "Y" = {
           __raw = ''
             function(state)
@@ -46,7 +40,6 @@
           '';
           desc = "Copy Path to Clipboard";
         };
-
         "O" = {
           __raw = ''
             function(state)
@@ -56,7 +49,6 @@
           desc = "Open with System Application";
         };
       };
-
       default_component_configs = {
         indent = {
           with_expanders = true;
@@ -77,7 +69,6 @@
         };
       };
     };
-
     event_handlers = {
       file_moved = ''
         function(data)
@@ -91,16 +82,17 @@
       '';
     };
   };
-
   keymaps = [
     {
       key = "<leader>fe";
       mode = [ "n" ];
-      action = ''
-        <cmd>lua require("neo-tree.command").execute({
-          toggle = true,
-          dir = vim.fn.getcwd()
-        })<CR>
+      action.__raw = ''
+        function()
+          require("neo-tree.command").execute({
+            toggle = true,
+            dir = vim.fn.getcwd()
+          })
+        end
       '';
       options.desc = "Explorer NeoTree (cwd)";
     }
@@ -114,27 +106,31 @@
     {
       key = "<leader>ge";
       mode = [ "n" ];
-      action = ''
-        <cmd>lua require("neo-tree.command").execute({
-          source = "git_status",
-          toggle = true
-        })<CR>
+      action.__raw = ''
+        function()
+          require("neo-tree.command").execute({
+            source = "git_status",
+            toggle = true
+          })
+        end
       '';
       options.desc = "Git Explorer";
     }
     {
       key = "<leader>be";
       mode = [ "n" ];
-      action = ''
-        <cmd>lua require("neo-tree.command").execute({
-          source = "buffers",
-          toggle = true
-        })<CR>
+      action.__raw = ''
+        function()
+          require("neo-tree.command").execute({
+            source = "buffers",
+            toggle = true
+          })
+        end
       '';
       options.desc = "Buffer Explorer";
     }
     {
-      key = "C-h";
+      key = "<C-h>";
       mode = [ "n" ];
       action = "<cmd>Neotree source=filesystem focus<CR>";
       options.desc = "switch focus";
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 29c8574..2b6b5b8 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -12,6 +12,7 @@
     ./modules/programs.nix
     ./modules/boot.nix
     ./modules/fonts.nix
+    ./modules/spicetify.nix
 
     # gaming shi
     ./modules/gaming.nix
diff --git a/nixos/modules/programs.nix b/nixos/modules/programs.nix
index 58baf42..6b90c3f 100644
--- a/nixos/modules/programs.nix
+++ b/nixos/modules/programs.nix
@@ -1,8 +1,4 @@
-{ pkgs, inputs, ... }:
-
-let
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in
+{ pkgs, ... }:
 {
   environment.sessionVariables = {
     WLR_NO_HARDWARE_CURSORS = "1";
@@ -48,13 +44,4 @@ in
   environment.gnome.excludePackages = [ pkgs.gnome-tour ];
   services.xserver.excludePackages = [ pkgs.xterm ];
   services.xserver.desktopManager.xterm.enable = false;
-
-  programs.spicetify = {
-    enable = true;
-    enabledExtensions = with spicePkgs.extensions; [
-      adblock
-      hidePodcasts
-    ];
-    colorScheme = "Ocean";
-  };
 }
diff --git a/nixos/modules/spicetify.nix b/nixos/modules/spicetify.nix
new file mode 100644
index 0000000..6dbd4f0
--- /dev/null
+++ b/nixos/modules/spicetify.nix
@@ -0,0 +1,42 @@
+{
+  pkgs,
+  inputs,
+  ...
+}:
+
+let
+  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+in
+
+{
+  programs.spicetify = {
+    enable = true;
+
+    enabledExtensions = with spicePkgs.extensions; [
+      adblock
+      hidePodcasts
+    ];
+
+    theme = spicePkgs.themes.text;
+    colorScheme = "custom";
+    customColorScheme = {
+      text = "FFFFFF";
+      subtext = "C0C0C0";
+      sidebar-text = "FFFFFF";
+      main = "000000";
+      sidebar = "1A1A1A";
+      player = "000000";
+      card = "121212";
+      shadow = "000000";
+      selected-row = "404040";
+      button = "B0B0B0";
+      button-active = "FFFFFF";
+      button-disabled = "4A4A4A";
+      tab-active = "FFFFFF";
+      notification = "121212";
+      notification-error = "FFFFFF";
+      misc = "000000";
+    };
+
+  };
+}