Updated flake inputs

modules/home/environment/stylixhome.nix

@@ -1,7 +1,7 @@
 { lib, self, config, host, pkgs, ... }:
 
 let
-  scheme = "tokyo-night-dark";
+  scheme = "ayu-dark";
   wallpaper = "${self}/assets/wallpapers/dark-waves.jpg";
   server = (host == "xenon");
 in {
@@ -16,10 +16,11 @@ in {
       image = wallpaper;
       polarity = "dark";
       autoEnable = true;
-      opacity.terminal = 0.5;
+      opacity.terminal = 1.0;
       targets = {
         waybar.enable = false;
         btop.enable = false;
+        nixvim.enable = false;
         nixvim.transparentBackground = {
           main = false;
           signColumn = false;

modules/home/environment/userpkgs.nix

@@ -49,6 +49,16 @@ in {
       wf-recorder
       toilet
       vkbasalt
+      firefox
+      dust
+      porsmo
+      rustup
+      w3m
+      neovide
+      python3
+      ghostty
+      fd
+      delta
     ] ++ scripts;
   };
 }

modules/home/environment/zsh/aliases.nix

@@ -4,7 +4,9 @@
   config = lib.mkIf config.movOpts.envConfig.zshConfig.shellAliases.enable {
     programs.zsh = {
       shellAliases = {
-        grep = "grep --color=auto";
+        grep = "rg";
+        find = "fd";
+        cat = "bat";
         yazi = "y";
         mv = "mv -v";
         cp = "cp -vr";
@@ -28,6 +30,7 @@
         gpush = "gitpush_sfx";
         gpull = "gitpull_sfx";
         greb = "gitrebase_sfx";
+        rsh = "$HOME/Coding/projects/rust/rsh/target/debug/rsh";
       };
     };
   };

modules/home/environment/zsh/extraconfig.nix

@@ -37,7 +37,12 @@ in
           ${shellsound} ${sndpath}/nvim.wav
           command nvim "$@"
         }
+        neovide() {
+          ${shellsound} ${sndpath}/nvim.wav
+          command neovide "$@"
+        }
         alias vi="nvim"
+        alias vide="neovide"
         kitty_theme() {
           if [ $TERM = "xterm-kitty" ]; then
             if [ -n "$SSH_CONNECTION" ]; then
@@ -135,6 +140,10 @@ in
           touch $HOME/.zsh_history
           chmod 600 $HOME/.zsh_history
         fi
+        if [ "$TERM" = "linux" ]; then
+          echo -en "\e]P0101010"
+          setfont ter-v32b
+        fi
         setopt APPEND_HISTORY     # Append history to the history file (don't overwrite)
         setopt INC_APPEND_HISTORY # Append to the history file incrementally
         setopt SHARE_HISTORY      # Share history between all zsh sessions

modules/home/programs/git.nix

@@ -13,20 +13,12 @@
       };
       userEmail = "kylerclay@proton.me";
       userName = "${username}";
-      diff-so-fancy = {
-        enable = true;
-        markEmptyLines = false;
-        stripLeadingSymbols = false;
-      };
       extraConfig = {
-        color.diff = {
-          #         meta = "black yellow bold";
-          #         frag = "white blue bold";
-          old = "#A9B1D6 #301A1F";
-          new = "#A9B1D6 #12261E";
-          #         plain = "normal";
-          #         whitespace = "reverse red";
-        };
+        core.pager = "delta";
+        interactive.diffFilter = "delta --color-only";
+        delta.navigate = "true";
+        delta.dark = "true";
+        merge.conflictstyle = "zdiff3";
       };
     };
   };

modules/home/programs/kitty.nix

