diff --git a/.gitignore b/.gitignore index 8104d7e..04697e1 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ xfce4 libvirt libreoffice epdfview +btop diff --git a/.zshrc b/.zshrc index 88658c3..68f3887 100644 --- a/.zshrc +++ b/.zshrc @@ -17,26 +17,30 @@ b64 () { printf "%s" "$1" | base64 $2; } url() { curl -s https://0x0.st -F "file=@$*" | wl-copy && notify-send "Link copied to clipboard"; } gtd () { - [ -z "$*" ] && file=$(git diff --name-only | fzf --border=rounded --height=10 --layout=reverse | tr -d ' ') || file=$* - [ -z "$file" ] || git diff --name-only --relative --diff-filter=d $file | xargs bat --paging=never --diff - unset file + preview="git diff $@ --color=always -- {-1}" + git diff $@ --name-only --relative | fzf --ansi --preview $preview --preview-window right:65%:wrap -0 + unset preview } gtc () { [ -z "$*" ] && [ -p "/dev/stdin" ] && read -r query ([^<]*)<.*romanization">([^<]*)<.*roman.*|translated : \1\nroman : \2|p' +} + help() { "$@" --help 2>&1 | bat --plain --language=help } @@ -51,6 +55,7 @@ rmpkg(){ # Lines configured by zsh-newuser-install export EDITOR="nvim" +export MANPAGER="sh -c 'col -bx | bat -l man -p'" export VISUAL="nvim" export TERMINAL="foot" export OPENER="xdg-open" diff --git a/btop/btop.conf b/btop/btop.conf deleted file mode 100644 index ee6c395..0000000 --- a/btop/btop.conf +++ /dev/null @@ -1,212 +0,0 @@ -#? Config file for btop v. 1.2.13 - -#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. -#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" -color_theme = "/usr/share/btop/themes/flat-remix.theme" - -#* If the theme set background should be shown, set to False if you want terminal background transparency. -theme_background = False - -#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false. -truecolor = True - -#* Set to true to force tty mode regardless if a real tty has been detected or not. -#* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols. -force_tty = False - -#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets. -#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box. -#* Use whitespace " " as separator between different presets. -#* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty" -presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty" - -#* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists. -#* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift. -vim_keys = False - -#* Rounded corners on boxes, is ignored if TTY mode is ON. -rounded_corners = True - -#* Default symbols to use for graph creation, "braille", "block" or "tty". -#* "braille" offers the highest resolution but might not be included in all fonts. -#* "block" has half the resolution of braille but uses more common characters. -#* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY. -#* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view. -graph_symbol = "braille" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_cpu = "default" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_mem = "default" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_net = "default" - -# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". -graph_symbol_proc = "default" - -#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace. -shown_boxes = "cpu net proc mem" - -#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. -update_ms = 1000 - -#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct", -#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly. -proc_sorting = "memory" - -#* Reverse sorting order, True or False. -proc_reversed = False - -#* Show processes as a tree. -proc_tree = False - -#* Use the cpu graph colors in the process list. -proc_colors = True - -#* Use a darkening gradient in the process list. -proc_gradient = True - -#* If process cpu usage should be of the core it's running on or usage of the total available cpu power. -proc_per_core = False - -#* Show process memory as bytes instead of percent. -proc_mem_bytes = True - -#* Show cpu graph for each process. -proc_cpu_graphs = True - -#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate) -proc_info_smaps = False - -#* Show proc box on left side of screen instead of right. -proc_left = False - -#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop). -proc_filter_kernel = True - -#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available. -#* Select from a list of detected attributes from the options menu. -cpu_graph_upper = "total" - -#* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available. -#* Select from a list of detected attributes from the options menu. -cpu_graph_lower = "total" - -#* Toggles if the lower CPU graph should be inverted. -cpu_invert_lower = True - -#* Set to True to completely disable the lower CPU graph. -cpu_single_graph = False - -#* Show cpu box at bottom of screen instead of top. -cpu_bottom = False - -#* Shows the system uptime in the CPU box. -show_uptime = True - -#* Show cpu temperature. -check_temp = True - -#* Which sensor to use for cpu temperature, use options menu to select from list of available sensors. -cpu_sensor = "Auto" - -#* Show temperatures for cpu cores also if check_temp is True and sensors has been found. -show_coretemp = True - -#* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core. -#* Use lm-sensors or similar to see which cores are reporting temperatures on your machine. -#* Format "x:y" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries. -#* Example: "4:0 5:1 6:3" -cpu_core_map = "" - -#* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine". -temp_scale = "celsius" - -#* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024. -base_10_sizes = False - -#* Show CPU frequency. -show_cpu_freq = True - -#* Draw a clock at top of screen, formatting according to strftime, empty string to disable. -#* Special formatting: /host = hostname | /user = username | /uptime = system uptime -clock_format = "%X" - -#* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort. -background_update = True - -#* Custom cpu model name, empty string to disable. -custom_cpu_name = "" - -#* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ". -#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user". -disks_filter = "" - -#* Show graphs instead of meters for memory values. -mem_graphs = True - -#* Show mem box below net box instead of above. -mem_below_net = False - -#* Count ZFS ARC in cached and available memory. -zfs_arc_cached = True - -#* If swap memory should be shown in memory box. -show_swap = True - -#* Show swap as a disk, ignores show_swap value above, inserts itself after first disk. -swap_disk = True - -#* If mem box should be split to also show disks info. -show_disks = True - -#* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar. -only_physical = True - -#* Read disks list from /etc/fstab. This also disables only_physical. -use_fstab = True - -#* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool) -zfs_hide_datasets = False - -#* Set to true to show available disk space for privileged users. -disk_free_priv = False - -#* Toggles if io activity % (disk busy time) should be shown in regular disk usage view. -show_io_stat = True - -#* Toggles io mode for disks, showing big graphs for disk read/write speeds. -io_mode = False - -#* Set to True to show combined read/write io graphs in io mode. -io_graph_combined = False - -#* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ". -#* Example: "/mnt/media:100 /:20 /boot:1". -io_graph_speeds = "" - -#* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False. -net_download = 100 - -net_upload = 100 - -#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest. -net_auto = True - -#* Sync the auto scaling for download and upload to whichever currently has the highest scale. -net_sync = True - -#* Starts with the Network Interface specified here. -net_iface = "" - -#* Show battery stats in top right if battery is present. -show_battery = True - -#* Which battery to use if multiple are present. "Auto" for auto detection. -selected_battery = "Auto" - -#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". -#* The level set includes all lower levels, i.e. "DEBUG" will show all logging info. -log_level = "WARNING" \ No newline at end of file diff --git a/eww/eww.scss b/eww/eww.scss index 0248dce..a7d89f2 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -89,11 +89,10 @@ .music_bar scale trough highlight { all: unset; - background-image: linear-gradient(to right, #8A3288 30%, #8A32AA 50%, #8A326F 100% *50); + background-image: linear-gradient(to right, #EA3288 30%, #EA32AA 50%, #EA326F 100% *50); border-radius: 24px; } .music_bar scale trough { - all: unset; background-color: #232232; border-radius: 24px; min-height: 13px; diff --git a/eww/eww.yuck b/eww/eww.yuck index 801c508..9adb485 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -14,7 +14,7 @@ (defwindow time_0 :monitor 0 - :geometry (geometry :x "-10px" + :geometry (geometry :x "0px" :y "20px" :width "20%" :height "200px" @@ -25,9 +25,9 @@ :wm-ignore false (clock)) -(defpoll HOUR :interval "5s" `date +\"%I\"`) -(defpoll MIN :interval "5s" `date +\"%M\"`) -(defpoll MER :interval "5s" `date +\"%p\"`) +(defpoll HOUR :interval "2s" `date +\"%I\"`) +(defpoll MIN :interval "2s" `date +\"%M\"`) +(defpoll MER :interval "2s" `date +\"%p\"`) (defpoll DAY :interval "5s" `date +\"%A\"`) (defwidget clock [] @@ -45,7 +45,7 @@ :geometry (geometry :x "50" :y "50" :width "20%" - :height "0px" + :height "40px" :anchor "bottom left") :stacking "bg" :reserve (struts :distance "10px" :side "bottom") diff --git a/eww/script b/eww/script index 57a622c..5bbfa74 100755 --- a/eww/script +++ b/eww/script @@ -40,11 +40,11 @@ case $1 in $HOME/repos_scripts/yt-music play_next >/dev/null ;; prev) - $HOME/repos_scripts/yt-music play "$(sed 's| >|\t|g' $HOME/.cache/yt-music/prev | cut -d':' -f2)" + pgrep -f mpvsocket && ($HOME/repos_scripts/yt-music play "$(sed 's| >|\t|g' $HOME/.cache/yt-music/prev | cut -d':' -f2)") ;; time) out=$(echo '{"command" :["get_property" , "percent-pos"]}' | socat - /tmp/mpvsocket 2>/dev/null | sed -nE 's_.*data":([^,]*).*_\1_p') - [ -z "$out" ] && echo "0" || echo "$out" + [ -z "$out" ] && echo "100" || echo "$out" ;; seek) echo "{\"command\" :[\"seek\" ,\"$2\",\"relative-percent\"]}" | socat - /tmp/mpvsocket diff --git a/foot/foot.ini b/foot/foot.ini index 36ba0b8..70e8998 100644 --- a/foot/foot.ini +++ b/foot/foot.ini @@ -9,9 +9,9 @@ term=xterm-256color # locked-title=no font=Iosevka Term:size=10 -# font-bold= -# font-italic= -# font-bold-italic= +#font-bold= +font-italic=Victor Mono:style=Italic:size=9 +#font-bold-italic= # line-height= # letter-spacing=0 # horizontal-letter-offset=0 diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index ceeb4e4..15891ef 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -169,8 +169,9 @@ windowrulev2=workspace 4,class:^(pavucontrol)$ exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once=ssh-agent exec-once=$HOME/repos_scripts/yt-music loop -exec-once=swaybg -i ~/wall/9.png +exec-once=swaybg -i ~/wall/10.png exec-once=$hypr_dir/workspace 'focus' +exec-once=eww open-many music_0 time_0 exec-once=sleep 5 && $hypr_dir/workspace #exec-once=skypeforlinux exec-once=sleep 2 && google-chrome-stable 'https://web.skype.com/?openPstnPage=true' diff --git a/nvim/init.lua b/nvim/init.lua index 3f6bd9e..20d9659 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,4 +1,4 @@ --- my neovim config uwu + -- functionality setup local set = vim.opt @@ -36,6 +36,7 @@ require('packer').startup(function(use) 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() @@ -167,3 +168,34 @@ local dap = require('dap') command = os.getenv('HOME') .. '/.virtualenvs/tools/bin/python'; args = { '-m', 'debugpy.adapter' }; } + + +--treesitter +require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" + ensure_installed = { "c", "lua", "bash", "html", "css","php","javascript", "python" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + -- List of parsers to ignore installing (for "all") + ignore_install = { "javascript" }, + + ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + + highlight = { + -- `false` will disable the whole extension + enable = true, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, +} diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua index bf4e043..1078e20 100644 --- a/nvim/plugin/packer_compiled.lua +++ b/nvim/plugin/packer_compiled.lua @@ -165,6 +165,11 @@ _G.packer_plugins = { 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,