apps: nvim: remove user config for now (using nvchad)

hosts/home.nix

@@ -181,7 +181,7 @@
       package = pkgs.papirus-icon-theme;
     };
     font = {
-      name = "JetBrains Mono Medium";         # or FiraCode Nerd Font Mono Medium
+      name = "FiraCode Nerd Font";         # or FiraCode Nerd Font Mono Medium
     };                                        # Cursor is declared under home.pointerCursor
   };
   systemd.user.services.mpris-proxy = {

modules/editors/nvim/default.nix

@@ -11,45 +11,146 @@
       viAlias = true;
       vimAlias = true;
       vimdiffAlias = true;
+      withNodeJs = true;
 
-      plugins = with pkgs.vimPlugins; [
+#      plugins = with pkgs.vimPlugins; [
+#
+#        # Syntax
+#        #vim-nix
+#        #vim-markdown
+#
+#        # Quality of life
+#        vim-lastplace         # Opens document where you left it
+#        auto-pairs            # Print double quotes/brackets/etc.
+#        vim-gitgutter         # See uncommitted changes of file :GitGutterEnable
+#
+#        # File Tree
+#        nerdtree              # File Manager - set in extraConfig to F6
+#	
+#        # Customization 
+#        wombat256-vim         # Color scheme for lightline
+#        srcery-vim            # Color scheme for text
+#
+#        lightline-vim         # Info bar at bottom
+#        indent-blankline-nvim # Indentation lines
+#
+#        # Syntax
+#        nvim-treesitter.withAllGrammars
+#        # finder
+#        telescope-nvim
+#        # completion
+#        nvim-cmp
+#        # status line
+#        lualine-nvim
+#        # indent
+#        indent-blankline-nvim
+#      ];
 
-        # Syntax
+      extraPackages = with pkgs; [
-        vim-nix
+        ripgrep
-        vim-markdown
+        fd
-
+        nodejs
-        # Quality of life
+        nodePackages.npm
-        vim-lastplace         # Opens document where you left it
-        auto-pairs            # Print double quotes/brackets/etc.
-        vim-gitgutter         # See uncommitted changes of file :GitGutterEnable
-
-        # File Tree
-        nerdtree              # File Manager - set in extraConfig to F6
-	
-        # Customization 
-        wombat256-vim         # Color scheme for lightline
-        srcery-vim            # Color scheme for text
-
-        lightline-vim         # Info bar at bottom
-        indent-blankline-nvim # Indentation lines
       ];
 
-      extraConfig = ''
+#      extraConfig = ''
-          set number relativenumber
+#        set expandtab
-          syntax enable                             " Syntax highlighting
+#        set shiftwidth=4
-          colorscheme srcery                        " Color scheme text
+#        set tabstop=4
-          let g:lightline = {
+#      '';
-            \ 'colorscheme': 'wombat',
+
-            \ }                                     " Color scheme lightline
+#      extraLuaConfig = ''
-          highlight Comment cterm=italic gui=italic " Comments become italic
+#          vim.g.mapleader = ' '
-          hi Normal guibg=NONE ctermbg=NONE         " Remove background, better for personal theme
+#          vim.g.maplocalleader = ' '
-          
+#
-          set number                                " Set numbers
+#          -- Set highlight on search
-          nmap <F6> :NERDTreeToggle<CR>             " F6 opens NERDTree
+#          vim.o.hlsearch = false
-          set expandtab
+#          
-          set shiftwidth=4
+#          -- Make line numbers default
-          set tabstop=4
+#          vim.wo.number = true
-      '';
+#          
+#          -- Enable mouse mode
+#          vim.o.mouse = 'a'
+#          
+#          -- Sync clipboard between OS and Neovim.
+#          --  Remove this option if you want your OS clipboard to remain independent.
+#          --  See `:help 'clipboard'`
+#          vim.o.clipboard = 'unnamedplus'
+#          
+#          -- Enable break indent
+#          vim.o.breakindent = true
+#          
+#          -- Save undo history
+#          vim.o.undofile = true
+#          
+#          -- Case insensitive searching UNLESS /C or capital in search
+#          vim.o.ignorecase = true
+#          vim.o.smartcase = true
+#          
+#          -- Keep signcolumn on by default
+#          vim.wo.signcolumn = 'yes'
+#          
+#          -- Decrease update time
+#          vim.o.updatetime = 250
+#          vim.o.timeout = true
+#          vim.o.timeoutlen = 300
+#          
+#          -- Set completeopt to have a better completion experience
+#          vim.o.completeopt = 'menuone,noselect'
+#          
+#          -- NOTE: You should make sure your terminal supports this
+#          vim.o.termguicolors = true
+#
+#          -- [[ Highlight on yank ]]
+#          -- See `:help vim.highlight.on_yank()`
+#          local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
+#          vim.api.nvim_create_autocmd('TextYankPost', {
+#            callback = function()
+#              vim.highlight.on_yank()
+#            end,
+#            group = highlight_group,
+#            pattern = '*',
+#          })
+#          
+#          -- [[ Configure Telescope ]]
+#          -- See `:help telescope` and `:help telescope.setup()`
+#          require('telescope').setup {
+#            defaults = {
+#              mappings = {
+#                i = {
+#                  ['<C-u>'] = false,
+#                  ['<C-d>'] = false,
+#                },
+#              },
+#            },
+#          }
+#          
+#          -- Enable telescope fzf native, if installed
+#          pcall(require('telescope').load_extension, 'fzf')
+#          
+#          -- See `:help telescope.builtin`
+#          vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
+#          vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
+#          vim.keymap.set('n', '<leader>/', function()
+#            -- You can pass additional configuration to telescope to change theme, layout, etc.
+#            require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
+#              winblend = 10,
+#              previewer = false,
+#            })
+#          end, { desc = '[/] Fuzzily search in current buffer' })
+#          
+#          vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
+#          vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
+#          vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
+#          vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
+#          vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
+#          vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
+#          require("indent_blankline").setup {
+#              -- for example, context is off by default, use this to turn it on
+#              show_current_context = true,
+#              show_current_context_start = true,
+#          }
+#      '';
     };
   };
 }

