diff --git a/config/neovim/after/plugin/fidget.lua b/config/neovim/after/plugin/fidget.lua deleted file mode 100644 index 8f7deee..0000000 --- a/config/neovim/after/plugin/fidget.lua +++ /dev/null @@ -1,6 +0,0 @@ -local status_ok, fidget = pcall(require, "fidget") -if not status_ok then - return -end - -fidget.setup {} diff --git a/config/neovim/after/plugin/floaterm.lua b/config/neovim/after/plugin/floaterm.lua deleted file mode 100644 index 30d75dd..0000000 --- a/config/neovim/after/plugin/floaterm.lua +++ /dev/null @@ -1,4 +0,0 @@ -vim.g.floaterm_autoinsert = 1 -vim.g.floaterm_height = 0.8 -vim.g.floaterm_title = 0 -vim.g.floaterm_width = 0.8 diff --git a/config/neovim/after/plugin/git.lua b/config/neovim/after/plugin/git.lua deleted file mode 100644 index b2572e5..0000000 --- a/config/neovim/after/plugin/git.lua +++ /dev/null @@ -1,30 +0,0 @@ -local status_ok, neogit = pcall(require, "neogit") -if not status_ok then - return -end - -neogit.setup { - disable_commit_confirmation = true, -} - -local nmap = require("opdavies.keymap").nmap - -nmap { - "gc", - function() - neogit.open { "commit" } - end, -} -nmap { - "gl", - function() - neogit.open { "log" } - end, -} -nmap { - "gp", - function() - neogit.open { "push" } - end, -} -nmap { "gs", neogit.open } diff --git a/config/neovim/after/plugin/markdown-preview.lua b/config/neovim/after/plugin/markdown-preview.lua deleted file mode 100644 index d895e4b..0000000 --- a/config/neovim/after/plugin/markdown-preview.lua +++ /dev/null @@ -1 +0,0 @@ -vim.g.mkdp_refresh_slow = 1 diff --git a/config/neovim/after/plugin/nvim-lastplace.lua b/config/neovim/after/plugin/nvim-lastplace.lua deleted file mode 100644 index d54cafb..0000000 --- a/config/neovim/after/plugin/nvim-lastplace.lua +++ /dev/null @@ -1,6 +0,0 @@ -local has_lastplace, lastplace = pcall(require, "nvim-lastplace") -if not has_lastplace then - return -end - -lastplace.setup {} diff --git a/config/neovim/after/plugin/seiya.lua b/config/neovim/after/plugin/seiya.lua deleted file mode 100644 index 91ee4ab..0000000 --- a/config/neovim/after/plugin/seiya.lua +++ /dev/null @@ -1,3 +0,0 @@ --- vim.g.seiya_auto_enable = 1 - --- vim.g.seiya_target_groups = { "guibg" } diff --git a/config/neovim/after/plugin/statusline.lua b/config/neovim/after/plugin/statusline.lua deleted file mode 100644 index 65f4755..0000000 --- a/config/neovim/after/plugin/statusline.lua +++ /dev/null @@ -1,81 +0,0 @@ -local status_ok, el = pcall(require, "el") -if not status_ok then - return -end - -local builtin = require "el.builtin" -local diagnostic = require "el.diagnostic" -local extensions = require "el.extensions" -local lsp_statusline = require "el.plugins.lsp_status" -local sections = require "el.sections" -local subscribe = require "el.subscribe" - -local file_icon = subscribe.buf_autocmd("el_file_icon", "BufRead", function(_, buffer) - return extensions.file_icon(_, buffer) -end) - -local git_branch = subscribe.buf_autocmd("el_git_branch", "BufEnter", function(window, buffer) - local branch = extensions.git_branch(window, buffer) - if branch then - return " " .. extensions.git_icon() .. " " .. branch - end -end) - -local git_changes = subscribe.buf_autocmd("el_git_changes", "BufWritePost", function(window, buffer) - return extensions.git_changes(window, buffer) -end) - -local show_current_func = function(window, buffer) - if buffer.filetype == "lua" then - return "" - end - - return lsp_statusline.current_function(window, buffer) -end - -local diagnostic_display = diagnostic.make_buffer() - -el.setup { - generator = function(window, buffer) - local mode = extensions.gen_mode { format_string = " %s " } - - local items = { - { mode }, - { git_branch }, - { sections.split }, - { file_icon }, - { " " }, - { sections.maximum_width(builtin.make_responsive_file(140, 90), 0.40) }, - { sections.collapse_builtin { { " " }, { builtin.modified_flag } } }, - { sections.split }, - { diagnostic_display }, - { show_current_func }, - { git_changes }, - { "[" }, - { builtin.line_with_width(3) }, - { ":" }, - { builtin.column_with_width(2) }, - { "]" }, - { - sections.collapse_builtin { - "[", - builtin.help_list, - builtin.readonly_list, - "]", - }, - }, - { builtin.filetype }, - } - - local add_item = function(result, item) - table.insert(result, item) - end - - local result = {} - for _, item in ipairs(items) do - add_item(result, item) - end - - return result - end, -} diff --git a/config/neovim/after/plugin/terminal.vim b/config/neovim/after/plugin/terminal.vim deleted file mode 100644 index 557fc6b..0000000 --- a/config/neovim/after/plugin/terminal.vim +++ /dev/null @@ -1,9 +0,0 @@ -function! s:small_terminal() abort - new - wincmd J - call nvim_win_set_height(0, 12) - set winfixheight - term -endfunction - -nnoremap st :call small_terminal() diff --git a/config/neovim/after/plugin/twilight.lua b/config/neovim/after/plugin/twilight.lua deleted file mode 100644 index 2cdb09c..0000000 --- a/config/neovim/after/plugin/twilight.lua +++ /dev/null @@ -1,8 +0,0 @@ -local status_ok, twilight = pcall(require, "twilight") -if not status_ok then - return -end - -twilight.setup { - context = 2, -} diff --git a/config/neovim/after/plugin/zen-mode.lua b/config/neovim/after/plugin/zen-mode.lua deleted file mode 100644 index acd6d2e..0000000 --- a/config/neovim/after/plugin/zen-mode.lua +++ /dev/null @@ -1,25 +0,0 @@ -local status_ok, zen_mode = pcall(require, "zen-mode") -if not status_ok then - return -end - -zen_mode.setup { - window = { - backdrop = 0.95, - height = 1, - width = 80, - options = { - relativenumber = false, - number = false, - signcolumn = "no", - }, - }, - plugins = { - options = { - enabled = true, - ruler = false, - }, - gitsigns = { enabled = true }, - tmux = { enabled = true }, - }, -} diff --git a/system/nixos/home-manager-desktop.nix b/system/nixos/home-manager-desktop.nix index c0374de..eff26f3 100644 --- a/system/nixos/home-manager-desktop.nix +++ b/system/nixos/home-manager-desktop.nix @@ -217,15 +217,15 @@ }; font = { - size = 14.0; + size = 16.0; bold.style = "Regular"; bolditalic.style = "Regular"; italic.style = "Regular"; - normal.family = "JetBrainsMono Nerd Font Mono"; + normal.family = "IntoneMono Nerd Font Mono"; - offset.y = 14; - glyph_offset.y = 8; + offset.y = 12; + glyph_offset.y = 6; }; shell = { program = "zsh"; }; diff --git a/system/nixos/home-manager.nix b/system/nixos/home-manager.nix index 43d1364..d40ce2b 100644 --- a/system/nixos/home-manager.nix +++ b/system/nixos/home-manager.nix @@ -21,6 +21,7 @@ in pkgs.via pkgs.vial pkgs.vlc + pkgs.wl-mirror pkgs.wob pkgs.wofi pkgs.xcape diff --git a/system/shared/home-manager-packages.nix b/system/shared/home-manager-packages.nix index d486e09..8f05156 100644 --- a/system/shared/home-manager-packages.nix +++ b/system/shared/home-manager-packages.nix @@ -1,5 +1,4 @@ { inputs, pkgs, ... }: - with pkgs; [ awscli2 bottom diff --git a/system/shared/home-manager.nix b/system/shared/home-manager.nix index d257896..afb6094 100644 --- a/system/shared/home-manager.nix +++ b/system/shared/home-manager.nix @@ -2,6 +2,16 @@ let customVim = with self; { + toggle-checkbox-nvim = pkgs.vimUtils.buildVimPlugin { + name = "toggle-checkbox-nvim"; + src = pkgs.fetchFromGitHub { + owner = "opdavies"; + repo = "toggle-checkbox.nvim"; + rev = "main"; + sha256 = "1h9IGyMa80HWrtiPjruG4cYBqgTafNirW0Hwl/JO70A="; + }; + }; + vim-astro = pkgs.vimUtils.buildVimPlugin { name = "vim-astro"; src = pkgs.fetchFromGitHub { @@ -235,14 +245,29 @@ in exa -al } zle -N clear-ls-all - bindkey '^K' clear-ls-all clear-git-status() { clear git status -sb . } zle -N clear-git-status + + clear-tree-2() { + clear + tree -L 2 + } + zle -N clear-tree-2 + + clear-tree-3() { + clear + tree -L 3 + } + zle -N clear-tree-3 + bindkey '^G' clear-git-status + # bindkey '^H' clear-tree-3 + # bindkey '^J' clear-tree-2 + # bindkey '^K' clear-ls-all # auto-completes aliases # enables to define @@ -305,6 +330,14 @@ in ialias ls="exa -la" + # just + alias j="just" + alias jc="just composer" + alias jci="just composer install" + alias jcr="just composer require" + alias jd="just drush" + alias jt="just test" + # tmux alias ta="tmux attach" alias tl="tmux list-sessions" @@ -513,6 +546,14 @@ in customVim.vim-textobj-xmlattr customVim.vim-visual-star-search + { + plugin = customVim.toggle-checkbox-nvim; + type = "lua"; + config = '' + vim.keymap.set("n", "t", ":lua require('toggle-checkbox').toggle()") + ''; + } + vimPlugins.comment-nvim vimPlugins.dial-nvim vimPlugins.gitsigns-nvim