configured neovim for latex, removed vim and helix

This commit is contained in:
Aria Nolan 2024-02-24 13:24:17 -05:00
parent 081e95317d
commit f3b84d39ff
7 changed files with 31 additions and 413 deletions

View file

@ -1,53 +0,0 @@
{
# config,
pkgs,
inputs,
...
}: {
imports = [
./languages.nix
];
programs.helix = {
enable = true;
package = inputs.helix.packages.${pkgs.system}.default;
extraPackages = with pkgs; [
clang-tools
marksman
nil
nodePackages.bash-language-server
shellcheck
texlab
tectonic
lua-language-server
zathura
vhdl-ls
];
settings = {
theme = "catppuccin_frappe";
editor = {
line-number = "relative";
lsp.display-messages = true;
scrolloff = 10;
middle-click-paste = false;
cursorline = true;
auto-format = false;
idle-timeout = 400;
color-modes = true;
soft-wrap.enable = true;
whitespace = {
render = {
space = "none";
tab = "none";
newline = "none";
};
};
indent-guides = {
render = true;
character = "";
rainbow-option = "dim";
};
};
};
};
}

View file

@ -1,55 +0,0 @@
{
pkgs,
lib,
...
}: {
programs.helix.languages = {
language = [
{
name = "latex";
indent = {
tab-width = 2;
unit = "\t";
};
}
{
name = "c";
indent = {
tab-width = 2;
unit = "\t";
};
}
];
language-server = {
nil = {
config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"];
};
texlab = {
config.texlab = {
forwardSearch.executable = "zathura";
forwardSearch.args = ["--synctex-forward" "%l:1:%f" "%p"];
build = {
executable = "tectonic";
onSave = true;
forwardSearchAfter = true;
auxDirectory = "build";
logDirectory = "build";
pdfDirectory = "build";
args = [
"-X"
"compile"
"%f"
"--synctex"
"--keep-logs"
"--keep-intermediates"
"--outdir"
"build"
];
};
};
};
};
};
}

View file

@ -3,7 +3,6 @@
./programs ./programs
./services ./services
./shell ./shell
./helix
./wayland ./wayland
./email.nix ./email.nix
./lf ./lf
@ -43,7 +42,6 @@
discord discord
libreoffice libreoffice
notify-desktop notify-desktop
texlive.combined.scheme-medium
libsixel libsixel
aspell aspell
aspellDicts.en aspellDicts.en

View file

@ -14,6 +14,10 @@
providers.wl-copy.enable = true; providers.wl-copy.enable = true;
register = "unnamedplus"; register = "unnamedplus";
}; };
extraPackages = with pkgs; [
latexrun
zathura
];
options = { options = {
number = true; number = true;
relativenumber = true; relativenumber = true;
@ -39,6 +43,21 @@
treesitter = { treesitter = {
enable = true; enable = true;
nixvimInjections = true; nixvimInjections = true;
indent = true;
disabledLanguages = [
"latex"
];
ignoreInstall = [
"latex"
];
};
vimtex = {
enable = true;
texlivePackage = pkgs.texliveFull;
settings = {
compiler_method = "latexrun";
view_method = "zathura";
};
}; };
}; };
files = { files = {
@ -54,6 +73,18 @@
spell = true; spell = true;
}; };
}; };
"ftplugin/tex.lua" = {
options = {
spell = true;
}; };
}; };
};
keymaps = [
{
action = "<cmd>nohl<CR>";
key = "<C-q>";
options.silent = true;
}
];
};
} }

View file

