diff --git a/flake.lock b/flake.lock index b6fb15b..66035d9 100755 --- a/flake.lock +++ b/flake.lock @@ -517,7 +517,6 @@ "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "systems": "systems", - "tokyonight": "tokyonight", "wlroots": "wlroots", "xdph": "xdph" } @@ -606,22 +605,6 @@ "type": "github" } }, - "tokyonight": { - "flake": false, - "locked": { - "lastModified": 1698229236, - "narHash": "sha256-axjZVZOI+WIv85FfMG+lxftDKlDIw/HzQKyJVFkL33M=", - "owner": "folke", - "repo": "tokyonight.nvim", - "rev": "f247ee700b569ed43f39320413a13ba9b0aef0db", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "tokyonight.nvim", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index e584a42..031ccbb 100755 --- a/flake.nix +++ b/flake.nix @@ -144,12 +144,6 @@ #}; ## Non-Flake - ### Color scheme files - tokyonight = { - # TODO: base16.nix/Stylix when? - url = "github:folke/tokyonight.nvim"; - flake = false; - }; ### Clash WebUI metacubexd = { url = "github:MetaCubeX/metacubexd/gh-pages"; diff --git a/users/guanranwang/home-manager/modules/shell/fish.nix b/users/guanranwang/home-manager/modules/shell/fish.nix index da2388e..013e339 100644 --- a/users/guanranwang/home-manager/modules/shell/fish.nix +++ b/users/guanranwang/home-manager/modules/shell/fish.nix @@ -1,13 +1,9 @@ -{ - inputs, - pkgs, - ... -}: { +{pkgs, ...}: { programs.fish = { enable = true; interactiveShellInit = '' set fish_greeting - source ${inputs.tokyonight}/extras/fish/tokyonight_night.fish + source ${pkgs.vimPlugins.tokyonight-nvim}/extras/fish/tokyonight_night.fish ''; plugins = [ { diff --git a/users/guanranwang/home-manager/modules/terms/alacritty.nix b/users/guanranwang/home-manager/modules/terms/alacritty.nix index 67369d0..cf915e4 100644 --- a/users/guanranwang/home-manager/modules/terms/alacritty.nix +++ b/users/guanranwang/home-manager/modules/terms/alacritty.nix @@ -1,12 +1,12 @@ { - inputs, lib, + pkgs, ... }: { programs.alacritty = { enable = true; settings = { - import = ["${inputs.tokyonight}/extras/alacritty/tokyonight_night.yml"]; + import = ["${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.yml"]; cursor.style = "beam"; env.WINIT_X11_SCALE_FACTOR = "1"; window = { diff --git a/users/guanranwang/home-manager/modules/terms/kitty.nix b/users/guanranwang/home-manager/modules/terms/kitty.nix index 235fd88..4735265 100644 --- a/users/guanranwang/home-manager/modules/terms/kitty.nix +++ b/users/guanranwang/home-manager/modules/terms/kitty.nix @@ -1,8 +1,8 @@ -{inputs, ...}: { +{pkgs, ...}: { programs.kitty = { enable = true; settings = { - include = "${inputs.tokyonight}/extras/kitty/tokyonight_night.conf"; + include = "${pkgs.vimPlugins.tokyonight-nvim}/extras/kitty/tokyonight_night.conf"; font_size = 12; confirm_os_window_close = 0; window_padding_width = 6;