Tokyio night everywhere

gilacost · Jan 10, 2025 · 0f9e9dc · 0f9e9dc
1 parent 385a5a5
commit 0f9e9dc
Show file tree

Hide file tree

Showing 11 changed files with 165 additions and 192 deletions.
diff --git a/conf.d/terminal/kitty.conf b/conf.d/terminal/kitty.conf
@@ -17,85 +17,51 @@ map alt+backspace change_font_size all 0
 map cmd+h hide_macos_app
 map cmd+q quit
 
-
-## Catppuccin
-
-# vim:ft=kitty
-
-## name: Catppuccin
-## author: Pocco81 (https://github.com/Pocco81)
+## name: Tokyo Night Moon
 ## license: MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/catppuccin.conf
-## blurb: Soothing pastel theme for the high-spirited!
-
-# The basic colors
-foreground              #D9E0EE
-background              #1E1E2E
-selection_foreground    #D9E0EE
-selection_background    #575268
-
-# Cursor colors
-cursor                  #F5E0DC
-cursor_text_color       #1E1E2E
-
-# URL underline color when hovering with mouse
-url_color               #F5E0DC
-
-# kitty window border colors
-active_border_color     #C9CBFF
-inactive_border_color   #575268
-bell_border_color       #FAE3B0
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-#: Tab bar colors
-active_tab_foreground   #F5C2E7
-active_tab_background   #575268
-inactive_tab_foreground #D9E0EE
-inactive_tab_background #1E1E2E
-tab_bar_background      #161320
-
-# Colors for marks (marked text in the terminal)
-
-mark1_foreground #1E1E2E
-mark1_background #96CDFB
-mark2_foreground #1E1E2E
-mark2_background #F5C2E7
-mark3_foreground #1E1E2E
-mark3_background #B5E8E0
-
-#: The 16 terminal colors
-
-#: black
-color0 #6E6C7E
-color8 #988BA2
-
-#: red
-color1 #F28FAD
-color9 #F28FAD
-
-#: green
-color2  #ABE9B3
-color10 #ABE9B3
-
-#: yellow
-color3  #FAE3B0
-color11 #FAE3B0
-
-#: blue
-color4  #96CDFB
-color12 #96CDFB
-
-#: magenta
-color5  #F5C2E7
-color13 #F5C2E7
-
-#: cyan
-color6  #89DCEB
-color14 #89DCEB
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_moon.conf
+
+background #222436
+foreground #c8d3f5
+selection_background #2d3f76
+selection_foreground #c8d3f5
+url_color #4fd6be
+cursor #c8d3f5
+cursor_text_color #222436
+
+# Tabs
+active_tab_background #82aaff
+active_tab_foreground #1e2030
+inactive_tab_background #2f334d
+inactive_tab_foreground #545c7e
+#tab_bar_background #1b1d2b
+
+# Windows
+active_border_color #82aaff
+inactive_border_color #2f334d
+
+# normal
+color0 #1b1d2b
+color1 #ff757f
+color2 #c3e88d
+color3 #ffc777
+color4 #82aaff
+color5 #c099ff
+color6 #86e1fc
+color7 #828bb8
+
+# bright
+color8  #444a73
+color9  #ff8d94
+color10 #c7fb6d
+color11 #ffd8ab
+color12 #9ab8ff
+color13 #caabff
+color14 #b2ebff
+color15 #c8d3f5
+
+# extended colors
+color16 #ff966c
+color17 #c53b53
 
-#: white
-color7  #D9E0EE
-color15 #D9E0EE
diff --git a/conf.d/terminal/nvim.session b/conf.d/terminal/nvim.session
@@ -1,3 +1,3 @@
 cd /Users/pepo/Repos
-title pantanal
+title buque
 launch zsh -c "source /Users/pepo/.zshrc_local && source /private/etc/zshrc && nvim"
diff --git a/home.nix b/home.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, lib, devenv, ... }: {
+{ ... }:
+{
 
   programs.home-manager.enable = true;
   home.stateVersion = "24.05";
@@ -11,26 +12,30 @@
     ./modules/editor
   ];
 
-  # home.file.".ssh/config" = {
-  # text = ''
-  # Host *
-  # IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
-  # '';
-  # };
-
   home.file.".config/peco/config.json" = {
     text = ''
       {
-         "Style": {
-             "Basic": ["on_default", "default"],
-             "SavedSelection": ["bold", "on_yellow", "black"],
-             "Selected": ["underline", "on_cyan", "black"],
-             "Query": ["yellow", "bold"],
-             "Matched": ["red", "on_blue"]
-         },
-         "Use256Color": true
+          "Style": {
+              "Basic": ["on_default", "default"],
+              "SavedSelection": ["bold", "on_blue", "white"],
+              "Selected": ["underline", "on_cyan", "black"],
+              "Query": ["cyan", "bold"],
+              "Matched": ["blue", "bold"]
+          },
+          "Use256Color": true
       }
     '';
   };
 
+  home.file.".config/nvim.session" = {
+    text = ''
+      ${builtins.readFile ./conf.d/terminal/nvim.session}
+    '';
+  };
+
+  home.file.".config/kitty/kitty.conf" = {
+    text = ''
+      ${builtins.readFile ./conf.d/terminal/kitty.conf}
+    '';
+  };
 }
