From 21ecd8c1d6295192fb3082c0bf0510776142010a Mon Sep 17 00:00:00 2001 From: tosu Date: Thu, 1 Feb 2024 00:22:43 +0100 Subject: [PATCH] Update scripts, nvim, etc. --- .bashrc | 44 +++++++++++++++++------- .config/alacritty/alacritty.toml | 2 +- .config/nvim/after/plugin/telescope.lua | 3 ++ .config/nvim/after/plugin/treesitter.lua | 8 +++++ .config/nvim/lua/tosu/remap.lua | 3 ++ .config/nvim/lua/tosu/set.lua | 3 +- .gitconfig | 1 + 7 files changed, 50 insertions(+), 14 deletions(-) diff --git a/.bashrc b/.bashrc index 7b9a66f..b4a0057 100644 --- a/.bashrc +++ b/.bashrc @@ -95,7 +95,7 @@ alias aptclean='sudo apt -y update && sudo apt -y full-upgrade && alias pacman='pacman --color=auto' alias pcker='nvim "${HOME-}"/.config/nvim/lua/*' alias after='nvim "${HOME-}"/.config/nvim/after/plugin' -alias l='\ls --width="${COLUMNS:-80}" --sort=time --time=mtime --time-style=long-iso -bharZ1l' +alias l='\ls --width="${COLUMNS:-80}" --sort=time --time=mtime --color=auto --time-style=long-iso -bharZ1l' # alias l='lsd --timesort --color=auto -harZ1l' alias ll='\ls --width="${COLUMNS:-80}" --sort=time --time=mtime --color=auto --fu -bharZ1l' alias ls='\ls --width="${COLUMNS:-80}" --color=auto -bC' @@ -136,6 +136,8 @@ function cd () { 1>/dev/null command cd - || return 1 1>/dev/null pushd "${pwd}" || return 1 } + +CDPATH="${CDPATH}:${HOME}" CDPATH="${CDPATH}:${HOME}/projects" CDPATH="${CDPATH}:${HOME}/projects/aoc" CDPATH="${CDPATH}:${HOME}/projects/aoc/2023" @@ -239,7 +241,7 @@ function norminette () { local newst vers="$($(type -P norminette) -v | cut -d" " -f2)" - newst='3.3.53' + newst='3.3.55' if [ ! "${vers-}" = "${newst-}" ] ; then printf "%s\n%b\n" "Norminette v${vers-} instead of v${newst-} detected."\ '\033[31mPlease up-/downgrade\033[m' @@ -494,29 +496,47 @@ aocload () { command cat <<- TEMPLATE >> './solution.py' #!/usr/bin/env python3 + print() + + import os import re import sys import math + import multiprocessing as mp + from copy import copy, deepcopy + from typing import Any import numpy as np + import more_itertools as miter from functools import cache, lru_cache, reduce + from collections import deque, defaultdict, Counter from itertools import ( repeat, cycle, combinations, combinations_with_replacement, permutations, tee, pairwise, zip_longest, islice, takewhile, filterfalse, starmap ) - from collections import deque, defaultdict, Counter e=enumerate - def pairs(iterable, filler=None): - a, b = tee(iterable) - next(b, None) - return islice(zip(a, b), None, None, 2)) + data = open(0).read().strip().splitlines() + R = len(data) + C = len(data[0]) + def parse_grid(data: list[str]) -> Any: + for r in range(R): + for c in range(C): + pass + def parse_lines(data: list[str]) -> Any: + for line in data: + line = line.split() + def parse_line(data: list[str]) -> Any: + return data[0].split() + # data = parse_line(data) + # data = parse_lines(data) + data = parse_grid(data) - data = open(0).read().strip() - lines = data.splitlines() - - for line in lines: - line = line.split() + t = 0 + for line in data: + n = 0 + t += n + print(t) TEMPLATE fi diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index b72fb7a..cdb1880 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -52,7 +52,7 @@ render_timer = false TERM = "xterm-256color" [font] -size = 11.0 +size = 12.0 [font.bold] family = "IosevkaTerm Nerd Font" diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua index a4d40b0..c3485dc 100644 --- a/.config/nvim/after/plugin/telescope.lua +++ b/.config/nvim/after/plugin/telescope.lua @@ -4,3 +4,6 @@ vim.keymap.set('n', '', builtin.git_files, {}) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep: ") }) end) +vim.keymap.set('n', 'pw', function() + builtin.grep_string({ search = vim.fn.expand("") }) +end) diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 18668df..26eb6a6 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -21,4 +21,12 @@ require 'nvim-treesitter.configs'.setup { -- Instead of true it can also be a list of languages additional_vim_regex_highlighting = false, }, + + incremental_selection = { + enable = true, + keymaps = { + node_incremental = "v", + node_decremental = "V", + }, + }, } diff --git a/.config/nvim/lua/tosu/remap.lua b/.config/nvim/lua/tosu/remap.lua index 4a66123..9b847e9 100644 --- a/.config/nvim/lua/tosu/remap.lua +++ b/.config/nvim/lua/tosu/remap.lua @@ -48,3 +48,6 @@ vim.keymap.set("n", "c", "mz:s/\\(^\\s*\\)\\(.*$\\)/\\1\\/* \\2 *\\//gC", "mz:s/\\/\\* \\(.*\\) \\*\\//\\1/g:noh`z") vim.keymap.set("v", "c", "mz:s/\\(^\\s*\\)\\(.*$\\)/\\1\\/* \\2 *\\//g:noh`z") vim.keymap.set("v", "C", "mz:s/\\/\\* \\(.*\\) \\*\\//\\1/g:noh`z") + +vim.fn.setreg("t", "m5`1v`2y`3v`4p`1v`2p`5") +vim.keymap.set("n", "", "m3yiwi m2`1bviwp`2viwp`2i`3") diff --git a/.config/nvim/lua/tosu/set.lua b/.config/nvim/lua/tosu/set.lua index 4081a51..16a2de4 100644 --- a/.config/nvim/lua/tosu/set.lua +++ b/.config/nvim/lua/tosu/set.lua @@ -27,7 +27,8 @@ vim.opt.incsearch = true vim.opt.termguicolors = true -vim.opt.scrolloff = 5 +-- vim.opt.scrolloff = 5 +vim.opt.scrolloff = 0 vim.opt.signcolumn = 'yes' vim.opt.isfname:append('@-@') diff --git a/.gitconfig b/.gitconfig index f41190e..820e860 100644 --- a/.gitconfig +++ b/.gitconfig @@ -15,6 +15,7 @@ conflictsstyle = diff3 [core] autocrlf = input + editor = nvim [alias] l = log s = status