From 5e91cd6c9388eeb4d7ac510bfb66f515e34944a0 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 7 Apr 2023 15:25:33 +0200 Subject: stopped using vim mode in zsh. it was annoying --- .config/neofetch/config.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.config/neofetch/config.conf') diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 149ab2e..5fff961 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -364,7 +364,7 @@ gtk3="off" # disk_show=('/'): # 'Disk (/): 74G / 118G (66%)' # -disk_show=('/' '/home' '/dev/sda2' '/dev/sdb1') +disk_show=('/' '/home' '/dev/sda2') # Disk subtitle. # What to append to the Disk subtitle. -- cgit v1.2.3 From c2f9e9f3d01a9276f7c5f740c999a63e28ec23a8 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 15 Apr 2023 09:41:27 +0200 Subject: updated package manager aliases for portage --- .config/mpv/mpv.conf | 1 + .config/mpv/script-opts/encode_webm.conf | 2 +- .config/neofetch/config.conf | 2 +- .config/picom/picom.conf | 10 ---------- .config/shell/aliasrc | 30 +++++++++++++----------------- .config/shell/profile | 10 ++++------ .config/tmux/tmux.conf | 2 ++ .config/x11/xinitrc | 14 +++++--------- .config/zsh/.zshrc | 8 ++++++-- 9 files changed, 33 insertions(+), 46 deletions(-) (limited to '.config/neofetch/config.conf') diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index e467c61..d6d468d 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -3,6 +3,7 @@ profile=gpu-hq #cscale=ewa_lanczossharp vo=gpu +hwdec=vdpau keep-open=yes stop-screensaver diff --git a/.config/mpv/script-opts/encode_webm.conf b/.config/mpv/script-opts/encode_webm.conf index 93dbb74..f6d661c 100644 --- a/.config/mpv/script-opts/encode_webm.conf +++ b/.config/mpv/script-opts/encode_webm.conf @@ -13,7 +13,7 @@ preserve_filters=yes append_filter= # additional parameters passed to ffmpeg -codec=-c:v libvpx-vp9 -b:v 800k -c:a libvorbis +codec=-c:v libvpx-vp9 -crf 1 -b:v 1M -c:a libvorbis # format of the output filename # Does basic interpolation on the following variables: $f, $x, $t, $s, $e, $d, $p, $n which respectively represent diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 5fff961..0707571 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -745,7 +745,7 @@ ascii_distro="auto" # Example: # ascii_colors=(distro) - Ascii is colored based on Distro colors. # ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. -ascii_colors=(88 88 88 88 88 88) +ascii_colors=(distro) # Bold ascii logo # Whether or not to bold the ascii logo. diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 335f0de..fa4d989 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -1,16 +1,6 @@ # just very slightly rounded corners # empty file, just so transparency works on st -backend = "glx"; -blur-kern = "3x3box"; -blur-method = "dual_kawase"; -blur-strength = 2; - -opacity-rule = [ - "98:class_g = 'SchildiChat' && focused", - "98:class_g = 'SchildiChat' && !focused" -] - # corner-radius = 6 # rounded-corners-exclude = [ diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 623377f..46e9ce4 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,24 +1,23 @@ ## MISCELLANEOUS # various shortcuts -alias reboot='sudo reboot' -alias poweroff='sudo poweroff' -alias pms='sudo pm-suspend' -alias refresh='source $ZDOTDIR/.zshrc' -alias fuck='sudo $(fc -Lln -1)' +alias reboot='doas reboot' +alias poweroff='doas poweroff' +alias refresh='. $ZDOTDIR/.zshrc' +alias fuck='doas $(fc -Lln -1)' alias open='xdg-open' alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias vi="$EDITOR" -alias em='emacsclient -c -a "emacs" &' -alias emacsd='/usr/local/bin/emacs --daemon &' +alias emacsd='/usr/bin/emacs --daemon &' alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' alias ea='vi ~/.config/shell/aliasrc' +alias ez='vi ~/.config/zsh/.zshrc' alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' alias cam='mpv --profile=low-latency --untimed /dev/video0' -alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' +alias freyr='doas docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' alias ofn='/usr/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # setting custom ascii @@ -120,12 +119,9 @@ alias dpush='dfiles push origin' ## PACKAGE MANAGER -alias aptin='sudo apt install' -alias aptup='sudo apt update && sudo apt upgrade' -alias aptupd='sudo apt update' -alias aptupg='sudo apt upgrade' -alias aptrm='sudo apt remove' -alias aptsr='sudo apt search' -alias aptsh='sudo apt show' -alias listup='sudo apt list --upgradeable' -alias listin='sudo apt list --installed' +alias eq='equery uses' +alias emin='doas emerge -av' +alias emrm='doas emerge -ac' +alias emup='doas emerge -avuND @world' +alias ems='emerge -s' + diff --git a/.config/shell/profile b/.config/shell/profile index 0093eed..b443e3b 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,9 +1,9 @@ umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 -export EDITOR="nvim" +export EDITOR="nano" export TERMINAL="st" -export BROWSER="firefox" +export BROWSER="icecat" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" @@ -12,8 +12,6 @@ export XDG_CACHE_HOME="$HOME/.cache" export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export LC_ALL=en_US.UTF-8 - export MAIL=~/.mutt/Maildir export NO_AT_BRIDGE=1 @@ -22,9 +20,9 @@ export QT_IM_MODULE='ibus' export XMODIFIERS='@im=ibus' export XDG_SESSION_TYPE='x11' -export NVM_DIR="$HOME/.config/nvm" +export VDPAU_DRIVER=radeonsi -export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.cargo/bin:/sbin:/usr/sbin:$HOME/.rvm/bin" +export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 1db3b54..9ad7b50 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -1,3 +1,5 @@ +set -g default-command "${SHELL}" + # Status-bar settings set -g status-right "%H:%M" set -g window-status-current-style "underscore" diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 76a3ff5..8ccffd0 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -1,10 +1,7 @@ #!/bin/sh -if [ -d "/etc/X11/Xsession.d" ]; then - for f in /etc/X11/Xsession.d/*; do - [ -x "$f" ] && . "$f" - done - unset f +if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; then + eval $(dbus-launch --sh-syntax --exit-with-session) fi rfkill block all @@ -19,13 +16,12 @@ setxkbmap -option "ctrl:nocaps" xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 -ibus-daemon -dxrR -/usr/local/bin/emacs --daemon & -statusbar & +~/.fehbg +/usr/bin/emacs --daemon & pipewire & mpd & picom & -set-wallpaper & +statusbar & exec dwm diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index bdf3049..22e2763 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -11,8 +11,12 @@ _comp_options+=(globdots) setopt PROMPT_SUBST +# use emacs keybindings bindkey -e +# fix del key just inserting a tilde +bindkey "^[[3~" delete-char + PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%b ' setopt extendedGlob @@ -36,8 +40,8 @@ setopt pushd_ignore_dups setopt pushd_minus -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +#[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +#[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion if [ -f $XDG_CONFIG_HOME/.dircolors ]; then eval "$(dircolors -b $XDG_CONFIG_HOME/.dircolors)" -- cgit v1.2.3 From 23f3dcc4cc986507ba20a30d9312be9a3fc9d188 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 24 Jun 2023 02:22:27 +0200 Subject: regular update --- .config/mpd/mpd.conf | 2 +- .config/neofetch/config.conf | 2 +- .config/nyxt/config.lisp | 9 ++++++++- .config/pipewire/pipewire.conf | 6 +++--- .config/shell/aliasrc | 1 - .config/tmux/tmux.conf | 4 ++-- .config/x11/xinitrc | 1 + 7 files changed, 16 insertions(+), 9 deletions(-) (limited to '.config/neofetch/config.conf') diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 2ebf6b5..4bdd05b 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -10,7 +10,7 @@ state_file "~/.config/mpd/mpdstate" # default local output audio_output { - type "pipewire" + type "pulse" name "Default" } diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 0707571..75234fc 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -364,7 +364,7 @@ gtk3="off" # disk_show=('/'): # 'Disk (/): 74G / 118G (66%)' # -disk_show=('/' '/home' '/dev/sda2') +disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1') # Disk subtitle. # What to append to the Disk subtitle. diff --git a/.config/nyxt/config.lisp b/.config/nyxt/config.lisp index c28b669..bfdb308 100644 --- a/.config/nyxt/config.lisp +++ b/.config/nyxt/config.lisp @@ -32,7 +32,14 @@ (define-configuration nyxt/mode/user-script:user-script-mode ((nyxt/mode/user-script:user-scripts (list - (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/4chan-x.user.js"))))) + (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/4chan-x.user.js") + (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/onee-chan.user.js"))))) + +(define-configuration nyxt/mode/proxy:proxy-mode + ((nyxt/mode/proxy:proxy (make-instance 'proxy + :url (quri:uri "socks5://localhost:9050") + :allowlist '("localhost" "localhost:8080") + :proxied-downloads-p t)))) (define-configuration (:modable-buffer :prompt-buffer :editor-buffer) ((default-modes `(:emacs-mode ,@%slot-value%)))) diff --git a/.config/pipewire/pipewire.conf b/.config/pipewire/pipewire.conf index af1ff82..7073ff8 100644 --- a/.config/pipewire/pipewire.conf +++ b/.config/pipewire/pipewire.conf @@ -26,10 +26,10 @@ context.properties = { core.name = pipewire-0 # core name and socket name ## Properties for the DSP configuration. - #default.clock.rate = 48000 + default.clock.rate = 48000 #default.clock.allowed-rates = [ 48000 ] - #default.clock.quantum = 1024 - default.clock.min-quantum = 16 + default.clock.quantum = 192 + default.clock.min-quantum = 192 #default.clock.max-quantum = 2048 #default.clock.quantum-limit = 8192 #default.video.width = 640 diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 330bb8a..396915d 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -129,4 +129,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' - diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index caf8066..55f477c 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -34,8 +34,8 @@ set -g prefix C-Space unbind C-b bind C-Space send-prefix -bind C-v split-window -v -c "#{pane_current_path}" -bind C-s split-window -h -c "#{pane_current_path}" +bind C-s split-window -v -c "#{pane_current_path}" +bind C-v split-window -h -c "#{pane_current_path}" bind C-w killp bind C-q killw bind C-p previous-window diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index a3a9bda..05fa704 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -16,6 +16,7 @@ xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 ~/.local/bin/set-wallpaper & /usr/bin/emacs --daemon & +otd & pipewire & mpd & picom & -- cgit v1.2.3 From 342b7b50d4f95ebf8f17b3696d4f5b9c116e75a8 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 29 Aug 2023 23:55:34 +0200 Subject: update configs --- .config/mpv/mpv.conf | 1 + .config/neofetch/config.conf | 2 +- .config/nvim/lua/user/plugins.lua | 5 --- .config/nvim/plugin/packer_compiled.lua | 62 ++++++++++++++------------------- .config/shell/aliasrc | 41 ++++++++++++++-------- .config/shell/profile | 4 ++- .config/x11/xinitrc | 15 ++++---- .config/zsh/.zshrc | 2 +- 8 files changed, 67 insertions(+), 65 deletions(-) (limited to '.config/neofetch/config.conf') diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index d5267b6..421f269 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -21,5 +21,6 @@ screenshot-template="%F - [%P]v%#01n" [extension.webm] loop-file=inf + [extension.gif] loop-file=inf diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 75234fc..a3c25ce 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -500,7 +500,7 @@ mpc_args=() # Example: # colors=(distro) - Text is colored based on Distro colors. # colors=(4 6 1 8 8 6) - Text is colored in the order above. -colors=(201 51 93 5 7 7) +colors=(distro) # Text Options diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 53823f8..07f8f42 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -99,9 +99,4 @@ require('packer').startup(function() require('user.plugins.luasnip') end } - use {'nvim-orgmode/orgmode', - config = function() - require('user.plugins.orgmode') - end - } end) diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 2616c59..d97b824 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/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 @@ -183,12 +183,6 @@ _G.packer_plugins = { path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", url = "https://github.com/kyazdani42/nvim-web-devicons" }, - orgmode = { - config = { "\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.orgmode\frequire\0" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/orgmode", - url = "https://github.com/nvim-orgmode/orgmode" - }, ["packer.nvim"] = { loaded = true, path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/packer.nvim", @@ -253,22 +247,6 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) --- Config for: lualine.nvim -time([[Config for lualine.nvim]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") -time([[Config for lualine.nvim]], false) -- Config for: nvim-ts-autotag time([[Config for nvim-ts-autotag]], true) try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") @@ -277,26 +255,38 @@ time([[Config for nvim-ts-autotag]], false) time([[Config for nvim-lspconfig]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig") time([[Config for nvim-lspconfig]], false) --- Config for: orgmode -time([[Config for orgmode]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.orgmode\frequire\0", "config", "orgmode") -time([[Config for orgmode]], false) --- Config for: dracula -time([[Config for dracula]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") -time([[Config for dracula]], false) --- Config for: LuaSnip -time([[Config for LuaSnip]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") -time([[Config for LuaSnip]], false) +-- Config for: lualine.nvim +time([[Config for lualine.nvim]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") +time([[Config for lualine.nvim]], false) -- Config for: nvim-tree.lua time([[Config for nvim-tree.lua]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua") time([[Config for nvim-tree.lua]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) +-- Config for: LuaSnip +time([[Config for LuaSnip]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") +time([[Config for LuaSnip]], false) -- Config for: nvim-autopairs time([[Config for nvim-autopairs]], true) try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") time([[Config for nvim-autopairs]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) +-- Config for: dracula +time([[Config for dracula]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") +time([[Config for dracula]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 20ed30a..abf8ebb 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,35 +1,37 @@ ## MISCELLANEOUS # various shortcuts -alias reboot='doas reboot' -alias poweroff='doas poweroff' +alias reboot='sudo reboot' +alias poweroff='sudo poweroff' alias refresh='. $ZDOTDIR/.zshrc' -alias fuck='doas $(fc -Lln -1)' +alias fuck='sudo $(fc -Lln -1)' alias open='xdg-open' alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias emacsd='/usr/bin/emacs --daemon &' alias vi='$EDITOR' alias z='zathura' -alias cn='clear;neofetch' alias nnn='nnn -Hde' +alias cn='clear;neofetch' alias ea='vi ~/.config/shell/aliasrc' alias ez='vi ~/.config/zsh/.zshrc' alias eq='equery' alias sr='su - root' alias cam='mpv --profile=low-latency --untimed /dev/video0' +alias df='df -h' +alias tma='tmux a -t' # need to sign hid-nintendo.ko with every kernel update -alias signmod='doas /usr/src/linux/scripts/sign-file sha512 /usr/src/linux/certs/signing_key.pem /usr/src/linux/certs/signing_key.x509' +alias signmod='sudo /usr/src/linux/scripts/sign-file sha512 /usr/src/linux/certs/signing_key.pem /usr/src/linux/certs/signing_key.x509' # rename files in pwd in their current order to 4-digit numbers alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # start freyr docker image to download music from spotify -#alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' +# alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' # set my preferred keyboard options -alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' +alias setkeys='xset r rate 250 30 && setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"' # pad numbers in filenames with zeros alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' @@ -59,18 +61,29 @@ lsd() { fi } +gls() { + if [ "$2" = "" ]; then + ls | grep "$1" + else + ls "$2" | grep "$1" + fi +} + # control audio alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)" alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)" alias setvol='pactl set-sink-volume @DEFAULT_SINK@' -# monitor / resolution settings, mainly for playing old-ass games -alias setrmon-lowres='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary' -alias setrmon-midres='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary' -alias setrmon-default='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary' -alias setlmon-lowres='xrandr --auto --output DisplayPort-2 --mode 640x480 --left-of HDMI-A-0' -alias setlmon-midres='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0' -alias setlmon-default='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0' +# monitor settings +alias rmlr='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary' +alias rmmr='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary' +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 && doas ddcutil --display 2 setvcp 10 0' +alias mbm='sudo ddcutil --display 1 setvcp 10 50 && doas ddcutil --display 2 setvcp 10 50' +alias mbh='sudo ddcutil --display 1 setvcp 10 80 && doas ddcutil --display 2 setvcp 10 80' # function for timer and stopwatch timer() { diff --git a/.config/shell/profile b/.config/shell/profile index b181879..397b25a 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -3,7 +3,7 @@ umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 export EDITOR="nvim" export TERMINAL="st" -export BROWSER="firefox-bin" +export BROWSER="firefox" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" @@ -25,6 +25,8 @@ export VDPAU_DRIVER=radeonsi export EIX_LIMIT=0 export EIX_LIMIT_COMPACT=0 +export LC_ALL=en_US.utf8 + export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" neofetch diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 05fa704..5150125 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -1,23 +1,24 @@ #!/bin/sh -if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; then - eval $(dbus-launch --sh-syntax --exit-with-session) -fi +# if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; then +# eval $(dbus-launch --sh-syntax --exit-with-session) +# fi -eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" +eval "$(gpg-agent --daemon --allow-preset-passphrase)" eval "$(ssh-agent)" xset r rate 200 20 xset s off -dpms -setxkbmap -option "ctrl:nocaps" +setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle" xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 ~/.local/bin/set-wallpaper & -/usr/bin/emacs --daemon & -otd & +# /usr/bin/emacs --daemon & + pipewire & +otd-daemon & mpd & picom & statusbar & diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 378ce10..19cc643 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -61,7 +61,7 @@ fi # FZF Section export FZF_DEFAULT_OPS="--extended" -export FZF_DEFAULT_COMMAND="fdfind --type f" +export FZF_DEFAULT_COMMAND="find -type f" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" if [ -f $HOME/.fzf/fzf.zsh ]; then -- cgit v1.2.3 From b423014b0e51a8324e7ff0fb925d7e7c4000cd45 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 30 Oct 2023 14:11:13 +0100 Subject: update for new system --- .config/neofetch/config.conf | 30 ++++++++--------- .config/nvim/init.lua | 1 + .config/nvim/lua/user/keymaps.lua | 8 +++++ .config/nvim/lua/user/options.lua | 49 +++++++++++++-------------- .config/nvim/lua/user/plugins.lua | 1 - .config/nvim/lua/user/plugins/lspconfig.lua | 51 +++++++++++------------------ .config/nvim/plugin/packer_compiled.lua | 41 ++++++++++------------- .config/shell/aliasrc | 31 ++++++++++++------ .config/x11/xinitrc | 16 ++++----- 9 files changed, 116 insertions(+), 112 deletions(-) (limited to '.config/neofetch/config.conf') diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index a3c25ce..342ef76 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -4,19 +4,19 @@ print_info() { info title # prin "\n \n " "$(curl wttr.in/?0?q?T | awk '/°(C|F)/ {printf $(NF-1) $(NF) " ("a")"} /,/ {a=$0}')" prin "${cl9}┌────────────────────────────────────────────────────┐" - info "\n \n  " distro - info "\n \n  " model - info "\n \n  " kernel - info "\n \n  " uptime - info "\n \n  " packages - info "\n \n  " shell - info "\n \n  " resolution - info "\n \n  " wm - info "\n \n  " term - info "\n \n  " cpu - info "\n \n  " gpu - info "\n \n  " memory - info "\n \n  " disk + info "\n \n OS" distro + info "\n \n Host" model + info "\n \n Kernel" kernel + info "\n \n Uptime" uptime + info "\n \n Packages" packages + info "\n \n Shell" shell + info "\n \n Screens" resolution + info "\n \n WM" wm + info "\n \n Terminal" term + info "\n \n CPU" cpu + info "\n \n GPU" gpu + info "\n \n Memory" memory + info "\n \n " disk prin "${cl9}└─────────────────────────────────── $(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8) ${cl9}┘" prin "\n" } @@ -388,7 +388,7 @@ disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1') # none: 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' -disk_subtitle="none" +disk_subtitle="dir" # Disk percent. # Show/Hide disk percent. @@ -537,7 +537,7 @@ underline_char="-" # Example: # separator="->": 'Shell-> bash' # separator=" =": 'WM = dwm' -separator=" " +separator=":" # Color Blocks diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index f71bdb7..49556fb 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -10,5 +10,6 @@ require('user.options') require('user.plugins') require('user.keymaps') require('user.misc') +-- require('user.dvorak') --vim: nospell diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua index b174f65..777d099 100644 --- a/.config/nvim/lua/user/keymaps.lua +++ b/.config/nvim/lua/user/keymaps.lua @@ -2,6 +2,7 @@ local keymap = require 'lib.utils'.keymap vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' +vim.g.tmux_navigator_no_mappings=1 keymap('n', 'Q', ':bufdo bdelete') @@ -23,3 +24,10 @@ keymap('i', 'jj', '') keymap('n', 'cd', ':cd %:p:h:pwd') keymap('n', 'E', ':EslintFixAll') + +-- Change tmux-navigator keybinds +keymap('n', '', ':TmuxNavigateLeft') +keymap('n', '', ':TmuxNavigateDown') +keymap('n', '', ':TmuxNavigateUp') +keymap('n', '', ':TmuxNavigateRight') +keymap('n', '', ':TmuxNavigatePrevious') diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua index 53fbe43..510485f 100644 --- a/.config/nvim/lua/user/options.lua +++ b/.config/nvim/lua/user/options.lua @@ -1,24 +1,25 @@ -vim.o.guicursor = 'a:block' -vim.o.expandtab = true -vim.o.shiftwidth = 4 -vim.o.tabstop = 4 -vim.o.signcolumn = 'yes:2' -vim.o.relativenumber = true -vim.o.number = true -vim.o.termguicolors = true -vim.o.ignorecase = true -vim.o.smartcase = true -vim.o.wildmode = 'longest:full,full' -vim.o.wrap = false -vim.o.scrolloff = 8 -vim.o.sidescrolloff = 8 -vim.o.cursorline = 1 -vim.o.splitright = 1 -vim.o.splitbelow = 1 -vim.o.clipboard = 'unnamedplus' -- Use Linux system clipboard -vim.o.updatetime = 250 -- Decrease CursorHold delay -vim.o.redrawtime = 10000 -- Allow more time for loading syntax -vim.o.foldmethod = "expr" -vim.o.foldlevelstart = 10 -vim.o.foldexpr = "nvim_treesitter#foldexpr()" -vim.o.hlsearch = 0 +vim.o.guicursor='a:block' +vim.o.expandtab=true +vim.o.shiftwidth=4 +vim.o.softtabstop=4 +vim.o.tabstop=4 +vim.o.signcolumn='yes:2' +vim.o.relativenumber=true +vim.o.number=true +vim.o.termguicolors=true +vim.o.ignorecase=true +vim.o.smartcase=true +vim.o.wildmode='longest:full,full' +vim.o.wrap=false +vim.o.scrolloff=8 +vim.o.sidescrolloff=8 +vim.o.cursorline=true +vim.o.splitright=true +vim.o.splitbelow=true +vim.o.clipboard='unnamedplus' +vim.o.updatetime=250 +vim.o.redrawtime=10000 +vim.o.foldmethod="expr" +vim.o.foldlevelstart=10 +vim.o.foldexpr="nvim_treesitter#foldexpr()" +vim.o.hlsearch=false diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 07f8f42..ae21e4f 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -3,7 +3,6 @@ require('packer').startup(function() use { 'tpope/vim-commentary' } use { 'tpope/vim-surround' } use { 'tpope/vim-eunuch' } - use { 'tpope/vim-sleuth' } use { 'christoomey/vim-tmux-navigator' } use { diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 39f27c3..67d82a7 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -59,38 +59,27 @@ require 'lspconfig'.emmet_ls.setup { filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'eruby' } } -local runtime_path = vim.split(package.path, ';') -table.insert(runtime_path, "lua/?.lua") -table.insert(runtime_path, "lua/?/init.lua") -require 'lspconfig'.lua_ls.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, - cmd = { "/home/cafebabe/.local/share/lua-language-server/bin/lua-language-server", "-E", "/home/cafebabe/.local/share/lua-language-server/bin/main.lua" }; - settings = { - Lua = { - runtime = { - -- Tell language server which version of lua is used. - version = 'LuaJIT', - -- Setup lua path - path = runtime_path, - }, - diagnostics = { - -- Recognize globals - globals = { 'vim', 'use', 'parse' }, - }, - workspace = { - -- Make server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - -- Do not send telemetry data - telemetry = { - enable = false, - }, +require'lspconfig'.lua_ls.setup { + on_init = function(client) + local path = client.workspace_folders[1].name + if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then + client.config.settings = vim.tbl_deep_extend('force', client.config.settings.Lua, { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT' }, - }, + -- Make the server aware of Neovim runtime files + workspace = { + library = { vim.env.VIMRUNTIME } + -- or pull in all of 'runtimepath'. NOTE: this is a lot slower + -- library = vim.api.nvim_get_runtime_file("", true) + } + }) + + client.notify("workspace/didChangeConfiguration", { settings = client.config.settings }) + end + return true + end } require 'lspconfig'.bashls.setup { diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index d97b824..a009beb 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/lua/5.1/?.so" +local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/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 @@ -229,11 +229,6 @@ _G.packer_plugins = { path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-eunuch", url = "https://github.com/tpope/vim-eunuch" }, - ["vim-sleuth"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-sleuth", - url = "https://github.com/tpope/vim-sleuth" - }, ["vim-surround"] = { loaded = true, path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-surround", @@ -247,14 +242,18 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: nvim-ts-autotag -time([[Config for nvim-ts-autotag]], true) -try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") -time([[Config for nvim-ts-autotag]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) -- Config for: nvim-lspconfig time([[Config for nvim-lspconfig]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig") time([[Config for nvim-lspconfig]], false) +-- Config for: nvim-ts-autotag +time([[Config for nvim-ts-autotag]], true) +try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") +time([[Config for nvim-ts-autotag]], false) -- Config for: lualine.nvim time([[Config for lualine.nvim]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") @@ -263,26 +262,22 @@ time([[Config for lualine.nvim]], false) time([[Config for nvim-tree.lua]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua") time([[Config for nvim-tree.lua]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) -- Config for: LuaSnip time([[Config for LuaSnip]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") time([[Config for LuaSnip]], false) --- Config for: nvim-autopairs -time([[Config for nvim-autopairs]], true) -try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") -time([[Config for nvim-autopairs]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) -- Config for: telescope.nvim time([[Config for telescope.nvim]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") time([[Config for telescope.nvim]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) -- Config for: dracula time([[Config for dracula]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index abf8ebb..4358402 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -4,25 +4,24 @@ alias reboot='sudo reboot' alias poweroff='sudo poweroff' alias refresh='. $ZDOTDIR/.zshrc' +alias zzz='sudo zzz' alias fuck='sudo $(fc -Lln -1)' alias open='xdg-open' -alias mutt='pushd ~/.mutt/attachments; mutt; popd' +alias mutt='cd ~/.mutt/attachments; mutt; cd -' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' -alias emacsd='/usr/bin/emacs --daemon &' +alias emacsd='/usr/local/bin/emacs --daemon &' +alias em='emacsclient -c -a "emacs"' alias vi='$EDITOR' alias z='zathura' alias nnn='nnn -Hde' alias cn='clear;neofetch' alias ea='vi ~/.config/shell/aliasrc' alias ez='vi ~/.config/zsh/.zshrc' -alias eq='equery' alias sr='su - root' alias cam='mpv --profile=low-latency --untimed /dev/video0' alias df='df -h' alias tma='tmux a -t' - -# need to sign hid-nintendo.ko with every kernel update -alias signmod='sudo /usr/src/linux/scripts/sign-file sha512 /usr/src/linux/certs/signing_key.pem /usr/src/linux/certs/signing_key.x509' +alias tmn='tmux new-session -s' # rename files in pwd in their current order to 4-digit numbers alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' @@ -32,6 +31,7 @@ alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf # set my preferred keyboard options alias setkeys='xset r rate 250 30 && setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"' +alias setus='setxkbmap -layout us,us -option "ctrl:nocaps"' # pad numbers in filenames with zeros alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' @@ -81,9 +81,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 && doas ddcutil --display 2 setvcp 10 0' -alias mbm='sudo ddcutil --display 1 setvcp 10 50 && doas ddcutil --display 2 setvcp 10 50' -alias mbh='sudo ddcutil --display 1 setvcp 10 80 && doas ddcutil --display 2 setvcp 10 80' +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' # function for timer and stopwatch timer() { @@ -125,7 +125,7 @@ date-reverse() { # convert video files to webm mkwebm() { - ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm + ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 32 -b:v 300K -c:a libvorbis "${1%.*}".webm } ## GIT @@ -143,3 +143,14 @@ 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 manager +alias pacin='sudo pacman -S' +alias pacrm='sudo pacman -Rns' +alias pacup='sudo pacman -Syu' +alias pacsr='pacman -Ss' +alias pacbr='pacman -Slq | fzf --preview "pacman -Si {}" --layout=reverse' +alias yayin='yay -S' +alias yayrm='yay -Rns' +alias yayup='yay -Syu' +alias yaysr='yay -Ss' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 5150125..b879037 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -4,23 +4,23 @@ # eval $(dbus-launch --sh-syntax --exit-with-session) # fi -eval "$(gpg-agent --daemon --allow-preset-passphrase)" +# 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 + xset r rate 200 20 xset s off -dpms setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle" - -xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary -xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 +xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & # /usr/bin/emacs --daemon & +urxvtd -q -o -f & pipewire & -otd-daemon & -mpd & picom & -statusbar & +mpd & -exec dwm +exec i3 -- cgit v1.2.3 From a86a9b0100fd406b910467f078b86fc40f240a5d Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 30 Oct 2023 17:54:49 +0100 Subject: added .Xresources to tracked files --- .Xresources | 47 +++++++++++++++++++++++++++++++++++ .config/neofetch/config.conf | 58 +++++++++++++++++++++++++++++--------------- .config/shell/aliasrc | 24 ++++++++---------- .config/x11/xinitrc | 12 ++++----- 4 files changed, 101 insertions(+), 40 deletions(-) create mode 100644 .Xresources (limited to '.config/neofetch/config.conf') diff --git a/.Xresources b/.Xresources new file mode 100644 index 0000000..14fc10e --- /dev/null +++ b/.Xresources @@ -0,0 +1,47 @@ +URxvt*font: xft:Hack Nerd Font Mono:size=11:antialias=True,xft:JoyPixels:pixelsize=10 + +!! colors and stuff +URxvt.letterSpace: 0 +URxvt.scrollBar: False +URxvt.depth: 32 +URxvt.background: [90]#000000 +URxvt.foreground: #ffffff +URxvt.externalBorder: 0 +URxvt.internalBorder: 0 +URxvt.backgroundBorder: 0 +URxvt.borderLess: False +!! black +URxvt.color0: #000000 +URxvt.color8: #343636 +!! red +URxvt.color1: #e74c7c +URxvt.color9: #c26f6f +!! green +URxvt.color2: #6bb05d +URxvt.color10: #8dc776 +!! yellow +URxvt.color3: #e59e67 +URxvt.color11: #e7ac7e +!! indigo +URxvt.color4: #5b98a9 +URxvt.color12: #7ab3c3 +!! lavender +URxvt.color5: #b185db +URxvt.color13: #bb84e5 +!! cyan +URxvt.color6: #51a39f +URxvt.color14: #6db0ad +!! white +URxvt.color7: #c4c4c4 +URxvt.color15: #cccccc + + +!! perl extensions +URxvt.perl-ext-common: default,url-select,resize-font,selection-to-clipboard +URxvt.matcher.button: 1 +URxvt.keysym.M-u: perl:url-select:select_next +URxvt.url-select.launcher: /usr/bin/xdg-open +URxvt.url-select.underline: true + +URxvt.iso14755: False +URxvt.iso14755_52: False diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 342ef76..14bb86b 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -1,31 +1,49 @@ # See this wiki page for more info # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info + print_info() { info title - # prin "\n \n " "$(curl wttr.in/?0?q?T | awk '/°(C|F)/ {printf $(NF-1) $(NF) " ("a")"} /,/ {a=$0}')" - prin "${cl9}┌────────────────────────────────────────────────────┐" - info "\n \n OS" distro - info "\n \n Host" model - info "\n \n Kernel" kernel - info "\n \n Uptime" uptime - info "\n \n Packages" packages - info "\n \n Shell" shell - info "\n \n Screens" resolution - info "\n \n WM" wm - info "\n \n Terminal" term - info "\n \n CPU" cpu - info "\n \n GPU" gpu - info "\n \n Memory" memory - info "\n \n " disk - prin "${cl9}└─────────────────────────────────── $(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8) ${cl9}┘" + prin "\n" + prin "${cl9}┌─────────────────────────────────────────────────────┐" + info "\n \n " distro + info "\n \n " model + info "\n \n " kernel + info "\n \n " uptime + info "\n \n 󰏗" packages + info "\n \n " shell + info "\n \n " resolution + info "\n \n " de + info "\n \n 󰔎"theme + info "\n \n " term + info "\n \n " term_font + info "\n \n " cpu + info "\n \n 󰊚" gpu + info "\n \n " memory + info "\n \n " disk + prin "${cl9}└──────────────────────────────────── ${cl0} ${cl1} ${cl2} ${cl3} ${cl4} ${cl5} ${cl6} $(color 15) ${cl9}┘" prin "\n" } reset="\033[0m" - +gray="\033[1;90m" +red="\033[1;31m" +green="\033[1;32m" +yellow="\033[1;33m" +blue="\033[1;34m" +magenta="\033[1;35m" +cyan="\033[1;36m" +white="\033[1;37m" + +cl0="${gray}" +cl1="${red}" +cl2="${green}" +cl3="${yellow}" +cl4="${blue}" +cl5="${magenta}" +cl6="${cyan}" +cl7="${white}" cl9="${reset}" - # Title @@ -388,7 +406,7 @@ disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1') # none: 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' -disk_subtitle="dir" +disk_subtitle="none" # Disk percent. # Show/Hide disk percent. @@ -537,7 +555,7 @@ underline_char="-" # Example: # separator="->": 'Shell-> bash' # separator=" =": 'WM = dwm' -separator=":" +separator=" " # Color Blocks diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 4358402..e6a5114 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -4,20 +4,20 @@ alias reboot='sudo reboot' alias poweroff='sudo poweroff' alias refresh='. $ZDOTDIR/.zshrc' -alias zzz='sudo zzz' +alias zzz='sudo pm-suspend' alias fuck='sudo $(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 emacsd='/usr/local/bin/emacs --daemon &' -alias em='emacsclient -c -a "emacs"' +alias emd='/usr/local/bin/emacs --daemon &' +alias emc='emacsclient -c -a "emacs"' alias vi='$EDITOR' alias z='zathura' alias nnn='nnn -Hde' alias cn='clear;neofetch' alias ea='vi ~/.config/shell/aliasrc' alias ez='vi ~/.config/zsh/.zshrc' -alias sr='su - root' +alias lr='su - root' alias cam='mpv --profile=low-latency --untimed /dev/video0' alias df='df -h' alias tma='tmux a -t' @@ -72,7 +72,6 @@ gls() { # control audio alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)" alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)" -alias setvol='pactl set-sink-volume @DEFAULT_SINK@' # monitor settings alias rmlr='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary' @@ -145,12 +144,9 @@ alias dcomm='dfiles commit -m' alias dpush='dfiles push origin' # package manager -alias pacin='sudo pacman -S' -alias pacrm='sudo pacman -Rns' -alias pacup='sudo pacman -Syu' -alias pacsr='pacman -Ss' -alias pacbr='pacman -Slq | fzf --preview "pacman -Si {}" --layout=reverse' -alias yayin='yay -S' -alias yayrm='yay -Rns' -alias yayup='yay -Syu' -alias yaysr='yay -Ss' +alias aptsr='apt search' +alias aptin='sudo apt install' +alias aptrm='sudo apt remove' +alias aptupd='sudo apt update' +alias aptupg='sudo apt upgrade' +alias aptup='aptupd && aptupg' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index b879037..4305681 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -1,22 +1,22 @@ #!/bin/sh -# if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; then -# eval $(dbus-launch --sh-syntax --exit-with-session) -# fi +if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; then + eval $(dbus-launch --sh-syntax --exit-with-session) +fi -# eval "$(gpg-agent --daemon --allow-preset-passphrase)" +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 -xset r rate 200 20 +xset r rate 250 30 xset s off -dpms setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle" xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & -# /usr/bin/emacs --daemon & +/usr/bin/emacs --daemon & urxvtd -q -o -f & pipewire & -- cgit v1.2.3 From 3eb1eacde6c6c4b54e7fef2285c115a3d35d1ae8 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 30 Oct 2023 23:18:43 +0100 Subject: added i3 to tracked files --- .config/i3/config | 156 ++++++++++++++++++++++++++++++++++++++++++ .config/i3status/config | 48 +++++++++++++ .config/neofetch/config.conf | 1 - .config/shell/aliasrc | 2 +- .config/shell/profile | 1 + .config/sxiv/exec/key-handler | 9 --- 6 files changed, 206 insertions(+), 11 deletions(-) create mode 100644 .config/i3/config create mode 100644 .config/i3status/config delete mode 100755 .config/sxiv/exec/key-handler (limited to '.config/neofetch/config.conf') diff --git a/.config/i3/config b/.config/i3/config new file mode 100644 index 0000000..39968b6 --- /dev/null +++ b/.config/i3/config @@ -0,0 +1,156 @@ +# i3 config file (v4) +# +# Please see https://i3wm.org/docs/userguide.html for a complete reference! + +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 + +for_window [class="floating"] floating enable + +# 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 +bindsym XF86AudioLowerVolume exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 5%- && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id wpctl set-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id wpctl set-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status +bindsym XF86AudioNext exec --no-startup-id mpc next +bindsym XF86AudioPrev exec --no-startup-id mpc prev +bindsym XF86AudioPlay exec --no-startup-id mpc toggle + +# # Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# # move tiling windows via drag & drop by left-clicking into the title bar, +# # or left-clicking anywhere into the window while holding the floating modifier. +tiling_drag modifier titlebar + +# start a terminal +bindsym $mod+Return exec urxvtc + +# start dmenu +bindsym $mod+p exec --no-startup-id dmenu_run -fn "Hack Nerd Font:size=11" -nb "#222222" -nf "#bbbbbb" -sb "#005577" -sf "#eeeeee" + +# kill focused window +bindsym $mod+Shift+C kill + +# application launchers +bindsym $mod+Shift+F exec firefox -P default-release +bindsym $mod+Shift+B exec firefox -P less-strict +bindsym $mod+Shift+E exec emacsclient -c -a "emacs" +bindsym $mod+c exec mpdmenu +bindsym $mod+Shift+M exec mpdinfo +bindsym --release Print exec scrot -u -e 'mv $f ~/pics/' +bindsym --release $mod+Print exec scrot -s -e 'mv $f ~/pics/' + +# change focus +bindsym $mod+h focus left +bindsym $mod+j focus down +bindsym $mod+k focus up +bindsym $mod+l focus right + +# # alternatively, you can use the cursor keys: +# bindsym $mod+Left focus left +# bindsym $mod+Down focus down +# bindsym $mod+Up focus up +# bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+H move left +bindsym $mod+Shift+J move down +bindsym $mod+Shift+K move up +bindsym $mod+Shift+L move right + +# # alternatively, you can use the cursor keys: +# bindsym $mod+Shift+Left move left +# bindsym $mod+Shift+Down move down +# bindsym $mod+Shift+Up move up +# bindsym $mod+Shift+Right move right + +# split in horizontal orientation +bindsym $mod+s split v + +# split in vertical orientation +bindsym $mod+v split h + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+comma layout stacking +bindsym $mod+t layout tabbed +bindsym $mod+period layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +bindsym $mod+d focus child + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" + +# switch to workspace +bindsym $mod+1 workspace number $ws1 +bindsym $mod+2 workspace number $ws2 +bindsym $mod+3 workspace number $ws3 +bindsym $mod+4 workspace number $ws4 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace number $ws1 +bindsym $mod+Shift+2 move container to workspace number $ws2 +bindsym $mod+Shift+3 move container to workspace number $ws3 +bindsym $mod+Shift+4 move container to workspace number $ws4 + +# reload the configuration file +bindsym $mod+Shift+O reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+R restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+Control+Q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym h resize shrink width 10 px or 10 ppt + bindsym j resize grow height 10 px or 10 ppt + bindsym k resize shrink height 10 px or 10 ppt + bindsym l resize grow width 10 px or 10 ppt + + # # same bindings, but for the arrow keys + # bindsym Left resize shrink width 10 px or 10 ppt + # bindsym Down resize grow height 10 px or 10 ppt + # bindsym Up resize shrink height 10 px or 10 ppt + # bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +bindsym $mod+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + position top + status_command i3status +} diff --git a/.config/i3status/config b/.config/i3status/config new file mode 100644 index 0000000..8fb7d28 --- /dev/null +++ b/.config/i3status/config @@ -0,0 +1,48 @@ +# i3status configuration file. +# see "man i3status" for documentation. + +# It is important that this file is edited as UTF-8. +# The following line should contain a sharp s: +# ß +# If the above line is not correctly displayed, fix your editor first! + +general { + colors = true + interval = 5 +} + +order += "ethernet eth0" +order += "disk /" +order += "load" +order += "memory" +order += "volume master" +order += "tztime local" + +ethernet eth0{ + format_up = "eth0: %ip (%speed)" + format_down = "eth0: down" +} + +disk "/" { + format = "root: %avail" +} + +load { + format = "Load: %1min" +} + +memory { + format = "Memory: %used/%total" + threshold_degraded = "3GB" + format_degraded = "MEMORY < %available" +} + +volume master { + format = "♪: %volume" + format_muted = "♪: muted (%volume)" + device = "default" +} + +tztime local { + format = "%A, %Y-%m-%d %H:%M" +} diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 14bb86b..00a22e0 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -3,7 +3,6 @@ print_info() { info title - prin "\n" prin "${cl9}┌─────────────────────────────────────────────────────┐" info "\n \n " distro info "\n \n " model diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index e6a5114..0599553 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -146,7 +146,7 @@ alias dpush='dfiles push origin' # package manager alias aptsr='apt search' alias aptin='sudo apt install' -alias aptrm='sudo apt remove' +alias aptrm='sudo apt remove --autoremove' alias aptupd='sudo apt update' alias aptupg='sudo apt upgrade' alias aptup='aptupd && aptupg' diff --git a/.config/shell/profile b/.config/shell/profile index 397b25a..075c5dd 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -27,6 +27,7 @@ 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" neofetch diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler deleted file mode 100755 index 7539f88..0000000 --- a/.config/sxiv/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 -- cgit v1.2.3 From 85d9b6cb732805246b50c1b232974573062816a4 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 31 Oct 2023 00:27:33 +0100 Subject: removed neofetch configs that were not working --- .config/neofetch/config.conf | 4 ---- 1 file changed, 4 deletions(-) (limited to '.config/neofetch/config.conf') diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 00a22e0..8b98a51 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -5,16 +5,12 @@ print_info() { info title prin "${cl9}┌─────────────────────────────────────────────────────┐" info "\n \n " distro - info "\n \n " model info "\n \n " kernel info "\n \n " uptime info "\n \n 󰏗" packages info "\n \n " shell info "\n \n " resolution - info "\n \n " de - info "\n \n 󰔎"theme info "\n \n " term - info "\n \n " term_font info "\n \n " cpu info "\n \n 󰊚" gpu info "\n \n " memory -- cgit v1.2.3 From 9e2fd9be321d50d3166d224f8dc0e2d748945699 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Thu, 2 Nov 2023 22:16:31 +0100 Subject: update --- .Xresources | 10 ++++++++-- .config/mpd/mpd.conf | 2 +- .config/neofetch/config.conf | 33 ++++++++++++++++++--------------- .config/shell/aliasrc | 10 ++++++---- .config/shell/profile | 1 + .config/zsh/.zshrc | 2 +- 6 files changed, 35 insertions(+), 23 deletions(-) (limited to '.config/neofetch/config.conf') diff --git a/.Xresources b/.Xresources index 14fc10e..42c0bf2 100644 --- a/.Xresources +++ b/.Xresources @@ -1,7 +1,13 @@ -URxvt*font: xft:Hack Nerd Font Mono:size=11:antialias=True,xft:JoyPixels:pixelsize=10 +/* 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 !! colors and stuff -URxvt.letterSpace: 0 +/* URxvt.letterSpace: 0 */ +URxvt.letterSpace: 1 URxvt.scrollBar: False URxvt.depth: 32 URxvt.background: [90]#000000 diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 0e7073d..ff72d84 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,5 +1,5 @@ bind_to_address "0.0.0.0" -#bind_to_address "/run/mpd/socket" +# bind_to_address "/run/mpd/socket" music_directory "/media/hdd/music" playlist_directory "~/.config/mpd/playlists" diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 8b98a51..8c29d6e 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -3,20 +3,23 @@ print_info() { info title - prin "${cl9}┌─────────────────────────────────────────────────────┐" - info "\n \n " distro - info "\n \n " kernel - info "\n \n " uptime - info "\n \n 󰏗" packages - info "\n \n " shell - info "\n \n " resolution - info "\n \n " term - info "\n \n " cpu - info "\n \n 󰊚" gpu - info "\n \n " memory - info "\n \n " disk - prin "${cl9}└──────────────────────────────────── ${cl0} ${cl1} ${cl2} ${cl3} ${cl4} ${cl5} ${cl6} $(color 15) ${cl9}┘" - prin "\n" + prin "$(color 12)╭──────────── $(color 10)Software$(color 12) ────────────────────" + info "$(color 12)│ $(color 14)OS" distro + info "$(color 12)│ $(color 14)Kernel" kernel + info "$(color 12)│ $(color 14)Packages" packages + info "$(color 12)│ $(color 14)Shell" shell + info "$(color 12)│ $(color 14)WM" wm + info "$(color 12)│ $(color 14)Terminal" term + prin "$(color 12)├──────────── $(color 10)Hardware$(color 12) ────────────────────" + info "$(color 12)│ $(color 14)CPU" cpu + info "$(color 12)│ $(color 14)GPU" gpu + info "$(color 12)│ $(color 14)Memory" memory + info "$(color 12)│ $(color 14)Disk" disk + prin "$(color 12)├───────────── $(color 10)Uptime$(color 12) ─────────────────────" + info "$(color 12)│" uptime + prin "$(color 12)╰──────────────────────────────────────────" + + info cols } reset="\033[0m" @@ -401,7 +404,7 @@ disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1') # none: 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' -disk_subtitle="none" +disk_subtitle="dir" # Disk percent. # Show/Hide disk percent. diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 0757b44..9338ed9 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -145,10 +145,12 @@ alias dpush='dfiles push origin' # package management alias aptsr='apt search' -alias aptin='sudo apt install' -alias aptrm='sudo apt remove --autoremove' -alias aptupd='sudo apt update' -alias aptupg='sudo apt upgrade' +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' diff --git a/.config/shell/profile b/.config/shell/profile index 075c5dd..05fd3d7 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -19,6 +19,7 @@ export GTK_IM_MODULE='ibus' export QT_IM_MODULE='ibus' export XMODIFIERS='@im=ibus' export XDG_SESSION_TYPE='x11' +export XDG_CURRENT_DESKTOP='i3' export VDPAU_DRIVER=radeonsi diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index efdc061..0ed250f 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -25,7 +25,7 @@ bindkey "^[[3~" delete-char bindkey '^x^e' edit-command-line -PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b ' +PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%m%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b ' setopt extendedGlob -- cgit v1.2.3 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 (limited to '.config/neofetch/config.conf') 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