modules/home.nix

@@ -5,7 +5,7 @@
     cmds = {
       shell = mkOption { type = types.str; default = "zsh"; };
       fetch = mkOption { type = types.str; default = "hyfetch"; };
-      editor = mkOption { type = types.str; default = "hx"; };
+      editor = mkOption { type = types.str; default = "nvim"; };
 
       wm = mkOption { type = types.str; default = "sway"; };
 
@@ -24,7 +24,7 @@
     theme = {
       theme = mkOption { type = types.str; default = "catppuccin-mocha"; };
       icon-theme = mkOption { type = types.str; default = "Papirus-Dark"; };
-      font = mkOption { type = types.str; default = "FiraCode Nerd Font Mono 11"; };
+      font = mkOption { type = types.str; default = "FiraCode Nerd Font 11"; };
       wallpaper = mkOption { type = types.str; default = ""; };
     };
   };

modules/programs/alacritty.nix

@@ -16,8 +16,9 @@
       package = pkgs.alacritty;
       settings = {
         font = rec {                          # Font - Laptop has size manually changed at home.nix
-          normal.family = "Source Code Pro";
+          #normal.family = "Source Code Pro";
-          bold = { style = "Bold"; };
+          normal.family = "FiraCode Nerd Font";
+          #bold = { style = "Bold"; };
 #         size = 8;
         };
         offset = {                            # Positioning

modules/shell/tmux.nix

@@ -8,7 +8,8 @@
   programs = {
     tmux = {
       enable = true;
-      terminal = "xterm-256color";
+      terminal = "screen-256color";
+      escapeTime = 300;
       newSession = false;
       keyMode = "vi";
       historyLimit = 10000;
@@ -19,16 +20,25 @@
           yank
           sidebar
           {
-              plugin = dracula;
+          #    plugin = dracula;
-              extraConfig = "
+          #    extraConfig = "
-                set -g @dracula-show-powerline true
+          #      set -g @dracula-show-powerline true
-                set -g @dracula-plugins 'git cpu-usage ram-usage battery time'
+          #      set -g @dracula-plugins 'git cpu-usage ram-usage battery time'
-                set -g @dracula-border-contrast true
+          #      set -g @dracula-border-contrast true
-              ";
+          #    ";
+            plugin = catppuccin;
+            extraConfig = "
+              set -g @catppuccin_flavour 'macchiato'
+              set -g @catppuccin_window_tabs_enabled 'on'
+              set -g @catppuccin_host 'on'
+              set -g @catppuccin_user 'on'
+              set -g @catppuccin_date_time '%Y-%m-%d %H:%M'
+            ";
           }
       ];
       extraConfig = ''
         set -g mouse on
+        set-option -sa terminal-features ',alacritty:RGB'
 
         # More friendly split pane
         bind-key s split-window -h -c "#{pane_current_path}"