From d94fe2d07f49b60a240e34da4b980c8403f30283 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 13 Nov 2023 00:26:24 +0100 Subject: update --- .Xresources | 8 ++++---- .config/i3/config | 7 ++++++- .config/i3status/config | 10 +++++----- .config/neofetch/config.conf | 2 +- .config/nsxiv/exec/key-handler | 9 --------- .config/nvim/lua/user/plugins/lspconfig.lua | 2 +- .config/shell/aliasrc | 29 ++++++++--------------------- .config/shell/profile | 5 +++-- .config/tmux/tmux.conf | 3 +++ .config/x11/xinitrc | 6 +++--- .config/yt-dlp/config | 0 11 files changed, 34 insertions(+), 47 deletions(-) delete mode 100755 .config/nsxiv/exec/key-handler mode change 100755 => 100644 .config/yt-dlp/config diff --git a/.Xresources b/.Xresources index 42c0bf2..badf203 100644 --- a/.Xresources +++ b/.Xresources @@ -1,9 +1,9 @@ /* URxvt*font: xft:Hack Nerd Font Mono:size=11:antialias=True,xft:JoyPixels:pixelsize=10 */ -URxvt.font: xft:Iosevka:style=Regular:size=13:antialias=True,xft:JoyPixels:pixelsize=10 -URxvt.boldFont: xft:Iosevka Term:style=Bold:size=13:antialias=True -URxvt.italicFont: xft:Iosevka Term:style=Italic:size=13:antialias=True -URxvt.boldItalicFont: xft:Iosevka Term:style=Bold Italic:size=13:antialias=True +URxvt.font: xft:Iosevka:style=Regular:size=13:antialias=True,xft:JoyPixels:pixelsize=10,xft:WenQuanYi Micro Hei Mono:size=12 +URxvt.boldFont: xft:Iosevka:style=Bold:size=13:antialias=True +URxvt.italicFont: xft:Iosevka:style=Italic:size=13:antialias=True +URxvt.boldItalicFont: xft:Iosevka:style=Bold Italic:size=13:antialias=True !! colors and stuff /* URxvt.letterSpace: 0 */ diff --git a/.config/i3/config b/.config/i3/config index 39968b6..b740e24 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -6,10 +6,13 @@ set $mod Mod4 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:Hack Nerd Font 10 +font pango:Iosevka 10 for_window [class="floating"] floating enable +# no_focus [all] +# focus_on_window_activation none + # Use wpctl to adjust volume in Pipewire. set $refresh_i3status killall -SIGUSR1 i3status bindsym XF86AudioRaiseVolume exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 5%+ && $refresh_i3status @@ -151,6 +154,8 @@ bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { + font pango:Hack Nerd Font 10 position top + tray_output primary status_command i3status } diff --git a/.config/i3status/config b/.config/i3status/config index 315dae5..5e76340 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -11,20 +11,20 @@ general { interval = 5 } -order += "ethernet eth0" +order += "ethernet enp39s0" order += "disk /" order += "load" order += "memory" order += "volume master" order += "tztime local" -ethernet eth0{ - format_up = "eth0: %ip (%speed)" - format_down = "eth0: down" +ethernet enp39s0 { + format_up = "enp39s0: %ip (%speed)" + format_down = "enp39s0: down" } disk "/" { - format = "root: %avail" + format = "root: %used" } load { diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 8c29d6e..b1c0964 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -380,7 +380,7 @@ gtk3="off" # disk_show=('/'): # 'Disk (/): 74G / 118G (66%)' # -disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1') +disk_show=('/' '/dev/sda1' '/dev/sdb1') # Disk subtitle. # What to append to the Disk subtitle. diff --git a/.config/nsxiv/exec/key-handler b/.config/nsxiv/exec/key-handler deleted file mode 100755 index 7539f88..0000000 --- a/.config/nsxiv/exec/key-handler +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -while read -r file -do - case "$1" in - "C-d") rm "$file" ;; - "C-c") cat "$file" | xclip -sel c -t image/png ;; - esac -done diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 2e51445..5685ce7 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -89,7 +89,7 @@ require'lspconfig'.lua_ls.setup { flags = { debounce_text_changes = 150, }, - cmd = { "/home/cafebabe/.emacs.d/.cache/lsp/lua-language-server/bin/lua-language-server" }, + cmd = { "lua-language-server" }, } require 'lspconfig'.bashls.setup { diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 9338ed9..1ed8842 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,15 +1,15 @@ ## MISCELLANEOUS # various shortcuts -alias reboot='sudo reboot' -alias poweroff='sudo poweroff' +alias reboot='doas reboot' +alias poweroff='doas poweroff' alias refresh='. $ZDOTDIR/.zshrc' -alias zzz='sudo pm-suspend' -alias fuck='sudo $(fc -Lln -1)' +alias zzz='doas loginctl suspend' +alias fuck='doas $(fc -Lln -1)' alias open='xdg-open' alias mutt='cd ~/.mutt/attachments; mutt; cd -' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' -alias emd='/usr/local/bin/emacs --daemon &' +alias emd='/usr/bin/emacs --daemon &' alias emc='emacsclient -c -a "emacs"' alias vi='$EDITOR' alias z='zathura' @@ -80,9 +80,9 @@ alias rmdr='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary' alias lmlr='xrandr --auto --output DisplayPort-2 --mode 640x480 --left-of HDMI-A-0' alias lmmr='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0' alias lmdr='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0' -alias mbl='sudo ddcutil --display 1 setvcp 10 0 && sudo ddcutil --display 2 setvcp 10 0' -alias mbm='sudo ddcutil --display 1 setvcp 10 50 && sudo ddcutil --display 2 setvcp 10 50' -alias mbh='sudo ddcutil --display 1 setvcp 10 80 && sudo ddcutil --display 2 setvcp 10 80' +alias mbl='ddcutil --display 1 setvcp 10 10 && ddcutil --display 2 setvcp 10 10' +alias mbm='ddcutil --display 1 setvcp 10 50 && ddcutil --display 2 setvcp 10 50' +alias mbh='ddcutil --display 1 setvcp 10 80 && ddcutil --display 2 setvcp 10 80' # function for timer and stopwatch timer() { @@ -142,16 +142,3 @@ alias push='git push origin' alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias dcomm='dfiles commit -m' alias dpush='dfiles push origin' - -# package management -alias aptsr='apt search' -alias aptsh='apt show' -alias aptin='sudo apt-get install' -alias aptrm='sudo apt-get remove --autoremove' -alias aptarm='sudo apt-get autoremove' -alias aptupd='sudo apt-get update' -alias aptupg='sudo apt-get upgrade' -alias aptup='aptupd && aptupg' -alias aptli='apt list --installed' -alias aptlu='apt list --upgradable' -alias aptman='apt-mark showmanual' diff --git a/.config/shell/profile b/.config/shell/profile index 05fd3d7..3b8d72b 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -28,7 +28,8 @@ export EIX_LIMIT_COMPACT=0 export LC_ALL=en_US.utf8 -export LD_LIBRARY_PATH="/usr/lib:/usr/local/lib" -export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64" +export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib64/pkgconfig" +export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.npm/bin:/sbin:/usr/sbin" neofetch diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index dc495a9..8bd037f 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -20,6 +20,9 @@ set -g default-terminal "tmux-256color" # Set history-limit set -g history-limit 30000 +# enable emacs mode-keys +set -g mode-keys emacs + # various window option set -g base-index 1 set -g pane-base-index 1 diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index d2db958..93065e5 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -7,8 +7,8 @@ fi eval "$(gpg-agent --daemon --allow-preset-passphrase)" eval "$(ssh-agent)" -xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary -xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 +xrandr --auto --output DisplayPort-2 --mode 1920x1080 --primary +xrandr --auto --output HDMI-A-0 --mode 1600x900 --left-of DisplayPort-2 xset r rate 250 30 xset s off -dpms @@ -16,7 +16,7 @@ setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,gr xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & -/usr/local/bin/emacs --daemon & +/usr/bin/emacs --daemon & urxvtd -q -o -f & pipewire & diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config old mode 100755 new mode 100644 -- cgit v1.2.3