diff options
21 files changed, 47 insertions, 157 deletions
diff --git a/.config/nvim/lua/plugins/alpha.lua b/.config/nvim/lua/plugins/alpha.lua deleted file mode 100644 index 17fc1b7..0000000 --- a/.config/nvim/lua/plugins/alpha.lua +++ /dev/null @@ -1,57 +0,0 @@ -return { - 'goolord/alpha-nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - cmd = 'Alpha', - config = function() - local alpha = require('alpha') - local dashboard = require('alpha.themes.dashboard') - - local function get_natural_day(day) - local suffix = 'th' - local day_mod = day % 10 - - if day_mod == 1 and day ~= 11 then - suffix = 'st' - elseif day_mod == 2 and day ~= 12 then - suffix = 'nd' - elseif day_mod == 3 and day ~= 13 then - suffix = 'rd' - end - - return tostring(day) .. suffix - end - - local date = os.date(' %A, %B ') .. get_natural_day(tonumber(os.date('%d'))) - local plugins = ' ' .. require('lazy').stats().count .. ' plugins ' - local v = vim.version() - local version = ' v' .. v.major .. '.' .. v.minor .. '.' .. v.patch - local info_line = date .. plugins .. version - - -- WARN: Just hardcoded the length of the first line in the header - local header_length = #' ' - local padding = (header_length - #info_line) / 2 - info_line = string.rep(' ', padding) .. info_line - - dashboard.section.header.val = { - [[ ]], - [[ ████ ██████ █████ ██ ██ ]], - [[ ███████████ █████ ███ ]], - [[ █████████ ███████████████████ ███ ███████████ ]], - [[ █████████ ███ █████████████ █████ ██████████████ ]], - [[ █████████ ██████████ █████████ █████ █████ ████ █████ ]], - [[ ███████████ ███ ███ █████████ █████ █████ ████ █████ ]], - [[ ██████ █████████████████████ ████ █████ █████ ████ ██████ ]], - [[ ]], - info_line, - } - - dashboard.section.buttons.opts.spacing = 0 - dashboard.section.buttons.val = { - dashboard.button('q', ' > Quit NVIM', '<cmd>qa<cr>'), - } - - dashboard.section.footer.val = require('alpha.fortune')() - - alpha.setup(dashboard.opts) - end, -} diff --git a/.config/nvim/lua/plugins/auto-save.lua b/.config/nvim/lua/plugins/auto-save.lua index 99ff70e..7c5578e 100644 --- a/.config/nvim/lua/plugins/auto-save.lua +++ b/.config/nvim/lua/plugins/auto-save.lua @@ -30,8 +30,11 @@ return { -- Might be unrelated tho -- Oil error is "cannot save, action already in progress" - -- Save only if the buffer is not a "special buffer" - return vim.fn.getbufvar(buf, '&buftype') == '' + local buftype = vim.fn.getbufvar(buf, '&buftype') + local filetype = vim.bo[buf].filetype + + -- Don't autosave special buffers or Oil buffers + return buftype == '' and filetype ~= 'oil' end, } end, diff --git a/.config/nvim/lua/plugins/auto-session.lua b/.config/nvim/lua/plugins/auto-session.lua index c7ba5f7..925893e 100644 --- a/.config/nvim/lua/plugins/auto-session.lua +++ b/.config/nvim/lua/plugins/auto-session.lua @@ -4,16 +4,5 @@ return { opts = { suppressed_dirs = { '~/', '/' }, session_lens = { load_on_setup = false }, - no_restore_cmds = { - function() - if vim.fn.argc() == 0 then - -- Snacks.dashboard() - -- vim.cmd('Alpha') - end - end, - }, - }, - keys = { - { '<C-s>', '<cmd>SessionSearch<cr>', desc = '[S]ession Manager' }, }, } diff --git a/.config/nvim/lua/plugins/buffer-manager.lua b/.config/nvim/lua/plugins/buffer-manager.lua deleted file mode 100644 index 6bce4b8..0000000 --- a/.config/nvim/lua/plugins/buffer-manager.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - 'j-morano/buffer_manager.nvim', - dependencies = { 'nvim-lua/plenary.nvim' }, - keys = { - { - '<leader>bl', - function() - require('buffer_manager.ui').toggle_quick_menu() - end, - desc = '[B]uffer [L]ist', - }, - }, -} diff --git a/.config/nvim/lua/plugins/colorful-menu.lua b/.config/nvim/lua/plugins/colorful-menu.lua index 71ef6b9..8df4ae0 100644 --- a/.config/nvim/lua/plugins/colorful-menu.lua +++ b/.config/nvim/lua/plugins/colorful-menu.lua @@ -1,12 +1,13 @@ return { - "xzbdmw/colorful-menu.nvim", + -- TODO: configure after carbonight is ready + 'xzbdmw/colorful-menu.nvim', config = function() -- You don't need to set these options. - require("colorful-menu").setup({ + require('colorful-menu').setup({ ls = { lua_ls = { -- Maybe you want to dim arguments a bit. - arguments_hl = "@comment", + arguments_hl = '@comment', }, gopls = { -- By default, we render variable/function's type in the right most side, @@ -31,16 +32,16 @@ return { ts_ls = { -- false means do not include any extra info, -- see https://github.com/xzbdmw/colorful-menu.nvim/issues/42 - extra_info_hl = "@comment", + extra_info_hl = '@comment', }, vtsls = { -- false means do not include any extra info, -- see https://github.com/xzbdmw/colorful-menu.nvim/issues/42 - extra_info_hl = "@comment", + extra_info_hl = '@comment', }, - ["rust-analyzer"] = { + ['rust-analyzer'] = { -- Such as (as Iterator), (use std::io). - extra_info_hl = "@comment", + extra_info_hl = '@comment', -- Similar to the same setting of gopls. align_type_to_right = true, -- See https://github.com/xzbdmw/colorful-menu.nvim/pull/36 @@ -48,11 +49,11 @@ return { }, clangd = { -- Such as "From <stdio.h>". - extra_info_hl = "@comment", + extra_info_hl = '@comment', -- Similar to the same setting of gopls. align_type_to_right = true, -- the hl group of leading dot of "•std::filesystem::permissions(..)" - import_dot_hl = "@comment", + import_dot_hl = '@comment', -- See https://github.com/xzbdmw/colorful-menu.nvim/pull/36 preserve_type_when_truncate = true, }, @@ -61,24 +62,24 @@ return { align_type_to_right = true, }, roslyn = { - extra_info_hl = "@comment", + extra_info_hl = '@comment', }, dartls = { - extra_info_hl = "@comment", + extra_info_hl = '@comment', }, -- The same applies to pyright/pylance basedpyright = { -- It is usually import path such as "os" - extra_info_hl = "@comment", + extra_info_hl = '@comment', }, -- If true, try to highlight "not supported" languages. fallback = true, -- this will be applied to label description for unsupport languages - fallback_extra_info_hl = "@comment", + fallback_extra_info_hl = '@comment', }, -- If the built-in logic fails to find a suitable highlight group for a label, -- this highlight is applied to the label. - fallback_highlight = "@variable", + fallback_highlight = '@variable', -- If provided, the plugin truncates the final displayed text to -- this width (measured in display cells). Any highlights that extend -- beyond the truncation point are ignored. When set to a float diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua index b78cd46..6356c95 100644 --- a/.config/nvim/lua/plugins/conform.lua +++ b/.config/nvim/lua/plugins/conform.lua @@ -6,7 +6,6 @@ return { { '<leader>ft', '<cmd>FormatToggle<cr>', desc = '[F]ormat [T]oggle Globally' }, { '<leader>fT', '<cmd>FormatToggle!<cr>', desc = '[F]ormat [T]oggle Locally' }, { '<leader>ff', '<cmd>Format<cr>', desc = '[F]ormat [F]ile' }, - { '<leader>f', '<cmd>Format<cr><esc>', desc = '[F]ormat', mode = 'v' }, -- FIX: doesn't work }, ---@module "conform" ---@type conform.setupOpts diff --git a/.config/nvim/lua/plugins/diffview.lua b/.config/nvim/lua/plugins/diffview.lua index 875e458..4e66edc 100644 --- a/.config/nvim/lua/plugins/diffview.lua +++ b/.config/nvim/lua/plugins/diffview.lua @@ -2,7 +2,7 @@ return { 'sindrets/diffview.nvim', cmd = { 'DiffviewOpen', 'DiffviewClose', 'DiffviewFileHistory' }, keys = { - { '<leader>gd', '<cmd>DiffviewOpen<cr>' }, + { '<leader>gD', '<cmd>DiffviewOpen<cr>' }, { '<leader>gl', '<cmd>DiffviewFileHistory<cr>' }, }, opts = function() diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua index 953cd80..ae9b2db 100644 --- a/.config/nvim/lua/plugins/gitsigns.lua +++ b/.config/nvim/lua/plugins/gitsigns.lua @@ -3,26 +3,12 @@ return { cmd = 'Gitsigns', -- INFO: Disabled lazy loading to see if the errors stop -- Not sure if it's an issue with lazy loading or just a gitsigns bug - lazy = false, + -- INFO: re-enabled to see if the errors stop + event = 'VeryLazy', config = function() require('gitsigns').setup() - local function stage_visual_chunk() - require('gitsigns').stage_hunk({ vim.fn.line('.'), vim.fn.line('v') }) - end - local function reset_visual_chunk() - require('gitsigns').reset_hunk({ vim.fn.line('.'), vim.fn.line('v') }) - end - - vim.keymap.set('n', '<leader>gD', '<cmd>Gitsigns toggle_deleted<cr>', { desc = '[G]it [D]eleted' }) - vim.keymap.set('n', '<leader>hp', '<cmd>Gitsigns preview_hunk<cr>', { desc = '[H]unk [P]review' }) - vim.keymap.set('n', '<leader>hs', '<cmd>Gitsigns stage_hunk<cr>', { desc = '[H]unk [S]tage' }) - vim.keymap.set('n', '<leader>hr', '<cmd>Gitsigns reset_hunk<cr>', { desc = '[H]unk [R]eset' }) - vim.keymap.set('v', '<leader>hs', stage_visual_chunk, { desc = '[H]unk [S]tage' }) - vim.keymap.set('v', '<leader>hr', reset_visual_chunk, { desc = '[H]unk [S]tage' }) - vim.keymap.set('n', '<leader>hS', '<cmd>Gitsigns stage_buffer<cr>', { desc = '[S]tage Buffer' }) - vim.keymap.set('n', '<leader>hR', '<cmd>Gitsigns reset_buffer<cr>', { desc = '[R]eset Buffer' }) - vim.keymap.set('n', '<leader>hu', '<cmd>Gitsigns undo_stage_hunk<cr>', { desc = '[H]unk [U]ndo' }) + vim.keymap.set('n', '<leader>gd', '<cmd>Gitsigns toggle_deleted<cr>', { desc = '[G]it [D]eleted' }) vim.keymap.set( 'n', '<leader>gB', diff --git a/.config/nvim/lua/plugins/markdown-toggle.lua b/.config/nvim/lua/plugins/markdown-toggle.lua index 816d8d3..2ce48dc 100644 --- a/.config/nvim/lua/plugins/markdown-toggle.lua +++ b/.config/nvim/lua/plugins/markdown-toggle.lua @@ -3,21 +3,21 @@ return { opts = {}, keys = { { - '<leader>tu', + '<leader>tl', -- toggle list function() require('markdown-toggle').list() end, mode = { 'n', 'x' }, }, { - '<leader>to', + '<leader>tn', -- toggle numbered list function() require('markdown-toggle').olist() end, mode = { 'n', 'x' }, }, { - '<leader>tm', + '<leader>tm', -- toggle checkbox (why the m??? I don't remember) function() require('markdown-toggle').checkbox() end, diff --git a/.config/nvim/lua/plugins/mini-ai.lua b/.config/nvim/lua/plugins/mini-ai.lua index e254c11..448b1ee 100644 --- a/.config/nvim/lua/plugins/mini-ai.lua +++ b/.config/nvim/lua/plugins/mini-ai.lua @@ -3,7 +3,6 @@ return { version = false, event = 'VeryLazy', dependencies = { 'nvim-treesitter/nvim-treesitter-textobjects' }, - enabled = true, opts = function() local ai = require('mini.ai') return { diff --git a/.config/nvim/lua/plugins/neocodeium.lua b/.config/nvim/lua/plugins/neocodeium.lua index b6eb3c0..8a84a93 100644 --- a/.config/nvim/lua/plugins/neocodeium.lua +++ b/.config/nvim/lua/plugins/neocodeium.lua @@ -1,9 +1,13 @@ return { + enabled = false, -- Don't want this 'monkoose/neocodeium', event = 'VeryLazy', config = function() local neocodeium = require('neocodeium') - neocodeium.setup() + neocodeium.setup({ + show_label = false, + silent = true, + }) vim.keymap.set('i', '<c-y>', neocodeium.accept) end, } diff --git a/.config/nvim/lua/plugins/nvim-lint.lua b/.config/nvim/lua/plugins/nvim-lint.lua index 4538bd3..fcfe317 100644 --- a/.config/nvim/lua/plugins/nvim-lint.lua +++ b/.config/nvim/lua/plugins/nvim-lint.lua @@ -6,10 +6,10 @@ return { lint.linters_by_ft = { -- c = { 'clangtidy' }, -- cpp = { 'clangtidy' }, - -- go = { 'golangcilint' }, + go = { 'golangcilint' }, -- python = { 'flake8' }, -- json = { 'jsonlint' }, - bash = { 'shellcheck' }, + -- bash = { 'shellcheck' }, } vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave', 'TextChanged', 'TextChangedI' }, { diff --git a/.config/nvim/lua/plugins/nvim-scrollbar.lua b/.config/nvim/lua/plugins/nvim-scrollbar.lua deleted file mode 100644 index f475ac7..0000000 --- a/.config/nvim/lua/plugins/nvim-scrollbar.lua +++ /dev/null @@ -1,29 +0,0 @@ -return { - 'petertriho/nvim-scrollbar', - event = 'VeryLazy', - opts = { - marks = { - Search = { - text = { '', '' }, - }, - Error = { - text = { '', '' }, - }, - Warn = { - text = { '', '' }, - }, - Info = { - text = { '', '' }, - }, - Hint = { - text = { '', '' }, - }, - Misc = { - text = { '', '' }, - }, - }, - handlers = { - cursor = false, - }, - }, -} diff --git a/.config/nvim/lua/plugins/rustaceanvim.lua b/.config/nvim/lua/plugins/rustaceanvim.lua index 59f1717..5f2f6ff 100644 --- a/.config/nvim/lua/plugins/rustaceanvim.lua +++ b/.config/nvim/lua/plugins/rustaceanvim.lua @@ -1,4 +1,5 @@ return { + enabled = false, -- I don't do rust 'mrcjkb/rustaceanvim', version = '^5', lazy = false, -- already lazy diff --git a/.config/nvim/lua/plugins/tiny-inline-diagnostic.lua b/.config/nvim/lua/plugins/tiny-inline-diagnostic.lua index 620f20f..f054938 100644 --- a/.config/nvim/lua/plugins/tiny-inline-diagnostic.lua +++ b/.config/nvim/lua/plugins/tiny-inline-diagnostic.lua @@ -14,7 +14,7 @@ return { -- If multiple diagnostics are under the cursor, display all of them. multiple_diag_under_cursor = true, - --- Enable it if you want to always have message with `after` characters length. + -- Enable it if you want to always have message with `after` characters length. break_line = { enabled = false, after = 30, diff --git a/.config/nvim/lua/plugins/vim-table-mode.lua b/.config/nvim/lua/plugins/vim-table-mode.lua index bcc3757..10f6834 100644 --- a/.config/nvim/lua/plugins/vim-table-mode.lua +++ b/.config/nvim/lua/plugins/vim-table-mode.lua @@ -1,6 +1,6 @@ return { + enabled = false, 'dhruvasagar/vim-table-mode', ft = 'markdown', event = 'VeryLazy', - enabled = false, } diff --git a/.config/nvim/lua/plugins/workspace-diagnostics.lua b/.config/nvim/lua/plugins/workspace-diagnostics.lua index 4275280..d87373c 100644 --- a/.config/nvim/lua/plugins/workspace-diagnostics.lua +++ b/.config/nvim/lua/plugins/workspace-diagnostics.lua @@ -1,3 +1,4 @@ return { 'artemave/workspace-diagnostics.nvim', + -- Golang only (need to be added per lsp indivudally) } diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 079160c..e6d6272 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -71,6 +71,8 @@ wayland libxkbcommon libGL + + noto-fonts ]; # Enable sound with pipewire. @@ -82,11 +84,11 @@ alsa.support32Bit = true; pulse.enable = true; # If you want to use JACK applications, uncomment this - #jack.enable = true; + jack.enable = true; # use the example session manager (no others are packaged yet so this is enabled by default, # no need to redefine it in your config for now) - #media-session.enable = true; + # media-session.enable = true; }; # ENable CUPS daemon for printing diff --git a/modules/apps.nix b/modules/apps.nix index 45ad748..bc5e767 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -37,6 +37,7 @@ piper # ^ GUI frontend # Utility + obs-studio gimp inkscape keepassxc @@ -45,6 +46,7 @@ pypkgs.matplotlib pypkgs.pandas pypkgs.pygithub + pypkgs.pipx ])) kdePackages.filelight kdePackages.korganizer diff --git a/modules/development.nix b/modules/development.nix index 99babe1..dad0abb 100644 --- a/modules/development.nix +++ b/modules/development.nix @@ -67,6 +67,8 @@ gosec devtoolbox busybox # A bunch of utils like lsof and fuser + cmake + libllvm prometheus grafana-loki diff --git a/scripts/tmux-session-setup b/scripts/tmux-session-setup index d1391de..b9e54d3 100755 --- a/scripts/tmux-session-setup +++ b/scripts/tmux-session-setup @@ -13,7 +13,7 @@ if [ "$dir" = "$HOME" ]; then tmux new-window -t $sess -n "grimoire" -c $HOME/personal/grimoire/ tmux send-keys -t $sess:"grimoire".1 "vim" C-m tmux select-window -t $sess:main -elif [[ "$sess" == "ratry" || "$sess" == "kiwen-prototype" || "$sess" == "hackathon" ]]; then +elif [[ "$sess" == "ratry" || "$sess" == "kiwen-prototype" || "$sess" == "cpu-vs-ai" ]]; then tmux rename-window -t $sess:1 editor tmux send-keys -t $sess:editor.1 "nix develop" C-m tmux send-keys -t $sess:editor.1 "zsh && exit" C-m |