@@ -6,6 +6,11 @@
   config = lib.mkIf config.movOpts.programConfigs.kittyConfig.enable {
     programs.kitty = {
       enable = true;
+      font = {
+        package = lib.mkForce pkgs.fira-code;
+        name = lib.mkForce "Fira Code";
+        size = lib.mkForce 20;
+      };
 
       settings = {
         confirm_os_window_close = 0;

modules/home/programs/nixvim/autocmd.nix

@@ -15,6 +15,12 @@
         desc =
           "Load previous session window settings for the opened file (folds, cursor pos, etc)";
       }
+      {
+        command = "silent! FloatermNew --name=def_term --width=0.8 --height=0.8 --wintype=topright --silent";
+        event = [ "VimEnter" ];
+        pattern = [ "*" ];
+        desc = "Start the floaterm window";
+      }
     ];
   };
 }

modules/home/programs/nixvim/keymaps.nix

@@ -6,24 +6,14 @@
         key = "!fs";
         mode = "n";
       }
+      {
+        action = "<cmd>UndotreeToggle<CR>"; # select entire document
+        key = "!t";
+        mode = "n";
+      }
       {
         action = "gg<S-V>G"; # select entire document
-        key = "<C-a>";
-        mode = "n";
-      }
-      {
-        action = "<cmd>ChatGPTEditWithInstructions<CR>";
-        key = "!egpt";
-        mode = "n";
-      }
-      {
-        action = "<cmd>ChatGPTCompleteCode<CR>";
-        key = "!cgpt";
-        mode = "n";
-      }
-      {
-        action = "<cmd>ChatGPT<CR>";
-        key = "!gpt";
+        key = "!a";
         mode = "n";
       }
       {
@@ -31,11 +21,6 @@
         key = "!ca";
         mode = "n";
       }
-      {
-        action = "<cmd>Telescope<CR>";
-        key = "!t";
-        mode = "n";
-      }
       {
         action = "<cmd>lua vim.lsp.buf.format()<CR>";
         key = "!fmt";
@@ -57,20 +42,15 @@
         mode = "n";
       }
       {
-        action = "<cmd>FloatermToggle shadeterm<CR>";
+        action = "<cmd>FloatermToggle def_term<CR>";
         key = "<F2>";
-        mode = "n";
+        mode = [ "n" "t" ];
       }
       {
         action = "<cmd>NvimTreeToggle<CR>";
         key = "<F3>";
         mode = "n";
       }
