From 2531b7c2940c4f36a15c7d55537b87b2030bc684 Mon Sep 17 00:00:00 2001 From: ange Date: Tue, 12 Mar 2024 13:47:16 +0100 Subject: [PATCH] feat: remove gtk2 --- .config/nvim/pack/plugins/opt/treesitter | 2 +- .config/suckless/dwm-6.4-6-g9f88553/config.h | 15 +++++++----- .config/zsh/aliases/general.zsh | 24 +++++++++----------- .config/zsh/aliases/git.zsh | 10 ++++---- .config/zsh/powerlevel10k | 2 +- .gnupg/gpg-agent.conf | 1 + .gtkrc-2.0 | 2 -- 7 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 .gtkrc-2.0 diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index 7ff51f5..8d3176c 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit 7ff51f53b0efb6228df2e8539b51bb2e737b77f3 +Subproject commit 8d3176cfbc0e3c5b8eadf4dfc20681878529c3af diff --git a/.config/suckless/dwm-6.4-6-g9f88553/config.h b/.config/suckless/dwm-6.4-6-g9f88553/config.h index cbfc5ad..48b1d43 100644 --- a/.config/suckless/dwm-6.4-6-g9f88553/config.h +++ b/.config/suckless/dwm-6.4-6-g9f88553/config.h @@ -8,10 +8,15 @@ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = { "monospace:size=10" }; static const char dmenufont[] = "monospace:size=10"; +static const char col_gray1[] = "#222222"; +static const char col_gray2[] = "#444444"; +static const char col_gray3[] = "#bbbbbb"; +static const char col_gray4[] = "#eeeeee"; +static const char col_cyan[] = "#005577"; static const char *colors[][3] = { /* fg bg border */ - [SchemeNorm] = { "#bbbbbb", "#222222", "#444444" }, - [SchemeSel] = { "#eeeeee", "#005577", "#005577" }, + [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, + [SchemeSel] = { col_gray4, col_cyan, col_cyan }, }; /* tagging */ @@ -50,15 +55,14 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-i", "-fn", dmenufont, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "alacritty", NULL }; static const char *lockcmd[] = { "lock", NULL }; static const char *wwwcmd[] = { "firefox", NULL }; static const char *pwwwcmd[] = { "firefox", "--private-window", NULL }; static const char *calccmd[] = { "alacritty", "-epython", NULL }; static const char *fmcmd[] = { "pcmanfm", NULL }; -static const char *prtsccmd[] = { "flameshot", "full", "-c", NULL }; -static const char *prtscrectcmd[] = { "flameshot", "gui", NULL }; +static const char *prtsccmd[] = { "sh", "-c", "gm import png:- | xclip -sel c -t image/png", NULL }; static const char *lvolcmd[] = { "set-vol", "-5", NULL }; static const char *rvolcmd[] = { "set-vol", "+5", NULL }; static const char *mutecmd[] = { "set-vol", "m", NULL }; @@ -85,7 +89,6 @@ static const Key keys[] = { { 0, XF86XK_Calculator, spawn, {.v = calccmd } }, { MODKEY, XK_e, spawn, {.v = fmcmd } }, { 0, XK_Print, spawn, {.v = prtsccmd } }, - { ShiftMask, XK_Print, spawn, {.v = prtscrectcmd } }, { 0, XF86XK_AudioLowerVolume, spawn, {.v = lvolcmd } }, { 0, XF86XK_AudioRaiseVolume, spawn, {.v = rvolcmd } }, { 0, XF86XK_AudioMute, spawn, {.v = mutecmd } }, diff --git a/.config/zsh/aliases/general.zsh b/.config/zsh/aliases/general.zsh index 88847d9..9b26d54 100644 --- a/.config/zsh/aliases/general.zsh +++ b/.config/zsh/aliases/general.zsh @@ -1,9 +1,9 @@ # vim: ft=zsh function update() { - $TERM --hold -e "$SHELL" -c "sudo pacman -Syu && echo -e '\e[32mDONE\e[0m'" & - $TERM --hold -e "$SHELL" -c "flatpak update && echo -e '\e[32mDONE\e[0m'" & - $TERM --hold -e "$SHELL" -c "git --git-dir='$HOME/.dotfiles/' --work-tree='$HOME' submodule update --remote --recursive --init && echo -e '\e[32mDONE\e[0m'" & + $TERM --hold -e "$SHELL" -ic "pac -Syu && echo -e '\e[32mDONE'" & + $TERM --hold -e "$SHELL" -ic "flatpak update && echo -e '\e[32mDONE'" & + $TERM --hold -e "$SHELL" -ic "config submodule update --remote --recursive && echo -e '\e[32mDONE'" & } alias pac='sudo pacman' \ @@ -18,7 +18,7 @@ alias config='git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME"' \ alias ssh='TERM=linux ssh' alias sudo='sudo ' \ - watch='watch -c -- ' \ + watch='watch -c ' \ xargs='xargs ' function j() { @@ -37,22 +37,20 @@ alias -g ...='../..' \ .....='../../../..' \ ......='../../../../..' -alias cp="cp -vi" \ - mv="mv -vi" \ - rm="rm -i" \ - mkdir="mkdir -v" \ - rsync="rsync -P" +alias cp='cp -vi' \ + mv='mv -vi' \ + rm='rm -vI' \ + mkdir='mkdir -v' \ + rsync='rsync -P' -alias ls='ls --color' \ +alias ls='ls --color=auto' \ ll='ls -lh' \ l='ll -a' \ la='ll -A' alias diff='diff --color' -alias grep="grep --color --exclude-dir={.bzr,.cache,.git,.hg,.idea,.svn,.tox,.venv,.vscode,CVS,node_modules}" \ - egrep="grep -E" \ - fgrep="grep -F" +alias grep='grep --color --exclude-dir={.bzr,.cache,.git,.hg,.idea,.svn,.tox,.venv,.vscode,CVS,node_modules}' alias monero='monero-wallet-cli \ --daemon-address monero.maby.dev:18081 \ diff --git a/.config/zsh/aliases/git.zsh b/.config/zsh/aliases/git.zsh index 3daff53..e684834 100644 --- a/.config/zsh/aliases/git.zsh +++ b/.config/zsh/aliases/git.zsh @@ -131,11 +131,11 @@ alias glg='git log --stat' alias glgp='git log --stat --patch' alias gignored='git ls-files -v | grep "^[[:lower:]]"' alias gfg='git ls-files | grep' -alias gm='git merge' -alias gma='git merge --abort' -alias gms="git merge --squash" -alias gmtl='git mergetool --no-prompt' -alias gmtlvim='git mergetool --no-prompt --tool=vimdiff' +alias gmr='git merge' +alias gmra='git merge --abort' +alias gmrs="git merge --squash" +alias gmrtl='git mergetool --no-prompt' +alias gmrtlvim='git mergetool --no-prompt --tool=vimdiff' alias gl='git pull' alias gpr='git pull --rebase' diff --git a/.config/zsh/powerlevel10k b/.config/zsh/powerlevel10k index 0cc19ac..d39e426 160000 --- a/.config/zsh/powerlevel10k +++ b/.config/zsh/powerlevel10k @@ -1 +1 @@ -Subproject commit 0cc19ac2ede35fd8accff590fa71df580dc7e109 +Subproject commit d39e4268355f7a10f7758982db2a59e485d2659a diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index 85405bc..9e025a0 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -1 +1,2 @@ enable-ssh-support +pinentry-program /usr/bin/pinentry-gnome3 diff --git a/.gtkrc-2.0 b/.gtkrc-2.0 deleted file mode 100644 index 2710ec8..0000000 --- a/.gtkrc-2.0 +++ /dev/null @@ -1,2 +0,0 @@ -gtk-theme-name = "Materia-dark" -gtk-icon-theme-name = "Papirus-Dark"