diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..048a105 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +nvim/plugin/packer_compiled.lua diff --git a/i3/config b/i3/config index 7df6cf9..00ad16c 100644 --- a/i3/config +++ b/i3/config @@ -44,6 +44,8 @@ bindsym $mod+7 workspace number $ws7 bindsym $mod+8 workspace number $ws8 bindsym $mod+9 workspace number $porn bindsym $mod+0 workspace number $social +bindsym $mod+ctrl+l workspace next +bindsym $mod+ctrl+h workspace prev # Move container to workspace keybinds bindsym $mod+Shift+1 move container to workspace number $terminal @@ -97,8 +99,8 @@ bindsym $mod+Shift+k move up bindsym $mod+Shift+l move right # Split orientation keybinds -bindsym $mod+ctrl+h split h -bindsym $mod+ctrl+v split v +bindsym $mod+ctrl+Shift+h split h +bindsym $mod+ctrl+Shift+v split v # Container layout keybinds bindsym $mod+s layout stacking @@ -156,8 +158,8 @@ assign [class="porn"] $porn # Border size -default_border pixel 3 -default_floating_border pixel 3 +default_border pixel 0 +default_floating_border pixel 0 @@ -173,4 +175,3 @@ client.urgent $urgent_color $urgent_color $urgent_color $urgent_color for_window [instance = "notes"] floating enable for_window [instance = "notes"] resize set 725 550 for_window [instance = "notes"] move scratchpad - diff --git a/nvim/init.lua b/nvim/init.lua index eb7bdfc..2c3f7e7 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -37,8 +37,9 @@ end -- MISC vim.cmd "colorscheme onedarker" -require("lualine").setup() - +require("lualine").setup { + theme = "palenight" +} -- AS require("autosave").setup({ @@ -48,3 +49,7 @@ require("autosave").setup({ -- Git signs require('gitsigns').setup() + +-- tabline +require("bufferline").setup{} +require('nvim-web-devicons').setup{} diff --git a/nvim/lua/kosh/keymaps.lua b/nvim/lua/kosh/keymaps.lua index 9b4f277..e2540e4 100644 --- a/nvim/lua/kosh/keymaps.lua +++ b/nvim/lua/kosh/keymaps.lua @@ -50,3 +50,7 @@ set_keymap("n", "<leader>zc", "zc", opts) set_keymap("n", "<leader>zC", "zM", opts) set_keymap("n", "<leader>za", "za", opts) set_keymap("n", "<leader>zA", "zA", opts) + +-- cmdline +set_keymap('n', ':', '<cmd>FineCmdline<CR>', opts) +set_keymap('n', '/', '<cmd>FineCmdline<CR>/', opts) diff --git a/nvim/lua/kosh/options.lua b/nvim/lua/kosh/options.lua index e9f9b39..f479263 100644 --- a/nvim/lua/kosh/options.lua +++ b/nvim/lua/kosh/options.lua @@ -12,10 +12,12 @@ vim.opt.expandtab = true -- Converts tabs to spaces vim.opt.cb = unnamedplus -- Clipboard vim.opt.mouse = "a" -- Mouse enable vim.opt.fileencoding = "utf-8" -- File encoding -vim.opt.showtabline = 2 -- The top tabs +vim.opt.showtabline = 0 -- The top tabs vim.opt.cursorline = true -- Underline vim.opt.termguicolors = true vim.opt.undofile = true -- UNLIMITED UNDOS!!! +vim.opt.ignorecase = true +vim.opt.smartcase = false -- Folds vim.opt.foldmethod = "expr" @@ -38,4 +40,3 @@ vim.cmd "set foldexpr=nvim_treesitter#foldexpr()" --]]) vim.opt.foldlevel = 0 - diff --git a/nvim/lua/kosh/plugins.lua b/nvim/lua/kosh/plugins.lua index 3a111b4..dedc11d 100644 --- a/nvim/lua/kosh/plugins.lua +++ b/nvim/lua/kosh/plugins.lua @@ -34,4 +34,14 @@ return require("packer").startup(function(use) }) use "lewis6991/gitsigns.nvim" + + use { + 'VonHeikemen/fine-cmdline.nvim', + requires = { + {'MunifTanjim/nui.nvim'} + } + } + + use {'akinsho/bufferline.nvim', tag = "*", requires = 'nvim-tree/nvim-web-devicons'} + use {"nvim-tree/nvim-web-devicons"} end) diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua index 18be958..8a9beb4 100644 --- a/nvim/plugin/packer_compiled.lua +++ b/nvim/plugin/packer_compiled.lua @@ -84,11 +84,21 @@ _G.packer_plugins = { path = "/home/kosh/.local/share/nvim/site/pack/packer/start/Onedarker.nvim", url = "https://github.com/LunarVim/Onedarker.nvim" }, + ["bufferline.nvim"] = { + loaded = true, + path = "/home/kosh/.local/share/nvim/site/pack/packer/start/bufferline.nvim", + url = "https://github.com/akinsho/bufferline.nvim" + }, ["coc.nvim"] = { loaded = true, path = "/home/kosh/.local/share/nvim/site/pack/packer/start/coc.nvim", url = "https://github.com/neoclide/coc.nvim" }, + ["fine-cmdline.nvim"] = { + loaded = true, + path = "/home/kosh/.local/share/nvim/site/pack/packer/start/fine-cmdline.nvim", + url = "https://github.com/VonHeikemen/fine-cmdline.nvim" + }, ["fold-preview.nvim"] = { loaded = true, path = "/home/kosh/.local/share/nvim/site/pack/packer/start/fold-preview.nvim", @@ -114,16 +124,20 @@ _G.packer_plugins = { path = "/home/kosh/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim", url = "https://github.com/iamcco/markdown-preview.nvim" }, + ["nui.nvim"] = { + loaded = true, + path = "/home/kosh/.local/share/nvim/site/pack/packer/start/nui.nvim", + url = "https://github.com/MunifTanjim/nui.nvim" + }, ["nvim-treesitter"] = { loaded = true, path = "/home/kosh/.local/share/nvim/site/pack/packer/start/nvim-treesitter", url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["nvim-web-devicons"] = { - loaded = false, - needs_bufread = false, - path = "/home/kosh/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons", - url = "https://github.com/kyazdani42/nvim-web-devicons" + loaded = true, + path = "/home/kosh/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + url = "https://github.com/nvim-tree/nvim-web-devicons" }, ["plenary.nvim"] = { loaded = true, diff --git a/picom/picom.conf b/picom/picom.conf index ad7081a..6f285f6 100644 --- a/picom/picom.conf +++ b/picom/picom.conf @@ -19,8 +19,10 @@ blur-background-exclude = [ "class_g = 'kitty'" ] +corner-radius = 50 + # Fading fading=true; -fade-in-step=0.03; -fade-out-step=0.03; +fade-in-step=0.01; +fade-out-step=0.01; fading-delta=1;