diff --git a/.vimrc b/.vimrc index 7b13153..5cdfaf9 100644 --- a/.vimrc +++ b/.vimrc @@ -97,7 +97,11 @@ Plug 'embark-theme/vim' Plug 'tpope/vim-obsession' Plug 'dhruvasagar/vim-prosession' Plug 'vim-airline/vim-airline' -Plug 'itchyny/vim-cursorword' +if has('nvim') + Plug 'tzachar/local-highlight.nvim' +else + Plug 'itchyny/vim-cursorword' +endif Plug 'wakatime/vim-wakatime' Plug 'tpope/vim-surround' Plug 'tpope/vim-commentary' @@ -335,6 +339,7 @@ let g:airline_right_sep = '' let g:airline_right_alt_sep = '' if has('nvim') + lua require('local-highlight').setup { cw_hlgroup = 'LspReferenceText' } lua require('gitsigns').setup { attach_to_untracked = true, current_line_blame = true, current_line_blame_opts = { delay = 0 } } endif diff --git a/.wezterm.lua b/.wezterm.lua index 7d42686..5acede2 100644 Binary files a/.wezterm.lua and b/.wezterm.lua differ diff --git a/home-manager/home.nix b/home-manager/home.nix index c07063c..f9234b8 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -45,6 +45,10 @@ in { directory = /mnt/fdos_server/OS-24Fall-FDU [credential] helper = store + [diff] + tool = vimdiff + [merge] + tool = vimdiff ''; }; ".vimrc" = { @@ -311,6 +315,7 @@ in { pkgs.patchelf # pkgs.screenkey pkgs.ipatool # Search and download IPAs + unstable.open-webui # My version of BerkeleyMono NF is incomplete. Should add some fallback fonts. # (pkgs.nerdfonts.override { fonts = [ @@ -439,6 +444,7 @@ in { # set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' set-option -g default-shell "${pkgs.zsh}/bin/zsh" set -g default-command "${pkgs.zsh}/bin/zsh" + set-option -g set-titles on setw -g mode-keys vi set-option -g status-position top set -g status-bg default diff --git a/nix_environments/open-webui.nix b/nix_environments/open-webui.nix new file mode 100644 index 0000000..555cb8b --- /dev/null +++ b/nix_environments/open-webui.nix @@ -0,0 +1,16 @@ +with import {}; +(pkgs.buildFHSEnv { + name = "open-webui-env"; + targetPkgs = pkgs: with pkgs; [ + (python311.withPackages (python-pkgs: with python-pkgs; [ + pip + ])) + libgcc + ]; + profile = '' + mkdir -p $HOME/.nix-envs/open-webui-env + ${python311}/bin/python -m venv $HOME/.nix-envs/open-webui-env + source $HOME/.nix-envs/open-webui-env/bin/activate + $HOME/.nix-envs/open-webui-env/bin/pip install open-webui + ''; +}).env