diff options
| -rw-r--r-- | config/nvim/init.lua | 33 | ||||
| -rw-r--r-- | config/waybar/config | 2 | ||||
| -rw-r--r-- | config/waybar/style.css | 3 | ||||
| -rw-r--r-- | flake.lock | 18 | ||||
| -rw-r--r-- | packages/dwl.nix | 2 |
5 files changed, 32 insertions, 26 deletions
diff --git a/config/nvim/init.lua b/config/nvim/init.lua index c520b56..81c0035 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -39,6 +39,8 @@ end vim.opt.rtp:prepend(lazypath) require('lazy').setup({ + 'stevearc/oil.nvim', + 'lukas-reineke/indent-blankline.nvim', 'windwp/nvim-autopairs', 'numToStr/Comment.nvim', @@ -46,22 +48,20 @@ require('lazy').setup({ 'romgrk/barbar.nvim', 'nvim-tree/nvim-web-devicons', - 'kvrohit/rasmus.nvim', - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/nvim-cmp', 'neovim/nvim-lspconfig', 'hrsh7th/cmp-nvim-lsp-signature-help', + 'hrsh7th/nvim-cmp', 'L3MON4D3/LuaSnip', + 'nvim-telescope/telescope.nvim', 'nvim-lua/plenary.nvim', - 'klen/nvim-config-local', - 'stevearc/oil.nvim', + 'klen/nvim-config-local', 'christoomey/vim-tmux-navigator', - 'vala-lang/vala.vim' + 'davidosomething/vim-colors-meh', }) require('config-local').setup { @@ -73,9 +73,6 @@ local oil = require('oil') _G.oil = oil oil.setup { default_file_explorer = true, - columns = { - 'icon' - }, view_options = { show_hidden = true } @@ -157,6 +154,9 @@ telescope.setup({ }, }) +--- Barbar +require('barbar').setup {} + -- Set Up Autopairs require('nvim-autopairs').setup({ map_cr = true }) @@ -191,22 +191,27 @@ vim.keymap.set('n', '<A-a>', '<cmd>lua oil.toggle_float()<cr>', { noremap = true vim.api.nvim_set_keymap('n', '<A-\\>', ':vsplit<CR>', { noremap = true }) vim.api.nvim_set_keymap('n', '<A-->', ':split<CR>', { noremap = true }) -require('barbar').setup {} - -vim.cmd.colorscheme('rasmus') +vim.cmd.colorscheme('meh') local map = vim.api.nvim_set_keymap local opts = { noremap = true, silent = true } --- Move to previous/next +--- Move to previous/next map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts) map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts) -- Re-order to previous/next map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts) map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts) --- Close buffer +--- Close buffer map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts) + +--[[ -- Re-order to previous/next +map('n', '<A-<>', '<Cmd>tabprev<CR>', opts) +map('n', '<A->>', '<Cmd>tabnext<CR>', opts) +-- Close tab +map('n', '<A-c>', '<Cmd>tabclose<CR>', opts) ]] + vim.api.nvim_create_augroup('AutoFormatting', {}) vim.api.nvim_create_autocmd('BufWritePre', { group = 'AutoFormatting', diff --git a/config/waybar/config b/config/waybar/config index b9461e5..2ba3212 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -20,7 +20,7 @@ }, "dwl/window": { - "format": "|> {title}", + "format": "{layout} {title}", "max-length": 50, "swap-icon-label": false }, diff --git a/config/waybar/style.css b/config/waybar/style.css index faceecd..2368810 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -42,7 +42,8 @@ window#waybar { background: #2f2f2f; } -#tags button.focused { +#tags button.focused, +#tags button.urgent { padding: 2px 12px; background: #9b9b9b; color: #212121; @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1753567913, - "narHash": "sha256-eYrqSRI1/mrnVGCGYO+zkKHUszwJQodq/qDHh+mzvkI=", + "lastModified": 1753943136, + "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2b73c2fcca690b6eca4f520179e54ae760f25d4e", + "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753585664, - "narHash": "sha256-kqQrn4RgckPYoI5ybYfKqAo8VFT5+9fDnGxvEXIfDhU=", + "lastModified": 1753949446, + "narHash": "sha256-ozXrkD8QxgZdnh2vS5qVTnXGcw4cgAPIfnvnsl2lgp4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e960a8fb5b96caafd1fe8e825811b8616feabaa4", + "rev": "f2b64412bdaeec13cdca354209a356d941478358", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { diff --git a/packages/dwl.nix b/packages/dwl.nix index c297de1..84147ec 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwl"; rev = "compromyse"; - hash = "sha256-AC9Na/NayE7Aaqe594JEWKdjIk4shvbmiClKVUwGJ6s="; + hash = "sha256-vjVkFEWV2PXHhJ85Zjpi8rRW7B7s/xGMP/JqQ9i2un4="; }; nativeBuildInputs = [ |