diff --git a/install.sh b/install.sh
@@ -25,21 +25,19 @@ fi
 softwareupdate --install-rosetta --agree-to-license
 
 mkdir -p "$HOME/.config/kitty"
+mkdir -p "$HOME/.config/peco"
+mkdir -p "$HOME/.ssh"
 
 SCRIPT_DIR=$(dirname "$0")
 
 sudo ln -s  "$HOME/Repos/$SCRIPT_DIR/nix.conf" "/etc/nix/nix.conf"
 
 # TODO move this to nix
-ln -s  "$HOME/Repos/$SCRIPT_DIR/conf.d/terminal/nvim.session" "$HOME/.config/nvim.session"
-ln -s  "$HOME/Repos/$SCRIPT_DIR/conf.d/terminal" "$HOME/.config/kitty/kitty.conf"
 ln -s  "$HOME/Repos/$SCRIPT_DIR/spell" "$HOME/.config/nvim"
-mkdir -p "$HOME/.config/kitty"
-mkdir -p "$HOME/.ssh"
 
-sudo scutil --set HostName $HOSTNAME
-sudo scutil --set LocalHostName $HOSTNAME
-sudo scutil --set ComputerName $HOSTNAME
+sudo scutil --set HostName "$HOSTNAME"
+sudo scutil --set LocalHostName "$HOSTNAME"
+sudo scutil --set ComputerName "$HOSTNAME"
 dscacheutil -flushcache
 
 # TODO if no nix print message indicating to reboot the shell and exit

diff --git a/modules/editor/default.nix b/modules/editor/default.nix
@@ -88,7 +88,7 @@
       \ }
 
       lua << EOF
-        vim.g.lsp_elixir_bin = "${pkgs.lexical}/bin/lexical"
+        vim.g.lsp_elixir_bin = "${pkgs.elixir_ls}/bin/elixir-ls"
         ${builtins.readFile ./nvim/base.lua}
         ${builtins.readFile ./nvim/lsp.lua}
         ${builtins.readFile ./nvim/sets.lua}
@@ -97,35 +97,16 @@
         ${builtins.readFile ./nvim/theme.lua}
         ${builtins.readFile ./nvim/telescope.lua}
         ${builtins.readFile ./nvim/lspkind.lua}
-        ${builtins.readFile ./nvim/neoai.lua}
         ${builtins.readFile ./nvim/cmp.lua}
         ${builtins.readFile ./nvim/nvim-tree.lua}
       EOF
     '';
-    # vim.g.lsp_elixir_bin = "${pkgs.elixir_ls}/bin/elixir-ls"
+    # ${builtins.readFile ./nvim/neoai.lua}
+    # vim.g.lsp_elixir_bin = "${pkgs.lexical}/bin/lexical"
     plugins =
       with pkgs;
       with pkgs.vimPlugins;
       let
-        virt-column = vimUtils.buildVimPlugin {
-          name = "virt-column";
-          src = fetchFromGitHub {
-            owner = "lukas-reineke";
-            repo = "virt-column.nvim";
-            rev = "fe3cff94710d648c57ac826fb846014903c76b00";
-            sha256 = "0m5b180ijk63ci4g1c8j1hi5ga4z6jcwfq8hv5kfmwjgiycf3wsc";
-          };
-        };
-        co-pilot = vimUtils.buildVimPlugin {
-          name = "copilot.vim";
-          src = fetchFromGitHub {
-            owner = "github";
-            repo = "copilot.vim";
-            rev = "69455be5d4a892206bc08365ba3648a597485943";
-            sha256 = "0vcdfssw5nvdyxjq9d9vvdvvlwfr35cmrgrjc7ndbdxw778hsai0";
-          };
-        };
-
         # nix-prefetch-git https://github.com/gilacost/vim-wakatime --rev cad0dabbad61f0116fcdc2142b98a5bc63b00d0d
         vim-wakatime = vimUtils.buildVimPlugin {
           name = "vim-wakatime";
@@ -137,24 +118,24 @@
           };
         };
 
