diff options
27 files changed, 300 insertions, 428 deletions
diff --git a/.config/i3/config b/.config/i3/config index ad583df..c4492e6 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -1,44 +1,35 @@ -font pango:Mononoki Nerd Font Mono 10 + + +set $mod Mod4 +set $left h +set $down j +set $up k +set $right l + +font pango:JetBrainsMono Nerd Font 9 exec --no-startup-id dex --autostart --environment i3 +exec --no-startup-id setxkbmap -option caps:super exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork exec --no-startup-id nm-applet - -exec xrandr --output DVI-D-0 --auto --right-of HDMI-A-0 -exec setxkbmap -option "caps:super" -exec nitrogen --restore -exec kitty --hold sh -c "sudo pacman -Syu" -exec xbanish -t1 +exec_always --no-startup-id ~/.config/i3/polybar.sh set $refresh_i3status killall -SIGUSR1 i3status -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +2% && $refresh_i3status -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -2% && $refresh_i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status -bindsym XF86AudioPause exec --no-startup-id playerctl play-pause && $refresh_i3status -bindsym XF86AudioNext exec --no-startup-id playerctl next && $refresh_i3status -bindsym XF86AudioPrev exec --no-startup-id playerctl previous && $refresh_i3status - -set $up k -set $down j -set $left h -set $right l -set $mod Mod4 +bindsym Print exec --no-startup-id flameshot gui floating_modifier $mod -smart_borders on tiling_drag modifier titlebar -bindsym $mod+Return exec kitty - -bindsym Print exec flameshot gui -bindsym $mod+u exec setxkbmap us -bindsym $mod+n exec setxkbmap nl +bindsym $mod+Return exec i3-sensible-terminal bindsym $mod+Shift+q kill -bindsym $mod+d exec --no-startup-id rofi -show drun -show-icons +bindsym $mod+d exec --no-startup-id dmenu_run bindsym $mod+$left focus left bindsym $mod+$down focus down @@ -66,9 +57,6 @@ bindsym $mod+space focus mode_toggle bindsym $mod+a focus parent -bindsym $mod+Shift+minus move scratchpad - -bindsym $mod+minus scratchpad show set $ws1 "1" set $ws2 "2" @@ -92,9 +80,7 @@ bindsym $mod+8 workspace number $ws8 bindsym $mod+9 workspace number $ws9 bindsym $mod+0 workspace number $ws10 -bindsym $mod+i workspace number $ws1 -bindsym $mod+t workspace number $ws2 -bindsym $mod+o workspace number $ws3 +bindsym $mod+c workspace number $ws8 bindsym $mod+z workspace number $ws9 bindsym $mod+x workspace number $ws10 @@ -109,24 +95,19 @@ bindsym $mod+Shift+8 move container to workspace number $ws8 bindsym $mod+Shift+9 move container to workspace number $ws9 bindsym $mod+Shift+0 move container to workspace number $ws10 -bindsym $mod+Shift+i move container to workspace number $ws1 -bindsym $mod+Shift+t move container to workspace number $ws2 -bindsym $mod+Shift+o move container to workspace number $ws3 +bindsym $mod+Shift+c move container to workspace number $ws8 bindsym $mod+Shift+z move container to workspace number $ws9 bindsym $mod+Shift+x move container to workspace number $ws10 -bindsym $mod+Ctrl+l move workspace to output right -bindsym $mod+Ctrl+h move workspace to output left - -bindsym $mod+Shift+c reload +bindsym $mod+Shift+t reload bindsym $mod+Shift+r restart bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" mode "resize" { - bindsym $left resize shrink width 10 px or 10 ppt - bindsym $down resize grow height 10 px or 10 ppt - bindsym $up resize shrink height 10 px or 10 ppt - bindsym $right resize grow width 10 px or 10 ppt + bindsym $left resize shrink width 10 px or 10 ppt + bindsym $up resize grow height 10 px or 10 ppt + bindsym $down resize shrink height 10 px or 10 ppt + bindsym $right resize grow width 10 px or 10 ppt bindsym Return mode "default" bindsym Escape mode "default" @@ -134,20 +115,3 @@ mode "resize" { } bindsym $mod+r mode "resize" - -set $yellow #ffd866 -set $dyellow #f48f3d -set $gray #333333 -set $lgray #888888 -set $black #000000 -set $white #ffffff - -client.focused $yellow $yellow $black #2e9ef4 $dyellow -client.focused_inactive $dyellow $dyellow $black #484e50 $gray -client.unfocused $gray $gray $lgray #292d2e $gray -client.urgent #2f343a #900000 #ffffff #900000 #900000 -client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c - -client.background #ffffff - -exec_always --no-startup-id $HOME/.config/polybar/launch.sh diff --git a/.config/i3/polybar.sh b/.config/i3/polybar.sh new file mode 100644 index 0000000..22d2fbc --- /dev/null +++ b/.config/i3/polybar.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +# Terminate already running bar instances +killall -q polybar + +# Wait until the processes have been shut down +while pgrep -x polybar >/dev/null; do sleep 1; done + +# Launch polybar +polybar & diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf deleted file mode 100644 index 2b7975d..0000000 --- a/.config/kitty/current-theme.conf +++ /dev/null @@ -1,21 +0,0 @@ -background #262626 -foreground #ffffff -cursor #f6f6ec -selection_background #343434 -color0 #191919 -color8 #615e4b -color1 #f3005f -color9 #f3005f -color2 #97e023 -color10 #97e023 -color3 #fa8419 -color11 #dfd561 -color4 #9c64fe -color12 #9c64fe -color5 #f3005f -color13 #f3005f -color6 #57d1ea -color14 #57d1ea -color7 #c4c4b5 -color15 #f6f6ee -selection_foreground #191919 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 463ce0f..2fb8e29 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1,10 +1,9 @@ -# BEGIN_KITTY_THEME -# Monokai Soda -include current-theme.conf -# END_KITTY_THEME +font_family JetBrainsMono Nerd Font +bold_font auto +italic_font auto +bold_italic_font auto -font_family Mononoki Nerd Font -font_size 14 +font_size 11.0 cursor_shape block cursor_blink_interval 0 diff --git a/.config/kitty/kitty.conf.bak b/.config/kitty/kitty.conf.bak deleted file mode 100644 index 711ade2..0000000 --- a/.config/kitty/kitty.conf.bak +++ /dev/null @@ -1,4 +0,0 @@ -# BEGIN_KITTY_THEME -# zenbones_dark -include current-theme.conf -# END_KITTY_THEME
\ No newline at end of file diff --git a/.config/nvim/.luarc.json b/.config/nvim/.luarc.json deleted file mode 100644 index f979d50..0000000 --- a/.config/nvim/.luarc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "diagnostics.globals": [ - "vim" - ] -} diff --git a/.config/nvim/colors/mine.vim b/.config/nvim/colors/mine.vim new file mode 100644 index 0000000..d66ae06 --- /dev/null +++ b/.config/nvim/colors/mine.vim @@ -0,0 +1,53 @@ +set background=dark + +hi clear +let g:colors_name = "mine" + +hi! link Terminal Normal +hi! link CurSearch Search +hi! link CursorLineFold CursorLine +hi! link CursorLineSign CursorLine +hi! link MessageWindow Pmenu +hi! link PopupNotification Todo +hi! link Character String + +hi ColorColumn guifg=#ffffff guibg=#333333 gui=NONE +hi CursorLine guifg=NONE guibg=#2b2b2b gui=NONE +hi EndOfBuffer guifg=bg guibg=NONE gui=NONE +hi SignColumn guifg=NONE guibg=#222222 gui=NONE +hi LineNr guifg=#666666 guibg=#101010 gui=NONE +hi LineNrAbove guifg=#666666 guibg=#191919 gui=NONE +hi LineNrBelow guifg=#666666 guibg=#191919 gui=NONE +hi MatchParen guifg=#ffffff guibg=#990000 gui=bold +hi Normal guifg=#ffffff guibg=#222222 gui=NONE +hi Pmenu guifg=#ffffff guibg=#333333 gui=NONE +hi PmenuSel guifg=#333333 guibg=#ffffff gui=bold,underdouble +hi Search guifg=#333333 guibg=#ffff88 gui=bold,italic +hi Visual guifg=NONE guibg=#333333 gui=NONE + +hi Comment guifg=#777777 guibg=NONE gui=italic + +hi Constant guifg=#99ff99 guibg=NONE gui=NONE +hi Number guifg=#55bb55 guibg=NONE gui=NONE +hi String guifg=#ff99ff guibg=NONE gui=italic +hi Boolean guifg=#99ff99 guibg=NONE gui=italic + +hi Identifier guifg=#ffdd80 guibg=NONE gui=NONE +hi Function guifg=#99ffff guibg=NONE gui=italic + +hi Statement guifg=#ff7099 guibg=NONE gui=NONE +hi Label guifg=#ff7099 guibg=NONE gui=italic +hi Operator guifg=#ffffff guibg=NONE gui=NONE + +hi PreProc guifg=#ff9977 guibg=NONE gui=NONE + +hi Type guifg=#9999ff guibg=NONE gui=italic +hi StorageClass guifg=#99ffff guibg=NONE gui=italic +hi Structure guifg=#99ffff guibg=NONE gui=italic + +hi Special guifg=#ff9977 guibg=NONE gui=italic +hi SpecialChar guifg=#ffffff guibg=NONE gui=bold,italic + +hi Error guifg=#ff4444 guibg=NONE gui=bold,undercurl + +hi Todo guifg=#ffffff guibg=NONE gui=bold,italic,underline diff --git a/.config/nvim/ftplugin/cs.lua b/.config/nvim/ftplugin/cs.lua deleted file mode 100644 index 5031865..0000000 --- a/.config/nvim/ftplugin/cs.lua +++ /dev/null @@ -1,4 +0,0 @@ -local tabwidth = 4 -vim.opt.shiftwidth = tabwidth -vim.opt.softtabstop = tabwidth -vim.opt.tabstop = tabwidth diff --git a/.config/nvim/ftplugin/gdscript.lua b/.config/nvim/ftplugin/gdscript.lua deleted file mode 100644 index a021dba..0000000 --- a/.config/nvim/ftplugin/gdscript.lua +++ /dev/null @@ -1,5 +0,0 @@ -local tabwidth = 4 -vim.opt.expandtab = false -vim.opt.shiftwidth = tabwidth -vim.opt.softtabstop = tabwidth -vim.opt.tabstop = tabwidth diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 8c50ea1..7d4a97f 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,7 +1,3 @@ -local packer_path = vim.fn.stdpath("config") .. "/site" -vim.o.packpath = vim.o.packpath .. ',' .. packer_path -vim.g.mapleader = " " - -require("plugin") -require("set") +require("opt") require("map") +require("plugin") diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua index 3103f56..ef97bd1 100644 --- a/.config/nvim/lua/map.lua +++ b/.config/nvim/lua/map.lua @@ -1,34 +1,77 @@ -vim.keymap.set("i", "jk", "<escape>", {}) -vim.keymap.set("n", "<leader>n", [[:NvimTreeToggle<CR>]], {}) -vim.keymap.set("n", "<leader>g", [[:Git<CR>]], {}) -vim.keymap.set("n", "<leader>c", [[:noh<CR>]], {}) -vim.keymap.set("n", "<leader>e", [[:TroubleToggle<CR>]]) +vim.g.mapleader = " " -vim.keymap.set("n", "<C-h>", "<C-w>h", {}) -vim.keymap.set("n", "<C-j>", "<C-w>j", {}) -vim.keymap.set("n", "<C-k>", "<C-w>k", {}) -vim.keymap.set("n", "<C-l>", "<C-w>l", {}) +local nv = {"n", "v"} -vim.keymap.set("n", "<C-u>", "u", {}) -vim.keymap.set("n", "u", "", {}) +local function definepairs(replacement, char) + vim.keymap.set("o", "i" .. replacement, "i" .. char, {}) + vim.keymap.set("o", "a" .. replacement, "a" .. char, {}) +end -vim.keymap.set({ "n", "v" }, "<leader>b", "^", {}) -vim.keymap.set({ "n", "v" }, "<leader>w", "$", {}) -vim.keymap.set({ "n", "v" }, "^", "", {}) -vim.keymap.set({ "n", "v" }, "$", "", {}) +definepairs("b", "(") +definepairs("s", "\"") +definepairs("q", "'") +definepairs("t", "{") +definepairs("r", "[") +definepairs("a", "<") -vim.keymap.set({ "v", "n" }, ".", "<C-u>zz", {}) -vim.keymap.set({ "v", "n" }, ",", "<C-d>zz", {}) +vim.keymap.set(nv, "gm", "gM", {}) +vim.keymap.set(nv, "gM", "gMi", {}) -vim.keymap.set("o", "as", "a\"", {}) -vim.keymap.set("o", "is", "i\"", {}) -vim.keymap.set("o", "it", "i[", {}) -vim.keymap.set("o", "at", "a[", {}) -vim.keymap.set("o", "ic", "i<", {}) -vim.keymap.set("o", "ac", "a<", {}) +-- Moving between windows +vim.keymap.set(nv, "<C-h>", "<C-w>h", {}) +vim.keymap.set(nv, "<C-j>", "<C-w>j", {}) +vim.keymap.set(nv, "<C-k>", "<C-w>k", {}) +vim.keymap.set(nv, "<C-l>", "<C-w>l", {}) -vim.keymap.set({ "n", "v" }, "<leader>y", "\"+y", {}) -vim.keymap.set({ "n", "v" }, "<leader>v", "\"_", {}) +-- Same, but for terminal +vim.keymap.set("t", "<C-h>", "<C-\\><C-n><C-w>h", {}) +vim.keymap.set("t", "<C-j>", "<C-\\><C-n><C-w>j", {}) +vim.keymap.set("t", "<C-k>", "<C-\\><C-n><C-w>k", {}) +vim.keymap.set("t", "<C-l>", "<C-\\><C-n><C-w>l", {}) -vim.keymap.set("n", "<up>", "<nop>", { noremap = true }) -vim.keymap.set("n", "<down>", "<nop>", { noremap = true }) +-- Moving windows +vim.keymap.set(nv, "<C-w>h", "<C-w>H", {}) +vim.keymap.set(nv, "<C-w>j", "<C-w>J", {}) +vim.keymap.set(nv, "<C-w>k", "<C-w>K", {}) +vim.keymap.set(nv, "<C-w>l", "<C-w>L", {}) + +-- Resizing windows +vim.keymap.set(nv, "<C-->", "<C-w>-", {}) +vim.keymap.set(nv, "<C-=>", "<C-w>+", {}) +vim.keymap.set(nv, "<C-,>", "<C-w><", {}) +vim.keymap.set(nv, "<C-.>", "<C-w>>", {}) + +-- Make exiting insert mode in terminal mode easier +vim.keymap.set("t", "<ESC>", "<C-\\><C-n>", {}) + +-- Center when moving around at high speeds +vim.keymap.set(nv, "<C-u>", "<C-u>zz", {}) +vim.keymap.set(nv, "<C-d>", "<C-d>zz", {}) +vim.keymap.set(nv, "G", "Gzz", {}) + +-- Delete line content. I didn't do ddO because that would extend comments if +-- you were just above one. +vim.keymap.set("n", "dc", "cc<ESC>", {}) + +-- Make going to the end of a line as easy as going to the beginning +vim.keymap.set({"n", "v", "o"}, "+", "$", {}) + +-- Allow yanking to system clipboard +vim.keymap.set(nv, "<leader>y", "\"+y", {}) +vim.keymap.set(nv, "<leader>p", "\"+p", {}) + +-- Commands +vim.keymap.set(nv, "<leader>c", "<CMD>noh<CR>", {silent=true}) +vim.keymap.set(nv, "<leader>e", "<CMD>Ex<CR>", {silent=true}) +vim.keymap.set(nv, "<leader>t", function() + vim.cmd("split") + vim.cmd("term") +end, {silent=true}) + +-- Common typo with me +vim.api.nvim_create_user_command("W", "w", {bang=true}) +vim.api.nvim_create_user_command("Wa", "wa", {bang=true}) +vim.api.nvim_create_user_command("Wq", "wq", {bang=true}) +vim.api.nvim_create_user_command("Wqa", "wqa", {bang=true}) +vim.api.nvim_create_user_command("Q", "q", {bang=true}) +vim.api.nvim_create_user_command("Qa", "qa", {bang=true}) diff --git a/.config/nvim/lua/opt.lua b/.config/nvim/lua/opt.lua new file mode 100644 index 0000000..ebb99e2 --- /dev/null +++ b/.config/nvim/lua/opt.lua @@ -0,0 +1,26 @@ +vim.cmd("colorscheme mine") + +vim.o.termguicolors = true +vim.o.relativenumber = true +vim.o.number = true +vim.o.cursorline = true +vim.o.cursorlineopt = "line" +vim.o.ignorecase = true +vim.o.smartcase = true +vim.o.mouse = "" +vim.o.cc = "80" +vim.o.splitright = true +vim.o.splitbelow = true + +local tabwidth = 2 +vim.o.tabstop = tabwidth +vim.o.shiftwidth = tabwidth +vim.o.expandtab = true + +-- Disable line numbers in terminal +vim.api.nvim_create_autocmd("TermOpen", { + callback = function() + vim.o.number = false + vim.o.relativenumber = false + end, +}) diff --git a/.config/nvim/lua/plugin/autopairs.lua b/.config/nvim/lua/plugin/autopairs.lua deleted file mode 100644 index ab924aa..0000000 --- a/.config/nvim/lua/plugin/autopairs.lua +++ /dev/null @@ -1,13 +0,0 @@ - -require("nvim-autopairs").setup { - fast_wrap = { - map = "<M-e>", - chars = { "<", "{", "[", "(", "\"", "'" }, - pattern = [=[[%"%"%>%]%)%}%,]]=], - end_key = "$", - keys = "qwertyuiopzxcvbnmasdfghjkl", - check_comma = true, - highlight = "Search", - highlight_grey="Comment" - } -} diff --git a/.config/nvim/lua/plugin/liveserver.lua b/.config/nvim/lua/plugin/liveserver.lua deleted file mode 100644 index 542a1fb..0000000 --- a/.config/nvim/lua/plugin/liveserver.lua +++ /dev/null @@ -1,13 +0,0 @@ -local status_ok, live_server = pcall(require, "live_server") -if not status_ok then - return -end - -live_server.setup({ - port = 8080, - browser_command = "", -- Empty string starts up with default browser - quiet = false, - no_css_inject = false, -- Disables css injection if true, might be useful when testing out tailwindcss - install_path = vim.fn.stdpath "config" .. "/live-server/", -}) - diff --git a/.config/nvim/lua/plugin/lsp.lua b/.config/nvim/lua/plugin/lsp.lua index 88d5c91..6563a6f 100644 --- a/.config/nvim/lua/plugin/lsp.lua +++ b/.config/nvim/lua/plugin/lsp.lua @@ -7,19 +7,6 @@ lsp.ensure_installed { "lua_ls", "clangd", "cmake", - "rust_analyzer", - "omnisharp" -} - -lspconfig.gdscript.setup {} - -lspconfig.omnisharp.setup { - cmd = { - "/usr/bin/omnisharp", - "--languageserver", - "--hostPID", - tostring(vim.fn.getpid()) - } } local cmp = require("cmp") diff --git a/.config/nvim/lua/plugin/lualine.lua b/.config/nvim/lua/plugin/lualine.lua deleted file mode 100644 index 81071ec..0000000 --- a/.config/nvim/lua/plugin/lualine.lua +++ /dev/null @@ -1,7 +0,0 @@ - -require("lualine").setup { - options = { - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, - }, -} diff --git a/.config/nvim/lua/plugin/neogen.lua b/.config/nvim/lua/plugin/neogen.lua deleted file mode 100644 index 512af71..0000000 --- a/.config/nvim/lua/plugin/neogen.lua +++ /dev/null @@ -1,19 +0,0 @@ -local neogen = require("neogen") - -neogen.setup { - snippet_engine = "luasnip", - languages = { - cs = { - template = { - annotation_convention = "xmldoc", - }, - }, - }, -} - -local opts = { - silent = true, -} - -vim.keymap.set("n", "<leader>df", ":Neogen<CR>", opts) - diff --git a/.config/nvim/lua/plugin/packer.lua b/.config/nvim/lua/plugin/packer.lua index d623de8..a2ac451 100644 --- a/.config/nvim/lua/plugin/packer.lua +++ b/.config/nvim/lua/plugin/packer.lua @@ -1,21 +1,17 @@ return require("packer").startup(function(use) - use "wbthomason/packer.nvim" - use "christoomey/vim-tmux-navigator" - - use { - "nvim-tree/nvim-tree.lua", - requires = "kyazdani42/nvim-web-devicons" - } - + use { "wbthomason/packer.nvim" } + use { "nvim-telescope/telescope.nvim", - requires = { { "nvim-lua/plenary.nvim" } } + requires = { + { "nvim-lua/plenary.nvim" } + }, } - use { "majutsushi/tagbar" } use { "Yggdroot/indentLine" } use { "windwp/nvim-autopairs" } use { "airblade/vim-gitgutter" } + use { "folke/trouble.nvim", requires = { @@ -23,37 +19,10 @@ return require("packer").startup(function(use) } } - use { - "aurum77/live-server.nvim", - run = function() - require"live_server.util".install() - end, - cmd = { "LiveServer", "LiveServerStart", "LiveServerStop" }, - } - - use { - "utilyre/barbecue.nvim", - tag = "*", - requires = { - "SmiteshP/nvim-navic", - "nvim-tree/nvim-web-devicons", -- optional dependency - }, - after = "nvim-web-devicons", -- keep this if you're using NvChad - config = function() - require("barbecue").setup() - end, - } - use { "tpope/vim-fugitive" } - use { "mhinz/vim-startify" } - use { "DanilaMihailov/beacon.nvim" } - use { - "nvim-lualine/lualine.nvim", - requires = { "kyazdani42/nvim-web-devicons", opt = true } - } use { "numToStr/Comment.nvim" } use { "HiPhish/nvim-ts-rainbow2" } - + use { "VonHeikemen/lsp-zero.nvim", requires = { @@ -75,20 +44,12 @@ return require("packer").startup(function(use) {"rafamadriz/friendly-snippets"}, } } - use "tikhomirov/vim-glsl" - use { "kosayoda/nvim-lightbulb" } + use { "tikhomirov/vim-glsl" } use { "michaeljsmith/vim-indent-object" } use { - "loctvl842/monokai-pro.nvim", - config = function() - vim.cmd("colorscheme monokai-pro-spectrum") - end - } - - use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" } @@ -97,7 +58,4 @@ return require("packer").startup(function(use) "danymat/neogen", requires = "nvim-treesitter/nvim-treesitter" } - - use("nvim-treesitter/playground") end) - diff --git a/.config/nvim/lua/plugin/setup.lua b/.config/nvim/lua/plugin/setup.lua index 4d01374..4cce77b 100644 --- a/.config/nvim/lua/plugin/setup.lua +++ b/.config/nvim/lua/plugin/setup.lua @@ -1,15 +1,55 @@ - require("Comment").setup {} -require("nvim-lightbulb").setup({ - autocmd = { enabled = true } -}) -require("nvim-tree").setup { + +require("nvim-autopairs").setup { + fast_wrap = { + map = "<M-e>", + chars = { "<", "{", "[", "(", "\"", "'" }, + pattern = [=[[%"%"%>%]%)%}%,]]=], + end_key = "$", + keys = "qwertyuiopzxcvbnmasdfghjkl", + check_comma = true, + highlight = "Search", + highlight_grey="Comment" + } +} + +local neogen = require("neogen") + +neogen.setup { + snippet_engine = "luasnip", + languages = { + cs = { + template = { + annotation_convention = "xmldoc", + }, + }, + }, +} + +local opts = { + silent = true, +} + +vim.keymap.set("n", "<leader>df", "<CMD>Neogen<CR>", opts) + +require("nvim-treesitter.configs").setup { + ensure_installed = { "c", "rust", "lua", "vimdoc" }, + sync_install = false, + highlight = { + enable = true, + additional_vim_regex_highlighting = true, + }, + indent = { enable = false }, + rainbow = { + enable = true, + } } -require("plugin.liveserver") -require("plugin.treesitter") -require("plugin.telescope") -require("plugin.autopairs") -require("plugin.lualine") -require("plugin.lsp") -require("plugin.neogen") +do + local builtin = require("telescope.builtin") + vim.keymap.set("n", "<leader>ff", builtin.find_files, {}) + vim.keymap.set("n", "<leader>fg", builtin.git_files, {}) + vim.keymap.set("n", "<leader>fs", function() + builtin.grep_string({ search = vim.fn.input("grep>") }) + end) +end diff --git a/.config/nvim/lua/plugin/telescope.lua b/.config/nvim/lua/plugin/telescope.lua deleted file mode 100644 index d5bea56..0000000 --- a/.config/nvim/lua/plugin/telescope.lua +++ /dev/null @@ -1,7 +0,0 @@ -local builtin = require("telescope.builtin") -vim.keymap.set("n", "<leader>ff", builtin.find_files, {}) -vim.keymap.set("n", "<leader>fg", builtin.git_files, {}) -vim.keymap.set("n", "<leader>fs", function() - builtin.grep_string({ search = vim.fn.input("grep>") }) -end) - diff --git a/.config/nvim/lua/plugin/treesitter.lua b/.config/nvim/lua/plugin/treesitter.lua deleted file mode 100644 index e14a975..0000000 --- a/.config/nvim/lua/plugin/treesitter.lua +++ /dev/null @@ -1,13 +0,0 @@ -require("nvim-treesitter.configs").setup { - ensure_installed = { "c", "rust", "lua", "vimdoc" }, - sync_install = false, - highlight = { - enable = true, - additional_vim_regex_highlighting = true, - }, - indent = { enable = false }, - rainbow = { - enable = true, - } -} - diff --git a/.config/nvim/lua/set.lua b/.config/nvim/lua/set.lua deleted file mode 100644 index 88816af..0000000 --- a/.config/nvim/lua/set.lua +++ /dev/null @@ -1,26 +0,0 @@ -vim.opt.number = true -vim.opt.relativenumber = true -vim.opt.cursorline = true -vim.opt.scrolloff = 4 -vim.opt.signcolumn = "yes" - -vim.opt.encoding = "utf8" -vim.opt.fileencoding = "utf8" -vim.opt.syntax = "ON" -vim.opt.termguicolors = true - -vim.opt.ignorecase = true -vim.opt.smartcase = true -vim.opt.incsearch = true - -local tabwidth = 2 -vim.opt.expandtab = true -vim.opt.shiftwidth = tabwidth -vim.opt.softtabstop = tabwidth -vim.opt.tabstop = tabwidth - -vim.opt.splitright = true -vim.opt.splitbelow = true -vim.opt.cc = "80" - -vim.opt.mouse = "" diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index dc8d0cd..d75fdbb 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -17,18 +17,19 @@ ;========================================================== [colors] -background = #333333 -background-alt = #262626 -foreground = #FFFFFF -primary = #F0C674 -secondary = #F0C674 +background = #282A2E +background-alt = #373B41 +foreground = #C5C8C6 +primary = #F0F0A0 +secondary = #8ABEB7 alert = #A54242 disabled = #707880 -[bar/base] +[bar/example] width = 100% -height = 24pt -radius = 0 +height = 12pt + +; dpi = 96 background = ${colors.background} foreground = ${colors.foreground} @@ -38,7 +39,7 @@ line-size = 3pt border-size = 0pt border-color = #00000000 -padding-left = 1 +padding-left = 0 padding-right = 1 module-margin = 1 @@ -46,56 +47,22 @@ module-margin = 1 separator = | separator-foreground = ${colors.disabled} -bottom = false - -font-0 = Mononoki Nerd Font;2 +font-0 = JetBrainsMono Nerd Font;2 -modules-left = xworkspaces -modules-center = -modules-right = pulseaudio date +modules-left = xwindow +modules-center = date time +modules-right = filesystem pulseaudio memory cpu wlan -; cursor-click = pointer -; cursor-scroll = ns-resize +cursor-click = pointer +cursor-scroll = ns-resize enable-ipc = true -[bar/bar1] -inherit = bar/base -monitor = "HDMI-A-0" - -[bar/bar2] -inherit = bar/base -monitor = "DVI-D-0" - - -[global/wm] -margin-bottom = 0 -margin-top = 0 - -[module/media] -type = custom/script -exec = sh ~/.config/polybar/media.sh -click-left = playerctl play-pause -interval = 1 - -[module/xworkspaces] -type = internal/xworkspaces - -label-active = %name% -label-active-background = ${colors.background-alt} -label-active-underline= ${colors.primary} -label-active-padding = 1 +[module/systray] +type = internal/tray -label-occupied = %name% -label-occupied-padding = 1 - -label-urgent = %name% -label-urgent-background = ${colors.alert} -label-urgent-padding = 1 - -label-empty = %name% -label-empty-foreground = ${colors.disabled} -label-empty-padding = 1 +format-margin = 8pt +tray-spacing = 16pt [module/xwindow] type = internal/xwindow @@ -107,7 +74,7 @@ interval = 25 mount-0 = / -label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%% +label-mounted = %{F#F0F0A0}%mountpoint%%{F-} %percentage_used%% label-unmounted = %mountpoint% not mounted label-unmounted-foreground = ${colors.disabled} @@ -124,18 +91,6 @@ label-volume = %percentage%% label-muted = muted label-muted-foreground = ${colors.disabled} -[module/xkeyboard] -type = internal/xkeyboard -blacklist-0 = num lock - -label-layout = %layout% -label-layout-foreground = ${colors.primary} - -label-indicator-padding = 2 -label-indicator-margin = 1 -label-indicator-foreground = ${colors.background} -label-indicator-background = ${colors.secondary} - [module/memory] type = internal/memory interval = 2 @@ -150,11 +105,33 @@ format-prefix = "CPU " format-prefix-foreground = ${colors.primary} label = %percentage:2%% -[module/date] +[network-base] +type = internal/network +interval = 5 +format-connected = <label-connected> +format-disconnected = <label-disconnected> +label-disconnected = %{F#F0F0A0}%ifname%%{F#707880} disconnected + +[module/wlan] +inherit = network-base +interface-type = wireless +label-connected = %{F#F0C674}%ifname%%{F-} %essid% + +[module/time] type = internal/date interval = 1 -date = %H:%M %Y-%m-%d %b +time = %H:%M +time-alt = %I:%M%P + +label = %time% +label-foreground = ${colors.primary} + +[module/date] +type = internal/date +interval = 3600 + +date = %b %d, %Y label = %date% label-foreground = ${colors.primary} diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh deleted file mode 100755 index f4e0ddb..0000000 --- a/.config/polybar/launch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Terminate already running bar instances -# If all your bars have ipc enabled, you can use -polybar-msg cmd quit -# Otherwise you can use the nuclear option: -# killall -q polybar - -# Launch bar1 and bar2 -echo "---" | tee -a /tmp/polybar1.log /tmp/polybar2.log -polybar bar1 2>&1 | tee -a /tmp/polybar1.log & disown -polybar bar2 2>&1 | tee -a /tmp/polybar2.log & disown - -echo "Bars launched..." diff --git a/.config/polybar/media.sh b/.config/polybar/media.sh deleted file mode 100644 index 38f8d55..0000000 --- a/.config/polybar/media.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -status=$(playerctl status) -title=$(playerctl metadata title) -artist=$(playerctl metadata artist) - -if [ $status = "Playing" ] -then - echo " $title - $artist" -elif [ $status = "Paused" ] -then - echo " $title - $artist" -fi diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf deleted file mode 100644 index d60285a..0000000 --- a/.config/tmux/tmux.conf +++ /dev/null @@ -1,12 +0,0 @@ -unbind C-b -set -g prefix C-a -set -g status off - -bind v split-window -v -c "#{pane_current_path}" -bind h split-window -h -c "#{pane_current_path}" - -set -g @plugin "tmux-plugins/tpm" -set -g @plugin "tmux-plugins/tmux-sensible" -set -g @plugin "christoomey/vim-tmux-navigator" - -run "~/.tmux/plugins/tpm/tpm" @@ -2,20 +2,15 @@ rm -rf .config/ mkdir .config/ # Kitty -cp -r ~/.config/kitty ./.config/ +cp -r ~/.config/kitty .config/ # Neovim -cp -r ~/.config/nvim ./.config/ -rm -rf ./.config/nvim/plugin/ -rm -rf ./.config/nvim/live-server/ +cp -r ~/.config/nvim .config/ +rm -rf .config/nvim/plugin/ +rm -rf .config/nvim/live-server/ # i3 -cp -r ~/.config/i3 ./.config - -# tmux -cp -r ~/.config/tmux ./.config/ -rm -rf ./.config/tmux/plugins/ +cp -r ~/.config/i3 .config # polybar - -cp -r ~/.config/polybar ./.config/ +cp -r ~/.config/polybar .config/ |