@ -1,99 +0,0 @@
{pkgs, ...}: let
rose-pine-vim = pkgs.vimUtils.buildVimPlugin {
name = "rose-pine-vim";
src = pkgs.fetchFromGitHub {
owner = "rose-pine";
repo = "vim";
rev = "d149980cfa5cdec487df23b2e9963c3256f3a9f3";
sha256 = "a+RCmgSG+snwBVQCzSnp8wVxSoQcLqoJjnTiDviTGqc=";
};
};
vim-spell-en-utf8-dictionary = builtins.fetchurl {
url = "http://ftp.vim.org/vim/runtime/spell/en.utf-8.spl";
sha256 = "0w1h9lw2c52is553r8yh5qzyc9dbbraa57w9q0r9v8xn974vvjpy";
};
vim-spell-en-utf8-suggestions = builtins.fetchurl {
url = "http://ftp.vim.org/vim/runtime/spell/en.utf-8.sug";
sha256 = "1v1jr4rsjaxaq8bmvi92c93p4b14x2y1z95zl7bjybaqcmhmwvjv";
};
vim-spell-en-latin1-dictionary = builtins.fetchurl {
url = "http://ftp.vim.org/vim/runtime/spell/en.latin1.spl";
sha256 = "0i8q2si2bm8c0556j3c0gjin3bixgs055yqqk1irvz4wszy9w3b2";
};
vim-spell-en-latin1-suggestions = builtins.fetchurl {
url = "http://ftp.vim.org/vim/runtime/spell/en.latin1.sug";
sha256 = "00ibcbj2b2krwd5zl9zl671db44k3fl59sz1yymb9ydkpkj9gpp6";
};
in {
programs.vim = {
enable = true;
settings = {
copyindent = true;
expandtab = false;
hidden = true;
history = 100;
ignorecase = false;
modeline = true;
mousefocus = false;
number = true;
relativenumber = true;
shiftwidth = 2;
tabstop = 2;
};
plugins = with pkgs.vimPlugins; [
everforest
catppuccin-vim
sonokai
vim-colors-solarized
gruvbox
rose-pine-vim
terminus
vim-fugitive
vim-gitgutter
tabular
vim-markdown
];
extraConfig = ''
if has('termguicolors')
set termguicolors
endif
set background=dark
colorscheme rosepine_moon
set scrolloff=5
set hlsearch
set signcolumn=yes
set updatetime=100
set cursorline
set autoindent
set belloff=all
nnoremap <C-@> :call system("wl-copy", @")<CR>
nnoremap <C-q> :nohlsearch<CR>
let g:vim_markdown_folding_disabled = 1
let g:vim_markdown_math = 1
'';
};
home.file.".vim/after/plugin/terminus.vim".text = ''
let &t_SI="\e[6 q"
let &t_EI="\e[2 q"
let &t_Cs = "\e[4:3m"
let &t_Ce = "\e[4:0m"
'';
home.file.".vim/after/ftplugin/markdown.vim".text = ''
setlocal spell spelllang=en_us
setlocal nomodeline
'';
home.file."/.vim/spell/en.utf-8.spl".source = vim-spell-en-utf8-dictionary;
home.file."/.vim/spell/en.utf-8.sug".source = vim-spell-en-utf8-suggestions;
home.file."/.vim/spell/en.latin1.spl".source = vim-spell-en-latin1-dictionary;
home.file."/.vim/spell/en.latin1.sug".source = vim-spell-en-latin1-suggestions;
}

View file

@ -1,188 +0,0 @@
#!/usr/bin/env bash
# See the river(1), riverctl(1), and rivertile(1) man pages for complete
# documentation.
# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
# riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
riverctl spawn "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP"
riverctl map normal Super+Shift Return spawn 'foot'
riverctl map normal Super D spawn 'rofi -show drun'
# firefox
riverctl map normal Super+Shift F spawn "firefox"
# screenshot utility
riverctl map normal None Print spawn 'IMG=~/Pictures/screenshots/$(date | sed "s/\s/-/g" | sed "s/--/-/g").png&&grim -g "$(slurp)" $IMG && cat $IMG | wl-copy && notify-send "Screenshot has been saved and copied to your clipboard" -a "grim" -u normal -t 2000'
# Super+Q to close the focused view
riverctl map normal Super Q close
# Super+Shift+E to exit river
riverctl map normal Super+Shift E exit
# Super+J and Super+K to focus the next/previous view in the layout stack
riverctl map normal Super J focus-view next
riverctl map normal Super K focus-view previous
# Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous
# view in the layout stack
riverctl map normal Super+Shift J swap next
riverctl map normal Super+Shift K swap previous
# Super+Period and Super+Comma to focus the next/previous output
riverctl map normal Super Period focus-output next
riverctl map normal Super Comma focus-output previous
# Super+Shift+{Period,Comma} to send the focused view to the next/previous output
riverctl map normal Super+Shift Period send-to-output next
riverctl map normal Super+Shift Comma send-to-output previous
# Super+Return to bump the focused view to the top of the layout stack
riverctl map normal Super Return zoom
# Super+H and Super+L to decrease/increase the main ratio of rivertile(1)
riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05"
riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05"
# Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1)
riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1"
riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1"
# Super+Alt+{H,J,K,L} to move views
riverctl map normal Super+Alt H move left 100
riverctl map normal Super+Alt J move down 100
riverctl map normal Super+Alt K move up 100
riverctl map normal Super+Alt L move right 100
# Super+Alt+Control+{H,J,K,L} to snap views to screen edges
riverctl map normal Super+Alt+Control H snap left
riverctl map normal Super+Alt+Control J snap down
riverctl map normal Super+Alt+Control K snap up
riverctl map normal Super+Alt+Control L snap right
# Super+Alt+Shift+{H,J,K,L} to resize views
riverctl map normal Super+Alt+Shift H resize horizontal -100
riverctl map normal Super+Alt+Shift J resize vertical 100
riverctl map normal Super+Alt+Shift K resize vertical -100
riverctl map normal Super+Alt+Shift L resize horizontal 100
# Super + Left Mouse Button to move views
riverctl map-pointer normal Super BTN_LEFT move-view
# Super + Right Mouse Button to resize views
riverctl map-pointer normal Super BTN_RIGHT resize-view
# Super + Middle Mouse Button to toggle float
riverctl map-pointer normal Super BTN_MIDDLE toggle-float
for i in $(seq 1 9)
do
tags=$((1 << ($i - 1)))
# Super+[1-9] to focus tag [0-8]
riverctl map normal Super $i set-focused-tags $tags
# Super+Shift+[1-9] to tag focused view with tag [0-8]
riverctl map normal Super+Shift $i set-view-tags $tags
# Super+Control+[1-9] to toggle focus of tag [0-8]
riverctl map normal Super+Control $i toggle-focused-tags $tags
# Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view
riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
done
# Super+0 to focus all tags
# Super+Shift+0 to tag focused view with all tags
all_tags=$(((1 << 32) - 1))
riverctl map normal Super 0 set-focused-tags $all_tags
riverctl map normal Super+Shift 0 set-view-tags $all_tags
# Super+Space to toggle float
riverctl map normal Super Space toggle-float
# Super+F to toggle fullscreen
riverctl map normal Super F toggle-fullscreen
# Super+{Up,Right,Down,Left} to change layout orientation
riverctl map normal Super Up send-layout-cmd rivertile "main-location top"
riverctl map normal Super Right send-layout-cmd rivertile "main-location right"
riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom"
riverctl map normal Super Left send-layout-cmd rivertile "main-location left"
# Declare a passthrough mode. This mode has only a single mapping to return to
# normal mode. This makes it useful for testing a nested wayland compositor
riverctl declare-mode passthrough
# Super+F11 to enter passthrough mode
riverctl map normal Super F11 enter-mode passthrough
# Super+F11 to return to normal mode
riverctl map passthrough Super F11 enter-mode normal
# Various media key mapping examples for both normal and locked mode which do
# not have a modifier
for mode in normal locked
do
# Eject the optical drive (well if you still have one that is)
riverctl map $mode None XF86Eject spawn 'eject -T'
# Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer)
riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5'
riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5'
riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute'
# Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
riverctl map $mode None XF86AudioPlay spawn 'playerctl play-pause'
riverctl map $mode None XF86AudioPrev spawn 'playerctl previous'
riverctl map $mode None XF86AudioNext spawn 'playerctl next'
# Control screen backlight brightness with light (https://github.com/haikarainen/light)
riverctl map $mode None XF86MonBrightnessUp spawn 'brightnessctl s +5%'
riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl s 5%-'
done
# Set background and border color
riverctl background-color 0x002b36
riverctl border-color-focused 0x93a1a1
riverctl border-color-unfocused 0x586e75
riverctl spawn "wbg $HOME/.config/river/background.jpg"
# Set keyboard repeat rate
riverctl set-repeat 50 300
# Make all views with an app-id that starts with "float" and title "foo" start floating.
riverctl rule-add float -app-id 'float*' -title 'foo'
# Make all views with app-id "bar" and any title use client-side decorations
riverctl rule-add csd -app-id "bar"
# Set the default layout generator to be rivertile and start it.
# River will send the process group of the init executable SIGTERM on exit.
riverctl default-layout rivertile
if [ -n "$(pgrep rivertile)" ]
then
printf 'RIVERCTL: rivertile already running with pid %s\n' "$(pidof rivertile)"
else
rivertile \
-view-padding 6 \
-outer-padding 6 \
-main-count 1 \
-main-ratio 0.5 >/dev/null 2>&1 &
fi
# autostart apps
# riverctl spawn "$HOME/.config/river/process"
riverctl spawn 'dunst'
riverctl spawn 'gammastep-indicator'
riverctl spawn 'nm-applet --indicator'
riverctl spawn 'waybar'
riverctl spawn "swayidle -w \
timeout 600 'swaylock -f -c 14171d' \
before-sleep 'swaylock -f -c 14171d'"

View file

@ -1,16 +0,0 @@
#!/usr/bin/env bash
dunst &
gammastep-indicator &
nm-applet --indicator &
waybar &
# void linux specific setup
# if test -f ~/.config/river/void-setup; then
# exec ~/.config/river/void-setup
# exit
# fi
exec swayidle -w \
timeout 600 'swaylock -f -c 14171d' \
before-sleep 'swaylock -f -c 14171d'