-        # nix-prefetch-git https://github.com/Bryley/neoai.nvim --rev cdbc4c723577d642b5af796875dec660a4cb528b
-        neoai = vimUtils.buildVimPlugin {
-          name = "neoai";
-          src = fetchFromGitHub {
-            owner = "Bryley";
-            repo = "neoai.nvim";
-            rev = "14ffe5f1361bdfbd7667ca57cb07f52abcdcc00b";
-            sha256 = "0mqrp9hpwrfdyjfpw85wmzd0qflx9pk4h50ax3r2snav61n9y6rg";
-          };
-        };
+        # # nix-prefetch-git https://github.com/Bryley/neoai.nvim --rev cdbc4c723577d642b5af796875dec660a4cb528b
+        # neoai = vimUtils.buildVimPlugin {
+        #   name = "neoai";
+        #   src = fetchFromGitHub {
+        #     owner = "Bryley";
+        #     repo = "neoai.nvim";
+        #     rev = "14ffe5f1361bdfbd7667ca57cb07f52abcdcc00b";
+        #     sha256 = "0mqrp9hpwrfdyjfpw85wmzd0qflx9pk4h50ax3r2snav61n9y6rg";
+        #   };
+        # };
 
         nvim-tree-lua = vimUtils.buildVimPlugin {
           name = "nvim-tree-lua";
           src = fetchFromGitHub {
             owner = "nvim-tree";
             repo = "nvim-tree.lua";
-            rev = "ad0b95dee55955817af635fa121f6e2486b10583";
-            sha256 = "005rkw0p4gk0aav0llzmpfg2sq7ddxgdqzljmh0xqhacqn26jmky";
+            rev = "375e38673b5c61debd8074ced01cfd4f3b7ce1e9";
+            sha256 = "16rkswhc6gwf8rci51hilg5hkyvjmdf385wwp78733iznni938bw";
           };
         };
 
@@ -172,11 +153,13 @@
       in
       [
         vim-test
-        co-pilot
+        virt-column-nvim
+        tokyonight-nvim
         nui-nvim
-        neoai
+        # neoai
         # ChatGPT-vim
         # plenary-nvim
+        copilot-vim
 
         ###REVIEW###
         # indentLine
@@ -202,7 +185,6 @@
         lspkind-nvim
         lualine-nvim
         nvim-web-devicons
-        virt-column
         # vim-markdown
 
         # Navigation

diff --git a/modules/editor/nvim/lsp.lua b/modules/editor/nvim/lsp.lua
@@ -62,16 +62,16 @@ local border = {
   { '│', "FloatBorder" },
 }
 
--- lsp.elixirls.setup {
---   cmd = { vim.g.lsp_elixir_bin },
---   flags = { debounce_text_changes = 150, },
--- }
-
-lsp.lexical.setup{
-   cmd = { vim.g.lsp_elixir_bin },
+lsp.elixirls.setup {
+  cmd = { vim.g.lsp_elixir_bin },
   flags = { debounce_text_changes = 150, },
 }
 
+-- lsp.lexical.setup{
+--    cmd = { vim.g.lsp_elixir_bin },
+--   flags = { debounce_text_changes = 150, },
+-- }
+
 lsp.erlangls.setup {}
 
 lsp.terraformls.setup {}

diff --git a/modules/editor/nvim/nvim-tree.lua b/modules/editor/nvim/nvim-tree.lua
@@ -1,5 +1,5 @@
-local HEIGHT_RATIO = 0.5 -- You can change this
-local WIDTH_RATIO = 0.5 -- You can change this too
+local HEIGHT_RATIO = 0.5
+local WIDTH_RATIO = 0.5
 
 vim.cmd([[hi NvimTreeNormal guibg=NONE ctermbg=None]])
 require("nvim-tree").setup({

diff --git a/modules/editor/nvim/theme.lua b/modules/editor/nvim/theme.lua
@@ -5,13 +5,26 @@
 -- syntax enable
 -- syntax sync minlines=256
 
-local catppuccin = require("catppuccin")
+require("tokyonight").setup({
+  -- use the night style
+  style = "moon",
+  -- disable italic for functions
+  styles = {
+    functions = {}
+  },
+-- tokyonight-moon
+-- tokyonight-storm
+-- tokyonight-day
+-- tokyonight-night
 
-catppuccin.setup {
-  flavour = "frappe" -- latte, frappe, macchiato, mocha
-}
+  -- Change the "hint" color to the "orange" color, and make the "error" color bright red
+  on_colors = function(colors)
+    colors.hint = colors.orange
+    colors.error = "#ff0000"
+  end
+})
 
-vim.cmd("colorscheme catppuccin")
+vim.cmd("colorscheme tokyonight-moon")
 
 require('lualine').setup {
   options = {