update configs

8 files changed, 67 insertions, 65 deletions

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