From da4fd96075b8c23aa9ed6d4b721483a5052264fa Mon Sep 17 00:00:00 2001 From: scbj Date: Thu, 21 Nov 2024 09:32:56 +0100 Subject: [PATCH] added some essential settings to nvim configuration --- README.md | 6 ++---- i3/.config/i3/config | 2 +- nvim/.config/nvim/init.lua | 2 ++ nvim/.config/nvim/lazy-lock.json | 2 +- nvim/.config/nvim/lua/zegonix/init.lua | 4 +++- nvim/.config/nvim/lua/zegonix/settings.lua | 18 ++++++++++++++++++ 6 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 nvim/.config/nvim/lua/zegonix/settings.lua diff --git a/README.md b/README.md index 73ba82b..5fd0c23 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,10 @@ A collection of configuration files meant to be used with GNU stow. ## Todos -* tmux -* configure 'pavucontrol' and 'blueman-manager' to use a dark theme -* configure screen locker -* configure lock screen (probably i3lock) * fzf * neovim +* configure screen locker +* configure lock screen (probably i3lock) ## Usage diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 69834f0..060c8c9 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -61,7 +61,7 @@ tiling_drag modifier titlebar # start a terminal bindsym $mod+Return exec alacritty - +bindsym $mod+t exec "alacritty -e tmux attach" # kill focused window bindsym $mod+Shift+q kill diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 55b8979..fd17164 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1 +1,3 @@ +require("zegonix") + require("config.lazy") diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 9ba4f84..c575082 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" } } diff --git a/nvim/.config/nvim/lua/zegonix/init.lua b/nvim/.config/nvim/lua/zegonix/init.lua index c1e1d09..7ba87e6 100644 --- a/nvim/.config/nvim/lua/zegonix/init.lua +++ b/nvim/.config/nvim/lua/zegonix/init.lua @@ -1 +1,3 @@ -require("zegonix.remap") +require("zegonix.keybindings") +require("zegonix.settings") + diff --git a/nvim/.config/nvim/lua/zegonix/settings.lua b/nvim/.config/nvim/lua/zegonix/settings.lua new file mode 100644 index 0000000..4aa02ab --- /dev/null +++ b/nvim/.config/nvim/lua/zegonix/settings.lua @@ -0,0 +1,18 @@ + +vim.opt.nu = true +vim.opt.relativenumber = true + +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 + +vim.opt.hlsearch = true +vim.opt.incsearch = true + +vim.opt.termguicolors = true + +vim.opt.scrolloff = 10 +vim.opt.signcolumn = "yes" +vim.opt.isfname:append("@-@") + +vim.opt.updatetime = 50