-      {
-        action = "<cmd>FloatermToggle shadeterm<CR>";
-        key = "<F2>";
-        mode = "t";
-      }
       {
         action = "<cmd>COQnow<CR>";
         key = "!cq";

modules/home/programs/nixvim/options.nix

@@ -5,6 +5,7 @@ in {
   programs.nixvim = {
     colorschemes.base16 = {
       enable = true;
+      colorscheme = "ayu-dark";
       #colorscheme = {
       #	base00 = "#${scheme.base00}";
       #	base01 = "#${scheme.base01}";
@@ -51,8 +52,10 @@ in {
       vim.opt.linebreak = true
       vim.opt.textwidth = 0
       vim.opt.breakat = " \t!@*-+;:,./?"
+      vim.opt.guifont = "Fira Code:h18"
 
       vim.g.mapleader = "!"
+      vim.g.rust_recommended_style = 0
     '';
   };
 }

modules/home/programs/nixvim/plugins/airline.nix

@@ -0,0 +1,16 @@
+{
+  programs.nixvim = {
+    plugins.airline = {
+      enable = true;
+      settings = {
+        left_sep = "";
+        right_sep = "";
+        powerline_fonts = 1;
+        theme = "dark";
+        section_x = "";
+        section_y = "";
+        skip_empty_sections = 1;
+      };
+    };
+  };
+}

modules/home/programs/nixvim/plugins/default.nix

@@ -12,12 +12,15 @@
     ./lsp.nix
     ./rustaceanvim.nix
     ./fidget.nix
-    ./lualine.nix
+    # ./lualine.nix
+    ./airline.nix
     ./nvim-lightbulb.nix
     ./neocord.nix
     ./plugins.nix
     ./nvim-tree.nix
     ./telescope.nix
+    ./indent-blankline.nix
+    ./gitsigns.nix
     ./extra_plugins.nix
   ];
 }

modules/home/programs/nixvim/plugins/gitsigns.nix

@@ -0,0 +1,14 @@
+{
+  programs.nixvim = {
+    plugins.gitsigns = {
+      enable = true;
+      settings.signs = {
+        add.text = "│";
+        change.text = "/";
+        delete.text = "-";
+        topdelete.text = "-";
+        changedelete.text = "\\";
+      };
+    };
+  };
+}

modules/home/programs/nixvim/plugins/haskell.nix

@@ -1,16 +1,16 @@
 { pkgs, ... }: {
   programs.nixvim = {
-    extraPlugins = [
-      (pkgs.vimUtils.buildVimPlugin {
-        name = "haskell-tools.nvim";
-        src = pkgs.fetchFromGitHub {
-          owner = "mrcjkb";
-          repo = "haskell-tools.nvim";
-          rev = "39c4ced6f1bff1abc8d4df5027efd11ac38c6e6c";
-          hash = "sha256-f+M35EwAlHwjJ2Xs2u9FLnyH0FJT22D0LLShDXCbEEs=";
-        };
-      })
-    ];
-    plugins = { haskell-scope-highlighting.enable = true; };
+    #extraPlugins = [
+      #(pkgs.vimUtils.buildVimPlugin {
+        #name = "haskell-tools.nvim";
+        #src = pkgs.fetchFromGitHub {
+          #owner = "mrcjkb";
+          #repo = "haskell-tools.nvim";
+          #rev = "39c4ced6f1bff1abc8d4df5027efd11ac38c6e6c";
+          #hash = "sha256-f+M35EwAlHwjJ2Xs2u9FLnyH0FJT22D0LLShDXCbEEs=";
+        #};
+      #})
+    #];
+    #plugins = { haskell-scope-highlighting.enable = true; };
   };
 }

modules/home/programs/nixvim/plugins/indent-blankline.nix

@@ -0,0 +1,10 @@
+{
+  programs.nixvim = {
+    plugins.indent-blankline = {
+      enable = true;
+      #settings = {
+        #indent.char = "│";
+      #};
+    };
+  };
+}

modules/home/programs/nixvim/plugins/lualine.nix

@@ -1,7 +1,7 @@
 {
   programs.nixvim = {
     plugins.lualine = {
-      enable = true;
+      enable = false;
       settings = {
         options = {
           icons_enabled = true;

modules/home/programs/nixvim/plugins/plugins.nix

@@ -7,11 +7,11 @@
       };
       nix.enable = true;
       endwise.enable = true;
+      undotree.enable = true;
       firenvim.enable = true;
       helpview.enable = true;
       floaterm.enable = true;
       fugitive.enable = true;
-      gitsigns.enable = true;
       indent-blankline.enable = true;
       lastplace.enable = true;
       markdown-preview.enable = true;

modules/home/programs/nixvim/plugins/scrollview.nix

@@ -6,6 +6,7 @@
       settings.diagnostics_warn_symbol = "■";
       settings.diagnostics_hint_symbol = "■";
       settings.diagnostics_info_symbol = "■";
+      settings.character = "│";
     };
   };
 }

modules/home/programs/nixvim/plugins/vim-matchup.nix

@@ -2,19 +2,17 @@
   programs.nixvim = {
     plugins.vim-matchup = {
       enable = true;
-      enableSurround = true;
-      textObj.enable = true;
-      motion = {
-        enable = true;
-        cursorEnd = true;
-      };
-      matchParen = {
-        hiSurroundAlways = true;
-        offscreen = { method = "popup"; };
-      };
-      treesitterIntegration = {
-        enable = true;
-        includeMatchWords = true;
+      settings = {
+        surround_enabled = 1;
+        text_obj_enabled = 1;
+        motion_enabled = 1;
+        motion_cursor_end = 1;
+        matchparen_deferred_hi_surround_always = true;
+        matchparen_offscreen = { method = "popup"; };
+        treesitter = {
+          enable = true;
+          include_match_words = true;
+        };
       };
     };
   };