commit d9b0f2928bf2e3d3013f347d43e64dd640699b9c
parent d3b133203469e0578e5e91fe5a3475af33c27bdd
Author: mehdi-norouzi <mehdeenoroozi@gmail.com>
Date: Thu, 21 Sep 2023 10:10:00 +0330
Merge branch 'ati-pc'
Diffstat:
5 files changed, 14 insertions(+), 66 deletions(-)
diff --git a/nvim/.config/nvim/after/plugin/gitsigns.lua b/nvim/.config/nvim/after/plugin/gitsigns.lua
@@ -1,42 +0,0 @@
-require('gitsigns').setup {
- signs = {
- add = { hl = 'GitSignsAdd', text = '│', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
- change = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
- delete = { hl = 'GitSignsDelete', text = '_', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' },
- topdelete = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' },
- changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
- untracked = { hl = 'GitSignsAdd', text = '┆', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
- },
- signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
- numhl = false, -- Toggle with `:Gitsigns toggle_numhl`
- linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
- word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
- watch_gitdir = {
- interval = 1000,
- follow_files = true
- },
- attach_to_untracked = true,
- current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
- current_line_blame_opts = {
- virt_text = true,
- virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
- delay = 1000,
- ignore_whitespace = false,
- },
- current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
- sign_priority = 6,
- update_debounce = 100,
- status_formatter = nil, -- Use default
- max_file_length = 40000, -- Disable if file is longer than this (in lines)
- preview_config = {
- -- Options passed to nvim_open_win
- border = 'single',
- style = 'minimal',
- relative = 'cursor',
- row = 0,
- col = 1
- },
- yadm = {
- enable = false
- },
-}
diff --git a/nvim/.config/nvim/after/plugin/telescope-config.lua b/nvim/.config/nvim/after/plugin/telescope-config.lua
@@ -31,4 +31,4 @@ require('telescope').setup{
require('telescope').load_extension('fzf')
require('telescope').load_extension('file_browser')
-require('telescope').load_extension('lazygit')
+-- require('telescope').load_extension('lazygit')
diff --git a/nvim/.config/nvim/lua/mehdi/packer.lua b/nvim/.config/nvim/lua/mehdi/packer.lua
@@ -51,15 +51,9 @@ return require('packer').startup(
-- dap
use { 'mfussenegger/nvim-dap' }
- use { 'rcarriga/nvim-dap-ui' }
+ use { 'rcarriga/nvim-dap-ui', requires = {'mfussenegger/nvim-dap'} }
use { 'ravenxrz/DAPInstall.nvim' }
- -- -- treesitter
- -- use("nvim-treesitter/nvim-treesitter", {
- -- run = ":TSUpdate"
- -- })
- -- use { "nvim-treesitter/nvim-treesitter-context" }
-
-- undotree
use { 'mbbill/undotree' }
@@ -82,20 +76,16 @@ return require('packer').startup(
-- git stuff
use { 'sindrets/diffview.nvim', requires = 'nvim-lua/plenary.nvim' }
- use { 'kdheepak/lazygit.nvim' }
use { 'tpope/vim-fugitive' }
use { 'tpope/vim-unimpaired' }
-- harpoon
use { "ThePrimeagen/harpoon" }
- -- reach
- use { "toppair/reach.nvim" }
-
- -- gitsigns
- use { 'lewis6991/gitsigns.nvim' }
-
-- tmux-vim-navigator
use { 'christoomey/vim-tmux-navigator' }
+ -- nodev
+ use { 'folke/neodev.nvim', opts = {} }
+
end)
diff --git a/suckless/.local/src/dwm/config.h b/suckless/.local/src/dwm/config.h
@@ -16,12 +16,12 @@ static int swallowfloating = 0; /* 1 means swallow floating windows by
static int smartgaps = 0; /* 1 means no outer gap when there is only one window */
static int showbar = 1; /* 0 means no bar */
static int topbar = 0; /* 0 means bottom bar */
-static char *fonts[] = { "monospace:size=8", "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
+static char *fonts[] = { "monospace:size=10", "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
static char normbgcolor[] = "#222222";
static char normbordercolor[] = "#444444";
static char normfgcolor[] = "#bbbbbb";
static char selfgcolor[] = "#eeeeee";
-static char selbordercolor[] = "#130e8c";
+static char selbordercolor[] = "#c0c0c0";
static char selbgcolor[] = "#222222";
static char *colors[][3] = {
/* fg bg border */
@@ -159,10 +159,10 @@ static const Key keys[] = {
TAGKEYS( XK_9, 8)
{ MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
- { MODKEY, XK_minus, spawn, SHCMD("wpctl set-volume @DEFAULT_SINK@ 5%-; kill -44 $(pidof dwmblocks)") },
- { MODKEY|ShiftMask, XK_minus, spawn, SHCMD("wpctl set-volume @DEFAULT_SINK@ 15%-; kill -44 $(pidof dwmblocks)") },
- { MODKEY, XK_equal, spawn, SHCMD("wpctl set-volume @DEFAULT_SINK@ 5%+; kill -44 $(pidof dwmblocks)") },
- { MODKEY|ShiftMask, XK_equal, spawn, SHCMD("wpctl set-volume @DEFAULT_SINK@ 15%+; kill -44 $(pidof dwmblocks)") },
+ { MODKEY, XK_minus, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -44 $(pidof dwmblocks)") },
+ { MODKEY|ShiftMask, XK_minus, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-; kill -44 $(pidof dwmblocks)") },
+ { MODKEY, XK_equal, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof dwmblocks)") },
+ { MODKEY|ShiftMask, XK_equal, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof dwmblocks)") },
{ MODKEY, XK_BackSpace, spawn, {.v = (const char*[]){ "sysact", NULL } } },
{ MODKEY|ShiftMask, XK_BackSpace, spawn, {.v = (const char*[]){ "sysact", NULL } } },
@@ -230,7 +230,7 @@ static const Key keys[] = {
{ MODKEY|ShiftMask, XK_n, spawn, SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
{ MODKEY, XK_m, spawn, {.v = (const char*[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
- { MODKEY|ShiftMask, XK_m, spawn, SHCMD("wpctl set-mute @DEFAULT_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+ { MODKEY|ShiftMask, XK_m, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
{ MODKEY, XK_comma, spawn, {.v = (const char*[]){ "mpc", "prev", NULL } } },
{ MODKEY|ShiftMask, XK_comma, spawn, {.v = (const char*[]){ "mpc", "seek", "0%", NULL } } },
{ MODKEY, XK_period, spawn, {.v = (const char*[]){ "mpc", "next", NULL } } },
diff --git a/x11/.config/x11/xresources b/x11/.config/x11/xresources
@@ -1,8 +1,8 @@
!! Transparency (0-1):
-*.alpha: 0.8
+*.alpha: 1
!! Set a default font and font size as below:
-*.font: monospace:size=9
+*.font: monospace:size=11
/* name dark light */
/* black 0 8 */
