diff --git a/.zshrc b/.zshrc index 761962c..e21dd35 100644 --- a/.zshrc +++ b/.zshrc @@ -30,11 +30,23 @@ gtb () { unset br } +holidays(){ + printf 'Day Date Holiday + +Wednesday 8th March Holi +Friday 7th April Good Friday +Wednesday 30th August Rakshabandhan +Tuesday 15th August Independence Day +Monday 2nd October Gandhi Jayanti +Tuesday 24th October Dussehra +Sunday-Tuesday 12-14 November Diwali & Bhai dooj\n' | bat -pp -l tsv +} + b64 () { printf "%s" "$1" | base64 $2; } url() { [ -z "$2" ] && duration="1440" || duration=$2 - out=$(curl https://oshi.at -F shorturl=0 -F "f=@$1" -F "expire=$duration") #1440 means 1 day duration + out=$(curl -k https://oshi.at -F shorturl=0 -F "f=@$1" -F "expire=$duration") #1440 means 1 day duration [ -z "$out" ] && return 1 printf "%s" "$out" | sed -nE 's|DL: (.*)|\1|p' | wl-copy && notify-send "Link copied to clipboard"; wl-paste @@ -70,10 +82,6 @@ v() { [ -z "$*" ] && nvim -O $(fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}' -m | tr '\n' ' ') || nvim -O $* } -translate () { - curl -s "https://www.google.com/async/translate?vet=12ahUKEwjelf-f06v8AhUKzjgGHVe0CBkQqDh6BAgFECw..i&ei=8kC0Y97UDIqc4-EP1-iiyAE&yv=3&cs=0" -X POST -d "async=translate,sl:auto,tl:$1,st:$(jq -Rr '@uri' <<< $2),id:1672757511748,qc:true,ac:true,_id:tw-async-translate,_pms:s,_fmt:pc" -H "content-type:application/x-www-form-urlencoded;charset=UTF-8" | sed -nE 's|.*target-text">([^<]*)<.*romanization">([^<]*)<.*roman.*|translated : \1\nroman : \2|p' -} - help() { "$@" --help 2>&1 | bat --plain --language=help } @@ -98,7 +106,6 @@ export WM="hyprland" export IMAGE="nsxiv" alias cat="bat -pp" alias open="xdg-open" -alias anime="$HOME/ani-cli/ani-cli" alias cp="cp -v" alias art="php artisan" alias rm="rm -v" diff --git a/environment.d/local.conf b/environment.d/local.conf new file mode 100644 index 0000000..63b0505 --- /dev/null +++ b/environment.d/local.conf @@ -0,0 +1,2 @@ +[Service] +Environment="PATH=$PATH:$HOME/.local/bin/" diff --git a/eww/eww.scss b/eww/eww.scss index 98c2e9a..672b492 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -11,8 +11,8 @@ /** Generic window ***********************************/ .genwin { - //background-color: rgba(46, 52, 64, 0.5); - background-color: rgba(0,0,0,0); + background-color: rgba(39, 40, 34, 0.5); + //background-color: rgba(0,0,0,0); border-radius: 16px; } @@ -23,7 +23,7 @@ font-weight : bold; } .time_hour { - margin : 10px 0px 0px 20px; + margin : 10px 0px 0px 40px; } .time_min { margin : 0px 0px 10px 0px; @@ -90,7 +90,7 @@ .music_bar scale trough highlight { all: unset; - background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); + background-image: linear-gradient(to right, #77a5bf 30%, #91bdce 50%, #afcee0 100% *50); border-radius: 24px; } .music_bar scale trough { diff --git a/eww/eww.yuck b/eww/eww.yuck index a64e497..903f7a8 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -1,11 +1,11 @@ ;;time (defwindow time_1 :monitor 1 - :geometry (geometry :x "10px" - :y "0px" - :width "20%" + :geometry (geometry :x "50px" + :y "50px" + :width "23%" :height "200px" - :anchor "top right") + :anchor "bottom right") :stacking "bg" :reserve (struts :distance "40px" :side "top") :windowtype "dock" @@ -14,11 +14,11 @@ (defwindow time_0 :monitor 0 - :geometry (geometry :x "10px" - :y "0px" - :width "21%" + :geometry (geometry :x "50px" + :y "50px" + :width "23%" :height "200px" - :anchor "top right") + :anchor "bottom right") :stacking "bg" :reserve (struts :distance "40px" :side "top") :windowtype "dock" @@ -86,4 +86,5 @@ (button :class "btn_next" :onclick "./script next" "怜")) (box :class "music_bar" :halign "center" :vexpand "false" :hexpand "false" :space-evenly "false" (scale :min 0 :active "true" :max 100 :value CURRENT)) - ))) + ) + )) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index eade35d..141a165 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -167,9 +167,9 @@ windowrulev2=workspace 3,class:^([c|C]ode) windowrulev2=workspace 4,class:^(pavucontrol)$ #startup applications -exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once=dbus-update-activation-environment --systemd --all exec-once=ssh-agent -exec-once=swaybg -i ~/wall/9.png +exec-once=swaybg -i ~/wall/14.jpg exec-once=xrdb -merge $HOME/.config/.Xresource exec-once=$hypr_dir/workspace 'focus' exec-once=eww open-many music_0 time_0 diff --git a/nvim/init.lua b/nvim/init.lua index b97dcd4..a097e53 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,4 +1,4 @@ --- functionality setup + local set = vim.opt set.number=true set.relativenumber=true @@ -6,18 +6,24 @@ set.shiftwidth=8 set.termguicolors = true --plugin setup -local fn = vim.fn -local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' -if fn.empty(fn.glob(install_path)) > 0 then - packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) - vim.cmd [[packadd packer.nvim]] +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end -require('packer').startup(function(use) - use 'wbthomason/packer.nvim' - use { 'nvim-lualine/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true } } - use 'https://gitlab.com/__tpb/monokai-pro.nvim' - use { "williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim", "neovim/nvim-lspconfig", } - use { +vim.opt.rtp:prepend(lazypath) +require('lazy').setup({ + 'wbthomason/packer.nvim', + { 'nvim-lualine/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true } }, + 'https://gitlab.com/__tpb/monokai-pro.nvim', + { "williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim", "neovim/nvim-lspconfig", }, + { "adalessa/laravel.nvim", dependencies = { "nvim-telescope/telescope.nvim", @@ -27,30 +33,25 @@ require('packer').startup(function(use) require("laravel").setup() require("telescope").load_extension("laravel") end - } - --use { 'AlphaTechnolog/pywal.nvim', as = 'pywal' } - use { - "windwp/nvim-autopairs", - config = function() require("nvim-autopairs").setup {} end - } - use 'hrsh7th/cmp-nvim-lsp' - use 'hrsh7th/cmp-nvim-lua' - use 'gpanders/nvim-parinfer' - use 'mfussenegger/nvim-dap' - use 'hrsh7th/cmp-buffer' - use 'hrsh7th/cmp-path' - use 'norcalli/nvim-colorizer.lua' - use 'hrsh7th/cmp-cmdline' - use 'hrsh7th/nvim-cmp' - use 'saadparwaiz1/cmp_luasnip' - use 'L3MON4D3/LuaSnip' - use "rafamadriz/friendly-snippets" - use ('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) - -if packer_bootstrap then - require('packer').sync() - end -end) + }, + { + "windwp/nvim-autopairs", + config = function() require("nvim-autopairs").setup {} end + }, + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-nvim-lua', + 'gpanders/nvim-parinfer', + 'mfussenegger/nvim-dap', + 'hrsh7th/cmp-buffer', + 'hrsh7th/cmp-path', + 'norcalli/nvim-colorizer.lua', + 'hrsh7th/cmp-cmdline', + 'hrsh7th/nvim-cmp', + 'saadparwaiz1/cmp_luasnip', + 'L3MON4D3/LuaSnip', + "rafamadriz/friendly-snippets", + {'nvim-treesitter/nvim-treesitter' , build = ":TSUpdate"}, +}) --lspserver Setup require("mason").setup { @@ -93,7 +94,7 @@ if not configs.intelephense then end -- for arduino lsp server -local MY_FQBN = "arduino:avr:nano" +local MY_FQBN = "esp8266:esp8266:nodemcu" lspconfig.arduino_language_server.setup { cmd = { "arduino-language-server", diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json new file mode 100644 index 0000000..12ce33c --- /dev/null +++ b/nvim/lazy-lock.json @@ -0,0 +1,25 @@ +{ + "LuaSnip": { "branch": "master", "commit": "9b5be5e9b460fad7134991d3fd0434466959db08" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, + "friendly-snippets": { "branch": "main", "commit": "009887b76f15d16f69ae1341f86a7862f61cf2a1" }, + "laravel.nvim": { "branch": "main", "commit": "e04d31dae87ea24211658e1f42a73e5e582602bb" }, + "lazy.nvim": { "branch": "main", "commit": "14075657131b9a19883a8845c47f1ab65461cd6f" }, + "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e4badf7984f7a5f0ac7dc10657dbedbd99a82f94" }, + "mason.nvim": { "branch": "main", "commit": "c400270804059087e2d0041893a95c6bab4df3c1" }, + "monokai-pro.nvim": { "branch": "main", "commit": "826d028edbcc7a8aadc0f7a32b32747d97575615" }, + "nvim-autopairs": { "branch": "master", "commit": "ab49517cfd1765b3f3de52c1f0fda6190b44e27b" }, + "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, + "nvim-dap": { "branch": "master", "commit": "c1bfcd89ef440a44d02ade7e71befb1e5aa358ca" }, + "nvim-lspconfig": { "branch": "master", "commit": "1a2d5f5224c65b0709bf5da0ccd9cad29272083a" }, + "nvim-parinfer": { "branch": "master", "commit": "82bce5798993f4fe5ced20e74003b492490b4fe8" }, + "nvim-treesitter": { "branch": "master", "commit": "980f0816cc28c20e45715687a0a21b5b39af59eb" }, + "packer.nvim": { "branch": "master", "commit": "1d0cf98a561f7fd654c970c49f917d74fafe1530" }, + "telescope.nvim": { "branch": "master", "commit": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2" } +} \ No newline at end of file diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua deleted file mode 100644 index 8eb1ae4..0000000 --- a/nvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,233 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - -_G._packer = _G._packer or {} -_G._packer.inside_compile = true - -local time -local profile_info -local should_profile = false -if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end -else - time = function(chunk, start) end -end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - if threshold then - table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') - end - - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/tanveer/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/tanveer/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/tanveer/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/tanveer/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/tanveer/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - LuaSnip = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip" - }, - ["cmp-buffer"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/cmp-buffer", - url = "https://github.com/hrsh7th/cmp-buffer" - }, - ["cmp-cmdline"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/cmp-cmdline", - url = "https://github.com/hrsh7th/cmp-cmdline" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - ["cmp-nvim-lua"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", - url = "https://github.com/hrsh7th/cmp-nvim-lua" - }, - ["cmp-path"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/cmp-path", - url = "https://github.com/hrsh7th/cmp-path" - }, - cmp_luasnip = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/cmp_luasnip", - url = "https://github.com/saadparwaiz1/cmp_luasnip" - }, - ["friendly-snippets"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/friendly-snippets", - url = "https://github.com/rafamadriz/friendly-snippets" - }, - ["laravel.nvim"] = { - commands = { "Artisan", "Composer" }, - config = { "\27LJ\2\nf\0\0\3\0\5\0\f6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\0029\0\4\0'\2\1\0B\0\2\1K\0\1\0\19load_extension\14telescope\nsetup\flaravel\frequire\0" }, - loaded = false, - needs_bufread = false, - only_cond = false, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/opt/laravel.nvim", - url = "https://github.com/adalessa/laravel.nvim" - }, - ["lualine.nvim"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/lualine.nvim", - url = "https://github.com/nvim-lualine/lualine.nvim" - }, - ["mason-lspconfig.nvim"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", - url = "https://github.com/williamboman/mason-lspconfig.nvim" - }, - ["mason.nvim"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/mason.nvim", - url = "https://github.com/williamboman/mason.nvim" - }, - ["monokai-pro.nvim"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/monokai-pro.nvim", - url = "https://gitlab.com/__tpb/monokai-pro.nvim" - }, - ["nvim-autopairs"] = { - config = { "\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0" }, - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/nvim-autopairs", - url = "https://github.com/windwp/nvim-autopairs" - }, - ["nvim-cmp"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-colorizer.lua"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua", - url = "https://github.com/norcalli/nvim-colorizer.lua" - }, - ["nvim-dap"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/nvim-dap", - url = "https://github.com/mfussenegger/nvim-dap" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-parinfer"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/nvim-parinfer", - url = "https://github.com/gpanders/nvim-parinfer" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/home/tanveer/.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/tanveer/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons", - url = "https://github.com/kyazdani42/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/tanveer/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - } -} - -time([[Defining packer_plugins]], false) --- Config for: nvim-autopairs -time([[Config for nvim-autopairs]], true) -try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") -time([[Config for nvim-autopairs]], false) - --- Command lazy-loads -time([[Defining lazy-load commands]], true) -pcall(vim.api.nvim_create_user_command, 'Artisan', function(cmdargs) - require('packer.load')({'laravel.nvim'}, { cmd = 'Artisan', l1 = cmdargs.line1, l2 = cmdargs.line2, bang = cmdargs.bang, args = cmdargs.args, mods = cmdargs.mods }, _G.packer_plugins) - end, - {nargs = '*', range = true, bang = true, complete = function() - require('packer.load')({'laravel.nvim'}, {}, _G.packer_plugins) - return vim.fn.getcompletion('Artisan ', 'cmdline') - end}) -pcall(vim.api.nvim_create_user_command, 'Composer', function(cmdargs) - require('packer.load')({'laravel.nvim'}, { cmd = 'Composer', l1 = cmdargs.line1, l2 = cmdargs.line2, bang = cmdargs.bang, args = cmdargs.args, mods = cmdargs.mods }, _G.packer_plugins) - end, - {nargs = '*', range = true, bang = true, complete = function() - require('packer.load')({'laravel.nvim'}, {}, _G.packer_plugins) - return vim.fn.getcompletion('Composer ', 'cmdline') - end}) -time([[Defining lazy-load commands]], false) - - -_G._packer.inside_compile = false -if _G._packer.needs_bufread == true then - vim.cmd("doautocmd BufRead") -end -_G._packer.needs_bufread = false - -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end diff --git a/starship.toml b/starship.toml index 05d5494..81f49b3 100644 --- a/starship.toml +++ b/starship.toml @@ -1,10 +1,10 @@ # ~/.config/starship.toml -format = "[┌─](bold green)$all" +format = " (bold green)$all" -[character] -success_symbol = "[└─>](bold green)" -error_symbol = "[└─>](bold red)" +#[character] +#success_symbol = "[└─>](bold green)" +#error_symbol = "[└─>](bold red)" [cmd_duration] min_time = 70 @@ -27,9 +27,9 @@ format = '[\($state( $progress_current of $progress_total)\)]($style) ' [git_status] conflicted = "⚔️ " -ahead = "🏎️ 💨×${count} " +ahead = "🏎️ 💨 ×${count} " behind = "🐢×${count} " -diverged = "🔱 🏎️ 💨×{ahead_count} 🐢×${behind_count} " +diverged = "🔱 {ahead} {behind}" untracked = "🛤️ ×${count} " stashed = "📦 " modified = "📝×${count} "