From f26d34ff5882b9140fb58e68534b8a9918ce61db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Tue, 7 Nov 2023 23:00:14 +0100 Subject: [PATCH] tune up astronvim --- ansible/roles/packages/tasks/debian.yml | 2 +- ansible/roles/packages/tasks/main.yml | 17 ++--- ansible/roles/packages/tasks/rhel.yaml | 7 +- ansible/roles/packages/tasks/rust.yml | 16 ++--- astrovim/init.lua | 88 ++++++++++++++++++++++--- gitconfig | 4 +- kitty/kitty.conf | 4 +- 7 files changed, 106 insertions(+), 32 deletions(-) diff --git a/ansible/roles/packages/tasks/debian.yml b/ansible/roles/packages/tasks/debian.yml index b3e7b3c..eaf1eee 100644 --- a/ansible/roles/packages/tasks/debian.yml +++ b/ansible/roles/packages/tasks/debian.yml @@ -1,5 +1,5 @@ - name: Install Debian packages - package: + ansible.builtin.package: name: - qalculate-gtk - rofi-dev diff --git a/ansible/roles/packages/tasks/main.yml b/ansible/roles/packages/tasks/main.yml index 76234ac..596fafb 100644 --- a/ansible/roles/packages/tasks/main.yml +++ b/ansible/roles/packages/tasks/main.yml @@ -1,5 +1,5 @@ - name: Install os-agnostic packages - become: yes + become: true ansible.builtin.package: name: - git @@ -12,22 +12,23 @@ state: present - name: Install Debian packages - become: yes + become: true when: ansible_os_family == "Debian" - import_tasks: debian.yml + ansible.builtin.import_tasks: debian.yml - name: Install RHEL packages - become: yes + become: true when: ansible_os_family in ["RedHat", "Nobara"] - import_tasks: rhel.yaml + ansible.builtin.import_tasks: rhel.yaml + tags: + - rhel - name: Install Rust packages - import_tasks: rust.yml + ansible.builtin.import_tasks: rust.yml tags: - rust - name: Install Python packages - import_tasks: python.yml + ansible.builtin.import_tasks: python.yml tags: - python - diff --git a/ansible/roles/packages/tasks/rhel.yaml b/ansible/roles/packages/tasks/rhel.yaml index 275d0e3..ce2a288 100644 --- a/ansible/roles/packages/tasks/rhel.yaml +++ b/ansible/roles/packages/tasks/rhel.yaml @@ -1,12 +1,13 @@ --- - name: Install RHEL packages - package: - name: + ansible.builtin.package: + name: - rofi-devel - qalculate - automake - libtool - cheat - gcc-c++ + - neovim + - python3-neovim state: present - diff --git a/ansible/roles/packages/tasks/rust.yml b/ansible/roles/packages/tasks/rust.yml index a77f059..00cac03 100644 --- a/ansible/roles/packages/tasks/rust.yml +++ b/ansible/roles/packages/tasks/rust.yml @@ -1,25 +1,25 @@ --- # rust install, shamelessly stolen from https://waylonwalker.com/install-rust/ - name: Check if cargo is installed - shell: ls ~/.cargo + ansible.builtin.command: ls ~/.cargo register: cargo_exists - ignore_errors: yes + ignore_errors: true - name: Download rust installer when: cargo_exists is failed - get_url: + ansible.builtin.get_url: url: https://sh.rustup.rs dest: /tmp/sh.rustup.rs - mode: '0755' - force: 'yes' + mode: "0755" + force: "yes" - name: Install rust and cargo when: cargo_exists is failed - shell: /tmp/sh.rustup.rs -y - + ansible.builtin.command: /tmp/sh.rustup.rs -y + - name: Install cargo packages community.general.cargo: - name: + name: - git-delta - dotter - bottom diff --git a/astrovim/init.lua b/astrovim/init.lua index d5fe9f9..1f336a4 100644 --- a/astrovim/init.lua +++ b/astrovim/init.lua @@ -24,11 +24,82 @@ return { plugins = { { - "catppuccin/nvim", - as = "catppuccin", - config = function() - require("catppuccin").setup {} - end, + "AstroNvim/astrocommunity", + + { import = "astrocommunity.colorscheme.catppuccin" }, + { + "catppuccin", + opts = { + integrations = { + sandwich = false, + noice = true, + mini = true, + leap = true, + markdown = true, + neotest = true, + cmp = true, + overseer = true, + lsp_trouble = true, + rainbow_delimiters = true, + }, + }, + }, + + { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" }, + + { + "m4xshen/smartcolumn.nvim", + opts = { + colorcolumn = 120, + disabled_filetypes = { "help" }, + }, + }, + { + "lewis6991/gitsigns.nvim", + }, + + + { import = "astrocommunity.editing-support.auto-save-nvim" }, + { import = "astrocommunity.editing-support.nvim-devdocs" }, + + { import = "astrocommunity.diagnostics.lsp_lines-nvim" }, + + { import = "astrocommunity.debugging.nvim-bqf" }, + + { import = "astrocommunity.code-runner.compiler-nvim" }, + + { import = "astrocommunity.bars-and-lines.vim-illuminate" }, + { import = "astrocommunity.bars-and-lines.lualine-nvim" }, + + { import = "astrocommunity.git.blame-nvim" }, + + { import = "astrocommunity.indent.indent-blankline-nvim" }, + { import = "astrocommunity.indent.mini-indentscope" }, + + { import = "astrocommunity.lsp.lsp-signature-nvim" }, + + { import = "astrocommunity.markdown-and-latex.glow-nvim" }, + + { import = "astrocommunity.pack.ansible" }, + { import = "astrocommunity.pack.bash" }, + { import = "astrocommunity.pack.docker" }, + --{ import = "astrocommunity.pack.go" }, + --{ import = "astrocommunity.pack.html-css" }, + { import = "astrocommunity.pack.json" }, + { import = "astrocommunity.pack.lua" }, + { import = "astrocommunity.pack.markdown" }, + --{ import = "astrocommunity.pack.nix" }, + { import = "astrocommunity.pack.python-ruff" }, + { import = "astrocommunity.pack.terraform" }, + { import = "astrocommunity.pack.toml" }, + { import = "astrocommunity.pack.yaml" }, + + { import = "astrocommunity.scrolling.cinnamon-nvim" }, + + { import = "astrocommunity.split-and-window.minimap-vim" }, + + { import = "astrocommunity.workflow.hardtime-nvim" }, + }, }, options = { @@ -38,11 +109,12 @@ return { list = true, listchars = { tab = "│→", extends = "⟩", precedes = "⟨", trail = "·", nbsp = "␣" }, showbreak = "↪ ", - showtabline = 1, wrap = true, + laststatus = 3, + splitkeep = "screen", }, g = { - icons_enabled = false, + icons_enabled = true, mapleader = " ", autoformat_enabled = true, cmp_enabled = true, @@ -50,6 +122,6 @@ return { diagnostics_enabled = true, status_diagnostics_enabled = true, }, + }, } -} diff --git a/gitconfig b/gitconfig index d96ddc1..59c406f 100644 --- a/gitconfig +++ b/gitconfig @@ -4,11 +4,9 @@ [interactive] diffFilter = delta --color-only - [delta] navigate = true light = false - [merge] conflictstyle = diff3 [diff] @@ -18,3 +16,5 @@ gpgsign = true [push] autoSetupRemote = true +[init] + defaultBranch = main diff --git a/kitty/kitty.conf b/kitty/kitty.conf index a0d0443..f7ec5b5 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -73,16 +73,16 @@ color7 #B5BFE2 color15 #A5ADCE ### misc - clipboard_control write-clipboard write-primary read-clipboard-ask read-primary-ask allow_hyperlinks yes shell_integration enabled wayland_titlebar_color system background_opacity 0.8 font_size 17.0 +tab_bar_style powerline # maps - map ctrl+c copy_or_interrupt map ctrl+shift+enter new_tab map ctrl+shift+n new_window +map ctrl+shift+backspace close_tab