summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas <nbnoll@eml.cc>2021-11-07 11:42:23 -0800
committerNicholas <nbnoll@eml.cc>2021-11-07 11:42:23 -0800
commit2633a2938486c97dfbaeeddcd278ab52ffddf102 (patch)
tree6e938f6e8e4f5eb6190699182f8c7d4afb0dd4e9
parentca08c743594d0dda3fedf3c50d1ddb87810fab94 (diff)
update: framework laptop
-rw-r--r--.config/aur.list23
-rw-r--r--.config/fish/config.fish70
-rw-r--r--.config/fish/fish_variables84
-rw-r--r--.config/msmtp/config6
-rw-r--r--.config/mutt/mail16
-rw-r--r--.config/mutt/usr/gmail10
-rw-r--r--.config/nvim/pack/vendor/packages3
-rw-r--r--.config/pacman.list218
-rw-r--r--.config/picom/config10
-rw-r--r--.config/qutebrowser/config.py8
-rw-r--r--.config/systemd/user/offlineimap.service12
-rw-r--r--.config/systemd/user/offlineimap.timer9
-rw-r--r--.config/tmux/config5
-rw-r--r--.config/zathura/zathurarc2
-rw-r--r--.profile2
-rw-r--r--.xinitrc27
16 files changed, 54 insertions, 451 deletions
diff --git a/.config/aur.list b/.config/aur.list
deleted file mode 100644
index d575692..0000000
--- a/.config/aur.list
+++ /dev/null
@@ -1,23 +0,0 @@
-aliview-bin
-arc-gtk-theme-git
-chromium-widevine
-dropbox
-dropbox-cli
-gruvbox-material-gtk-theme-git
-gruvbox-material-icon-theme-git
-julia-bin
-mafft
-neovim-nightly-bin
-otf-font-awesome-4
-otf-symbola
-pandoc-bin
-pass-git
-picom-ibhagwan-git
-qutebrowser-git
-rr-git
-slack-desktop
-ttf-font-awesome-4
-ttf-symbola
-urlview
-xbanish
-zoom
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
deleted file mode 100644
index fe443f3..0000000
--- a/.config/fish/config.fish
+++ /dev/null
@@ -1,70 +0,0 @@
-# Add paths to the system path
-set -g -x XDG_DOCUMENTS_DIR "$HOME/docs"
-set -g -x XDG_DOWNLOAD_DIR "$HOME/pulls"
-set -g -x XDG_PICTURES_DIR "$HOME/media/pics"
-set -g -x XDG_VIDEOS_DIR "$HOME/media"
-
-set -g -x PYTHONPATH "$HOME/root/lib/py/" $PYTHONPATH
-set -g -x PATH $PATH "$HOME/code/bio/pangraph/bin"
-
-# Set global environmental variables
-set -g -x MAILCAPS /home/nolln/.config/mutt/mailcap
-set -g -x TEXINPUTS .:/home/nolln/docs//:/usr/share/texmf-dist/tex//
-set -g -x QT_QPA_PLATFORM xcb
-set -g -x LS_COLORS 'di=34:ln=35:so=32:pi=33:ex=32:bd=34;46:cd=34:su=0:sg=0:tw=0:ow=0:*.gz=01;31:*.tgz=01;31:*.zip=01;31:*.xz=01;31'
-
-set -g -x JULIA_NUM_THREADS 4
-
-set -g -x GTK_THEME Gruvbox-Material-Dark
-
-# Set system apps
-set EDITOR nvim
-set BROWSER qutebrowser
-set PAGER less -r
-
-# Set to Vim modal editing
-fish_vi_key_bindings
-
-# Useful aliases
-alias ls='ls -hlS --color=auto'
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-alias ..='cd ..'
-alias ...='cd ../..'
-alias ....='cd ../../..'
-
-alias vim='nvim'
-alias gdb='gdb -q'
-alias mail='neomutt'
-alias tmux='tmux -f $HOME/.config/tmux/config'
-alias screenshot='grim -g (slurp) - | wl-copy'
-alias lofi="mpv 'https://www.youtube.com/watch?v=5qap5aO4i9A' --no-video"
-alias wttr='curl wttr.in'
-alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
-alias dbg='~/pyenv/bin/gdbgui'
-
-# remote
-alias vpn-ucsb='sudo openconnect --protocol=pulse https://ps.vpn.ucsb.edu/ra'
-
-alias ssh-pod='ssh -X nbnoll@pod-login1.cnsi.ucsb.edu -t "zsh --login"'
-alias mnt-pod='sshfs nbnoll@pod-login1.cnsi.ucsb.edu:/home/nbnoll $HOME/mnt/cluster'
-
-alias ssh-knot='ssh -X nbnoll@knot7.cnsi.ucsb.edu'
-alias mnt-knot='sshfs nbnoll@knot7.cnsi.ucsb.edu:/home/nbnoll $HOME/mnt/cluster'
-
-alias ssh-server='ssh admin@nbnoll.xyz'
-
-alias umnt-cluster='umount $HOME/mnt/cluster'
-
-# Prompt configuration.
-
-#Colored man pages
-set -xU LESS_TERMCAP_mb (printf "\e[01;34m")
-set -xU LESS_TERMCAP_md (printf "\e[01;34m")
-set -xU LESS_TERMCAP_me (printf "\e[0m")
-set -xU LESS_TERMCAP_se (printf "\e[0m")
-set -xU LESS_TERMCAP_so (printf "\e[01;44;33m")
-set -xU LESS_TERMCAP_ue (printf "\e[0m")
-set -xU LESS_TERMCAP_us (printf "\e[01;4;32m")
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
deleted file mode 100644
index 95aa534..0000000
--- a/.config/fish/fish_variables
+++ /dev/null
@@ -1,84 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR FZF_DEFAULT_OPTS:\x2d\x2dheight\x2040\x25
-SETUVAR FZF_LEGACY_KEYBINDINGS:0
-SETUVAR FZF_PREVIEW_DIR_CMD:ls
-SETUVAR FZF_PREVIEW_FILE_CMD:head\x20\x2dn\x2010
-SETUVAR FZF_TMUX_HEIGHT:40\x25
-SETUVAR --export LESS_TERMCAP_mb:\x1b\x5b01\x3b34m
-SETUVAR --export LESS_TERMCAP_md:\x1b\x5b01\x3b34m
-SETUVAR --export LESS_TERMCAP_me:\x1b\x5b0m
-SETUVAR --export LESS_TERMCAP_se:\x1b\x5b0m
-SETUVAR --export LESS_TERMCAP_so:\x1b\x5b01\x3b44\x3b33m
-SETUVAR --export LESS_TERMCAP_ue:\x1b\x5b0m
-SETUVAR --export LESS_TERMCAP_us:\x1b\x5b01\x3b4\x3b32m
-SETUVAR __fish_init_2_39_8:\x1d
-SETUVAR __fish_init_2_3_0:\x1d
-SETUVAR __fish_init_3_x:\x1d
-SETUVAR __fish_initialized:3100
-SETUVAR fish_color_autosuggestion:585858
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:a1b56c
-SETUVAR fish_color_comment:f7ca88
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:ba8baf
-SETUVAR fish_color_error:ab4642
-SETUVAR fish_color_escape:86c1b9
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:7cafc2
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:7cafc2
-SETUVAR fish_color_param:d8d8d8
-SETUVAR fish_color_quote:f7ca88
-SETUVAR fish_color_redirection:d8d8d8
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_greeting:\x1d
-SETUVAR fish_key_bindings:fish_vi_key_bindings
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
-SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_user_paths:/home/nolln/\x2epoetry/bin\x1e/home/nolln/root/bin\x1e/home/nolln/\x2eyarn/bin\x1e/home/nolln/code/bin\x1e/home/nolln/go/bin\x1e/home/nolln/\x2elocal/bin\x1e/home/nolln/code/muon/bin\x1e/home/nolln/\x2efzf/bin\x1e/home/nolln/opt/Vivado/2019\x2e2/bin
-SETUVAR pure_begin_prompt_with_current_directory:true
-SETUVAR pure_color_command_duration:pure_color_warning
-SETUVAR pure_color_current_directory:pure_color_primary
-SETUVAR pure_color_danger:red
-SETUVAR pure_color_dark:black
-SETUVAR pure_color_git_branch:pure_color_mute
-SETUVAR pure_color_git_dirty:pure_color_mute
-SETUVAR pure_color_git_unpulled_commits:pure_color_info
-SETUVAR pure_color_git_unpushed_commits:pure_color_info
-SETUVAR pure_color_info:cyan
-SETUVAR pure_color_jobs:pure_color_normal
-SETUVAR pure_color_light:white
-SETUVAR pure_color_mute:brblack
-SETUVAR pure_color_normal:normal
-SETUVAR pure_color_primary:blue
-SETUVAR pure_color_prompt_on_error:pure_color_danger
-SETUVAR pure_color_prompt_on_success:pure_color_success
-SETUVAR pure_color_ssh_hostname:pure_color_mute
-SETUVAR pure_color_ssh_separator:pure_color_mute
-SETUVAR pure_color_ssh_user_normal:pure_color_mute
-SETUVAR pure_color_ssh_user_root:pure_color_light
-SETUVAR pure_color_success:magenta
-SETUVAR pure_color_virtualenv:pure_color_mute
-SETUVAR pure_color_warning:yellow
-SETUVAR pure_enable_git:true
-SETUVAR pure_reverse_prompt_symbol_in_vimode:true
-SETUVAR pure_separate_prompt_on_error:false
-SETUVAR pure_show_jobs:false
-SETUVAR pure_symbol_git_dirty:\x2a
-SETUVAR pure_symbol_git_unpulled_commits:\u21e3
-SETUVAR pure_symbol_git_unpushed_commits:\u21e1
-SETUVAR pure_symbol_prompt:\u276f
-SETUVAR pure_symbol_reverse_prompt:\u276e
-SETUVAR pure_symbol_title_bar_separator:\u2014
-SETUVAR pure_threshold_command_duration:5
-SETUVAR pure_version:2\x2e1\x2e5
diff --git a/.config/msmtp/config b/.config/msmtp/config
index 7ab7008..75c0c2b 100644
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -11,7 +11,7 @@ host smtp.fastmail.com
port 587
from nbnoll@eml.cc
user nbnoll@eml.cc
-passwordeval "gpg --quiet --for-your-eyes-only --no-tty --decrypt ~/.config/password/fastmail.gpg"
+passwordeval "gpg --quiet --for-your-eyes-only --no-tty --decrypt ~/mail/pass/main.gpg"
# gmail
account gmail
@@ -19,7 +19,7 @@ host smtp.gmail.com
port 587
from nnoll523@gmail.com
user nnoll523@gmail.com
-passwordeval "gpg --quiet --for-your-eyes-only --no-tty --decrypt ~/.config/password/gmail.gpg"
+passwordeval "gpg --quiet --for-your-eyes-only --no-tty --decrypt ~/mail/pass/gmail.gpg"
# gmail
account kitp
@@ -27,6 +27,6 @@ host smtp.gmail.com
port 587
from nnoll@ucsb.edu
user nnoll@ucsb.edu
-passwordeval "gpg --quiet --for-your-eyes-only --no-tty --decrypt ~/.config/password/ucsb.gpg"
+passwordeval "gpg --quiet --for-your-eyes-only --no-tty --decrypt ~/mail/pass/kitp.gpg"
account default : main
diff --git a/.config/mutt/mail b/.config/mutt/mail
index a229e5a..c40f871 100644
--- a/.config/mutt/mail
+++ b/.config/mutt/mail
@@ -33,16 +33,16 @@ named-mailboxes "Trash" =main/Trash
named-mailboxes "Archive" =main/Archive
named-mailboxes "----------- Kitp -----------" =kitp
named-mailboxes "Inbox" =kitp/INBOX
-named-mailboxes "Drafts" =kitp/[Gmail].Drafts
-named-mailboxes "Trash" =kitp/[Gmail].Trash
-named-mailboxes "Sent" ="kitp/[Gmail].Sent Mail"
-named-mailboxes "Archive" ="kitp/_Archive"
+named-mailboxes "Drafts" =kitp/Drafts
+named-mailboxes "Trash" =kitp/Trash
+named-mailboxes "Sent" ="kitp/Sent"
+named-mailboxes "Archive" ="kitp/Archive"
named-mailboxes "----------- Gmail -----------" =gmail
named-mailboxes "Inbox" =gmail/INBOX
-named-mailboxes "Drafts" =gmail/[Gmail].Drafts
-named-mailboxes "Trash" =gmail/[Gmail].Trash
-named-mailboxes "Sent" ="gmail/[Gmail].Sent Mail"
-named-mailboxes "Archive" ="gmail/[Gmail].Store"
+named-mailboxes "Drafts" =gmail/Drafts
+named-mailboxes "Trash" =gmail/Trash
+named-mailboxes "Sent" ="gmail/Sent"
+named-mailboxes "Archive" ="gmail/Archive"
# default to fastmail
source ~/.config/mutt/usr/main
diff --git a/.config/mutt/usr/gmail b/.config/mutt/usr/gmail
index e2a3f0d..13616c3 100644
--- a/.config/mutt/usr/gmail
+++ b/.config/mutt/usr/gmail
@@ -3,12 +3,12 @@
# account details
set from = "nnoll523@gmail.com"
set spoolfile = "+gmail/INBOX"
-set postponed = "+gmail/[Gmail].Drafts"
-set trash = "+gmail/[Gmail].Trash"
-set record = "+gmail/[Gmail].Sent Mail"
+set postponed = "+gmail/Drafts"
+set trash = "+gmail/Trash"
+set record = "+gmail/Sent"
set sendmail = "email gmail"
set copy = no
# account specific macros
-macro index,pager a "<save-message>+gmail/[Gmail].Store<enter>" "Archive Message"
-macro index,pager D "<save-message>+gmail/[Gmail].Trash<enter>" "Trash Message"
+macro index,pager a "<save-message>+gmail/Archive<enter>" "Archive Message"
+macro index,pager D "<save-message>+gmail/Trash<enter>" "Trash Message"
diff --git a/.config/nvim/pack/vendor/packages b/.config/nvim/pack/vendor/packages
index 5b2d059..e8880ff 100644
--- a/.config/nvim/pack/vendor/packages
+++ b/.config/nvim/pack/vendor/packages
@@ -23,7 +23,4 @@ adelarsq/vim-matchit
lervag/vimtex
plasticboy/vim-markdown
-fatih/vim-go
JuliaEditorSupport/julia-vim
-leafgarland/typescript-vim
-peitalin/vim-jsx-typescript
diff --git a/.config/pacman.list b/.config/pacman.list
deleted file mode 100644
index 3dc47c5..0000000
--- a/.config/pacman.list
+++ /dev/null
@@ -1,218 +0,0 @@
-arandr
-ascii
-autoconf
-automake
-bash
-binutils
-bison
-bzip2
-chromium
-clang
-cmake
-coreutils
-cryptsetup
-cython
-dash
-device-mapper
-dhcpcd
-diffutils
-dtc
-e2fsprogs
-ed
-efibootmgr
-fd
-feh
-file
-filesystem
-findutils
-fish
-flex
-fuseiso
-fzf
-gawk
-gcc
-gcc-libs
-gdb
-gettext
-gimp
-git
-glibc
-glm
-glslang
-go
-gperf
-graphviz
-grep
-grub
-gzip
-inkscape
-iproute2
-iputils
-ipython
-jfsutils
-jq
-jre-openjdk
-less
-lib32-pipewire
-libisoburn
-libtool
-libxrandr
-licenses
-linux
-linux-firmware
-lld
-lldb
-logrotate
-luit
-lvm2
-lxappearance-gtk3
-m4
-make
-man-db
-man-pages
-mdadm
-mesa
-meson
-mps-youtube
-mpv
-msmtp
-mtools
-nano
-nasm
-neomutt
-net-tools
-netctl
-nmap
-nodejs
-ntfs-3g
-offlineimap
-openblas
-openconnect
-openssh
-os-prober
-p7zip
-pacman
-patch
-pavucontrol
-pciutils
-pdfjs
-perf
-perl
-perl-authen-sasl
-perl-mime-tools
-perl-net-smtp-ssl
-pipewire
-pipewire-alsa
-pipewire-pulse
-pkgconf
-procps-ng
-psmisc
-pulseaudio-alsa
-python
-python-adblock
-python-basemap
-python-pip
-python-pipenv
-python2-pip
-qemu
-qpdf
-reiserfsprogs
-ripgrep
-rsync
-scdoc
-scrot
-seatd
-sed
-shadow
-signal-desktop
-spirv-tools
-sshfs
-strace
-sudo
-swig
-sxiv
-sysfsutils
-sysstat
-systemd-sysvcompat
-tar
-texinfo
-texlive-bibtexextra
-texlive-core
-texlive-fontsextra
-texlive-formatsextra
-texlive-games
-texlive-humanities
-texlive-latexextra
-texlive-music
-texlive-pictures
-texlive-pstricks
-texlive-publishers
-texlive-science
-the_silver_searcher
-time
-tk
-tldr
-tmux
-tnftp
-ttf-fira-code
-ttf-inconsolata
-unrar
-unzip
-usbutils
-util-linux
-valgrind
-vi
-w3m
-wayland-protocols
-wget
-which
-whois
-xcb-util-errors
-xf86-video-vesa
-xfsprogs
-xorg-docs
-xorg-fonts-100dpi
-xorg-fonts-75dpi
-xorg-fonts-encodings
-xorg-iceauth
-xorg-server
-xorg-server-common
-xorg-server-devel
-xorg-server-xephyr
-xorg-server-xnest
-xorg-server-xvfb
-xorg-sessreg
-xorg-setxkbmap
-xorg-smproxy
-xorg-x11perf
-xorg-xbacklight
-xorg-xcmsdb
-xorg-xcursorgen
-xorg-xdpyinfo
-xorg-xdriinfo
-xorg-xev
-xorg-xgamma
-xorg-xhost
-xorg-xinit
-xorg-xinput
-xorg-xkbcomp
-xorg-xkbevd
-xorg-xkbutils
-xorg-xkill
-xorg-xlsatoms
-xorg-xlsclients
-xorg-xpr
-xorg-xprop
-xorg-xrandr
-xorg-xrefresh
-xorg-xsetroot
-xorg-xvinfo
-xorg-xwayland
-xorg-xwd
-xorg-xwininfo
-xorg-xwud
-xournalpp
-zathura
-zathura-djvu
-zathura-pdf-mupdf
-zathura-ps
diff --git a/.config/picom/config b/.config/picom/config
index ef27cce..09db736 100644
--- a/.config/picom/config
+++ b/.config/picom/config
@@ -3,9 +3,13 @@
backend = "glx";
+glx-no-stencil = true;
+glx-swap-method = 2;
+
refresh-rate = 0;
-vsync = false;
-xrender-sync-fence = true;
+vsync = true;
+dbe = false;
+xrender-sync-fence = false;
mark-ovredir-focused = false;
# ------------------------------------------------------------------------
@@ -58,7 +62,7 @@ detect-client-opacity = false;
inactive-opacity-override = true;
opacity-rule = [
- "99:class_g = 'Chromium'",
+ "99:class_g = 'qutebrowser'",
"99:class_g = 'Inkscape'",
"99:class_g = 'Gimp'",
"99:class_g = 'zoom'",
diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py
index d8e0e66..4c9f789 100644
--- a/.config/qutebrowser/config.py
+++ b/.config/qutebrowser/config.py
@@ -340,7 +340,13 @@ c.colors.tabs.pinned.selected.odd.fg = c.colors.tabs.selected.odd.fg
# ------------------------------------------------------------------------
# fonts
-font = "12pt consolas"
+font = "16pt consolas"
+c.fonts.default_size = "16pt"
+c.fonts.default_family = "consolas"
+
+c.fonts.web.size.default = 16
+c.fonts.web.size.default_fixed = 16
+
# ------------------------------------------------------------------------
# fonts
diff --git a/.config/systemd/user/offlineimap.service b/.config/systemd/user/offlineimap.service
deleted file mode 100644
index 8e35680..0000000
--- a/.config/systemd/user/offlineimap.service
+++ /dev/null
@@ -1,12 +0,0 @@
-# offlineimap.service
-
-[Unit]
-Description=OfflineIMAP Quicksync
-After=network.target
-Requires=gpg-agent.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/offlineimap -o -q -u quiet
-TimeoutStartSec=1min30s
-WatchdogSec=300
diff --git a/.config/systemd/user/offlineimap.timer b/.config/systemd/user/offlineimap.timer
deleted file mode 100644
index 8869cfd..0000000
--- a/.config/systemd/user/offlineimap.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=OfflineIMAP Quicksync timer
-
-[Timer]
-OnCalendar=*:*:0/30
-Unit=offlineimap.service
-
-[Install]
-WantedBy=default.target
diff --git a/.config/tmux/config b/.config/tmux/config
index 7136129..ec80296 100644
--- a/.config/tmux/config
+++ b/.config/tmux/config
@@ -71,8 +71,8 @@ bind-key u capture-pane \;\
# Design Changes
######################
-set -g default-terminal "tmux-256color"
-set -sa terminal-overrides ",xterm*:Tc:sitm=\E[3m:ritm=\E[23m:Smulx=\E[4::%p1%dm:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m"
+set -g default-terminal "screen-256color"
+set -sa terminal-overrides ",term*:Tc:sitm=\E[3m:ritm=\E[23m:Smulx=\E[4::%p1%dm:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m"
# UTF-8
set -q -g status-utf8 on
@@ -150,7 +150,6 @@ set-option -wg clock-mode-colour "#FE8019"
%endif
# statusbar formatting
-# "#fe8019" MUST be in lowercase here (conflicts with statusline alias otherwise)
set-option -g status-left "#[bg=#A89984, fg=#3C3836]#{?client_prefix,#[bg=#bbc585],#[bg=#A89984]} #{session_name} "
set-option -g status-right "#[bg=#A89984, fg=#3C3836]#{?client_prefix,#[bg=#bbc585],#[bg=#A89984]} #{host_short} "
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index ba13f9a..11b8bb3 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -8,7 +8,7 @@
set adjust-open "best-fit"
# Font size
-set font "Consolas 12"
+set font "Consolas 16"
# Zoom size
set zoom-step 20
diff --git a/.profile b/.profile
index 4791753..5ee121e 100644
--- a/.profile
+++ b/.profile
@@ -21,4 +21,4 @@ export PAGER="less -R"
export MANWIDTH=80
# misc
-export VIRTUAL_ENV_DISABLE_PROMPT=1
+set -o vi
diff --git a/.xinitrc b/.xinitrc
index 74739d8..37462d6 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -8,15 +8,28 @@ makepipe() {
}
xinit() {
- picom --experimental-backends --config ~/.config/picom/config &
+ exec picom --experimental-backends --config ~/.config/picom/config &
feh --bg-scale ~/media/background.jpg
- ~/.screenlayout/home.sh
-
- makepipe
-
- xbanish &
- status &
+ # setup audio
+ export XDG_RUNTIME_DIR=/run/user/$(id -u)
+ if [ ! -d $XDG_RUNTIME_DIR ]; then
+ doas mkdir -p $XDG_RUNTIME_DIR
+ user=$USER
+ doas chown $user:$user $XDG_RUNTIME_DIR
+ doas chmod 700 $XDG_RUNTIME_DIR
+ fi
+
+ exec pipewire &
+ exec pipewire-pulse &
+
+ # makepipe
+ exec status &
+
+ # x related software
+ exec xbanish &
+ exec redshift -l 34:-119 &
+ xrdb -merge ~/.Xresources
}
xfini() {