diff --git a/config/fish/config.fish b/config/fish/config.fish index 9b3361241..d81e9517c 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -16,7 +16,7 @@ set fish_greeting # Supresses fish's intro messa set TERM "xterm-256color" # Sets the terminal type ### SET BAT AS MANPAGER -set -x MANPAGER "sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman'" +#set -x MANPAGER "batman" ### SET EITHER DEFAULT EMACS MODE OR VI MODE ### function fish_user_key_bindings @@ -148,12 +148,12 @@ alias lt='eza -aT --color=always --group-directories-first' # tree listing alias l.='eza -a | egrep "^\."' # package management -alias pkg-update="paru -Syu" -alias pkg-install="paru -S" -alias pkg-remove="paru -Rcns" -alias pkg-remove-sec="paru -R" -alias pkg-search="paru -Ss" -alias pkg-clean="paru -Scc && paru -Rns (pacman -Qtdq)" +alias xbu="sudo xbps-install -Su" +alias xbi="sudo xbps-install -S" +alias xbr="sudo xbps-remove -R" +alias xbrs="sudo xbps-remove" +alias xbc="sudo xbps-remove -Oo" +alias xbs="sudo xbps-query -R" # Colorize grep output (good for log files) alias grep='grep --color=auto' diff --git a/config/fuzzel/fuzzel.ini b/config/fuzzel/fuzzel.ini index 1a2595a39..b543e2952 100644 --- a/config/fuzzel/fuzzel.ini +++ b/config/fuzzel/fuzzel.ini @@ -22,6 +22,7 @@ selection=585b70ff selection-match=f38ba8ff selection-text=cdd6f4ff border=b4befeff +prompt=b4befeff [border] width=3 diff --git a/config/fuzzel/scripts/rs_power b/config/fuzzel/scripts/rs_power index 08284d126..35c22143d 100755 --- a/config/fuzzel/scripts/rs_power +++ b/config/fuzzel/scripts/rs_power @@ -56,13 +56,13 @@ case "$action" in loginctl kill-session self ;; "$option2") - systemctl reboot + loginctl reboot ;; "$option3") - systemctl poweroff + loginctl poweroff ;; "$option4") - systemctl suspend + loginctl suspend ;; "$option5") swaylock -i "$currwall" diff --git a/config/git/config b/config/git/config index dc057681b..b27ba990b 100644 --- a/config/git/config +++ b/config/git/config @@ -2,5 +2,3 @@ mail = maverick.xero@proton.me name = Lian Drake email = maverick.xero@proton.me -[safe] - directory = /usr/share/flutter diff --git a/config/sway/modules/autostart b/config/sway/modules/autostart index 6fe7ca671..51d4919c2 100644 --- a/config/sway/modules/autostart +++ b/config/sway/modules/autostart @@ -1,17 +1,18 @@ bar swaybar_command waybar exec { - kanshi - dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP - dbus-update-activation-environment --systemd --all - systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP + hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP + $HOME/.config/sway/scripts/pipeinit /usr/libexec/xdg-desktop-portal-wlr + /usr/libexec/xdg-desktop-portal-gtk $HOME/.config/sway/scripts/idle wl-paste --type text --watch cliphist store wl-paste --type image --watch cliphist store mako -c ~/.config/mako/config /usr/libexec/polkit-gnome-authentication-agent-1 + gnome-keyring-daemon --start --components=secrets sway-audio-idle-inhibit + dex -a -s ~/.config/autostart $HOME/.config/sway/scripts/nextinit } diff --git a/config/sway/modules/binds b/config/sway/modules/binds index bbc14f254..23f2bd061 100644 --- a/config/sway/modules/binds +++ b/config/sway/modules/binds @@ -11,18 +11,19 @@ set $right l set $term foot set $chat flatpak run org.signal.Signal set $office flatpak run org.libreoffice.LibreOffice -set $notes joplin-desktop -set $browser flatpak run com.brave.Browser +set $passwords flatpak run com.bitwarden.desktop +set $notes flatpak run net.cozic.joplin_desktop +set $browser flatpak run org.mozilla.firefox set $file foot -T yazi -a yazi yazi -set $editor zed +set $editor foot -T lunarvim -a lunarvim lvim set $music foot -T musikcube -a musikcube musikcube set $rss foot -T newsboat -a newsboat newsboat set $ani-cli foot -T ani-cli -a ani-cli ani-cli set $ytfzf foot -T ytfzf -a ytfzf ytfzf -flstT chafa set $ytfzf-music foot -T ytfzf-music -a ytfzf-music ytfzf -mlstT chafa set $flix-cli foot -T flix-cli -a flix-cli flix-cli -set $audiomixer foot -T audiomixer -a audiomixer pulsemixer -set $monitor foot -T monitor -a monitor btop +set $audiomixer foot -T pulsemixer -a pulsemixer pulsemixer +set $monitor foot -T btop -a btop btop # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened @@ -55,7 +56,6 @@ bindsym XF86AudioStop exec playerctl stop bindsym XF86MonBrightnessUp exec brightnessctl s 5%+ bindsym XF86MonBrightnessDown exec brightnessctl s 5%- bindsym XF86News exec $rss -bindsym XF86Display exec wdisplays # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -196,6 +196,7 @@ mode "apps" { bindsym n exec $notes; mode "default" bindsym m exec $music; mode "default" bindsym r exec $rss; mode "default" + bindsym p exec $passwords; mode "default" bindsym Shift+b exec $monitor; mode "default" bindsym Shift+p exec $audiomixer; mode "default" bindsym Shift+y exec $ytfzf; mode "default" diff --git a/config/sway/modules/rules b/config/sway/modules/rules index 035f318b4..c8aae8819 100644 --- a/config/sway/modules/rules +++ b/config/sway/modules/rules @@ -4,7 +4,6 @@ set { $game inhibit_idle focus; floating enable; border none; fullscreen enable; shadows disable $popup floating enable; border pixel 1; sticky enable; shadows enable $float floating enable; border pixel 1; shadows enable - $video inhibit_idle fullscreen; border none; max_render_time off $important inhibit_idle open; floating enable; border pixel 1 $max inhibit_idle visible; floating enable; sticky enable; border pixel 1 } @@ -73,14 +72,6 @@ for_window { [window_type="tooltip"] $float; shadows enable [window_type="notification"] $float; shadows enable -#video - inhibit_idle fullscreen; border none; max_render_time off - [instance="chromium"] $video - [app_id="mpv"] $video - [app_id="vlc"] $video - [class="firefox"] $video - [app_id="firefox"] $video - [class="Nightly"] $video - #important - inhibit_idle open; floating enable; border pixel 1 [title="Move files" app_id="dolphin|org.kde.ark|pcmanfm|pcmanfm-qt"] $important [title="^(Copying|Moving)\s*—\s*Dolphin" app_id="dolphin|org.kde.ark|pcmanfm|pcmanfm-qt"] $important @@ -110,6 +101,8 @@ for_window { [title="Android Emulator - *"] floating enable; border normal [title="Emulator" window_type="utility"] move scratchpad [app_id="brave-nngceckbapebfimnlniiiahkandclblb-Default"] floating enable + [title="Extension: (Bitwarden Password Manager) - Bitwarden — Mozilla Firefox"] floating enable [app_id="xdg-desktop-portal-gtk"] floating enable + [app_id="qalculate-gtk"] floating enable [app_id="com.nextcloud.desktopclient.nextcloud"] floating enable } diff --git a/config/sway/scripts/init b/config/sway/scripts/init index c92ab4c82..598cf75e8 100755 --- a/config/sway/scripts/init +++ b/config/sway/scripts/init @@ -31,4 +31,4 @@ export GTK_CURSOR_THEME="Simp1e-Catppucin-Mocha" export RUNNER="fuzzel --dmenu" # Start compositor -exec sway +dbus-launch sway diff --git a/config/sway/scripts/nextinit b/config/sway/scripts/nextinit old mode 100644 new mode 100755 diff --git a/config/sway/scripts/pipeinit b/config/sway/scripts/pipeinit new file mode 100755 index 000000000..99eb7d482 --- /dev/null +++ b/config/sway/scripts/pipeinit @@ -0,0 +1,9 @@ +#!/bin/sh + +pkill pipewire +pkill pipewire-pulse +pkill wireplumber + +pipewire & +pipewire-pulse & +wireplumber & diff --git a/config/sway/wallpaper/background.png b/config/sway/wallpaper/background.png index 52c9029d8..2eef2289f 100644 Binary files a/config/sway/wallpaper/background.png and b/config/sway/wallpaper/background.png differ diff --git a/config/sway/wallpaper/locked.png b/config/sway/wallpaper/locked.png index 52c9029d8..2eef2289f 100644 Binary files a/config/sway/wallpaper/locked.png and b/config/sway/wallpaper/locked.png differ diff --git a/etc/default/grub b/etc/default/grub index 4f3d68034..be0fcb0ce 100644 --- a/etc/default/grub +++ b/etc/default/grub @@ -1,63 +1,22 @@ -# GRUB boot loader configuration - +# +# Configuration file for GRUB. +# GRUB_DEFAULT=0 -GRUB_TIMEOUT=2 -GRUB_DISTRIBUTOR="Arch" -GRUB_CMDLINE_LINUX_DEFAULT="rd.luks.name== rd.luks.key== loglevel=3 quiet systemd.show_status=auto rd.udev.log_level=3 splash" -GRUB_CMDLINE_LINUX="" - -# Preload both GPT and MBR modules so that they are not missed -GRUB_PRELOAD_MODULES="part_gpt part_msdos" - -# Uncomment to enable booting from LUKS encrypted devices +GRUB_HIDDEN_TIMEOUT=1 +GRUB_HIDDEN_TIMEOUT_QUIET=true +GRUB_TIMEOUT=0 +GRUB_DISTRIBUTOR="Void" +GRUB_CMDLINE_LINUX_DEFAULT="rd.luks.uuid= rd.luks.vg= loglevel=3 quiet" GRUB_ENABLE_CRYPTODISK=y - -# Set to 'countdown' or 'hidden' to change timeout behavior, -# press ESC key to display menu. -GRUB_TIMEOUT_STYLE=hidden - # Uncomment to use basic console -GRUB_TERMINAL_INPUT=console - +#GRUB_TERMINAL_INPUT="console" # Uncomment to disable graphical terminal #GRUB_TERMINAL_OUTPUT=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `videoinfo' -GRUB_GFXMODE=auto - -# Uncomment to allow the kernel use the same resolution used by grub -GRUB_GFXPAYLOAD_LINUX=keep - -# Uncomment if you want GRUB to pass to the Linux kernel the old parameter -# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" +#GRUB_BACKGROUND=/usr/share/void-artwork/splash.png +#GRUB_GFXMODE=1920x1080x32 #GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -GRUB_DISABLE_RECOVERY=true - +#GRUB_DISABLE_RECOVERY=true # Uncomment and set to the desired menu colors. Used by normal and wallpaper # modes only. Entries specified as foreground/background. #GRUB_COLOR_NORMAL="light-blue/black" #GRUB_COLOR_HIGHLIGHT="light-cyan/blue" - -# Uncomment one of them for the gfx desired, a image background or a gfxtheme -#GRUB_BACKGROUND="/path/to/wallpaper" -#GRUB_THEME="/path/to/gfxtheme" - -# Uncomment to get a beep at GRUB start -#GRUB_INIT_TUNE="480 440 1" - -# Uncomment to make GRUB remember the last selection. This requires -# setting 'GRUB_DEFAULT=saved' above. -#GRUB_SAVEDEFAULT=true - -# Uncomment to disable submenus in boot menu -#GRUB_DISABLE_SUBMENU=y - -# Probing for other operating systems is disabled for security reasons. Read -# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this -# functionality install os-prober and uncomment to detect and include other -# operating systems. -GRUB_DISABLE_OS_PROBER=true diff --git a/etc/dracut.conf.d/10-crypt.conf b/etc/dracut.conf.d/10-crypt.conf new file mode 100644 index 000000000..d326329a1 --- /dev/null +++ b/etc/dracut.conf.d/10-crypt.conf @@ -0,0 +1 @@ +install_items+=" /boot/volume.key /etc/crypttab " diff --git a/etc/issue b/etc/issue index 96a033257..82609729f 100644 --- a/etc/issue +++ b/etc/issue @@ -1,13 +1,13 @@ -  -       ### ### ## -     ## ## - ┌ #### ### ###   ####   ## ### ## ### ### ### ### ###  ### ### - │  ##  ### ##  ##   ###  ## ## ## ### ## ## ##   ## ## - │ #####  ##   ##   ## ## ## ## ## ## ## ##   ### - │ ## ##  ##   ##   ## ## ## ## ## ## ##  ##   ## ##  - │ ######  ##   ####  ### ### #### #### ### ### ######  ###   ### - └─────────────────────────────────────────── A simple, lightweight distribution. -  - OS: Arch\s Kernel: \r Processor: \m TTY: \l - + +\e[H\e[2J +\e[0;32m + _______ + \\_____ `- ____ ____ .__ .___ .____ .__ + /\\ ___ `- \\ \\ \\ / /___ |__| __| _/ | | |__| ____ __ _____ ___ + | | / \\ | | \\ Y / _ \\| |/ __ | | | | |/ \\| | \\ \\/ / + | | \\___/ | | \\ ( <_> ) / /_/ | | |___| | | \\ | /> < + \\ `-_____ \\/ \\___/ \\____/|__\\____ | |_______ \\__|___| /____//__/\\_ \\ + `-______\\ \\/ \\/ \\/ \\/ +\e[0m +Welcome Back! Linux Version: \r (\n) (\l) diff --git a/etc/mkinitcpio.conf b/etc/mkinitcpio.conf deleted file mode 100644 index 689eb1e24..000000000 --- a/etc/mkinitcpio.conf +++ /dev/null @@ -1,81 +0,0 @@ -# vim:set ft=sh -# MODULES -# The following modules are loaded before any boot hooks are -# run. Advanced users may wish to specify all system modules -# in this array. For instance: -# MODULES=(usbhid xhci_hcd) -MODULES=(i915) - -# BINARIES -# This setting includes any additional binaries a given user may -# wish into the CPIO image. This is run last, so it may be used to -# override the actual binaries included by a given hook -# BINARIES are dependency parsed, so you may safely ignore libraries -BINARIES=() - -# FILES -# This setting is similar to BINARIES above, however, files are added -# as-is and are not parsed in any way. This is useful for config files. -FILES=(/boot/volume.key) - -# HOOKS -# This is the most important setting in this file. The HOOKS control the -# modules and scripts added to the image, and what happens at boot time. -# Order is important, and it is recommended that you do not change the -# order in which HOOKS are added. Run 'mkinitcpio -H ' for -# help on a given hook. -# 'base' is _required_ unless you know precisely what you are doing. -# 'udev' is _required_ in order to automatically load modules -# 'filesystems' is _required_ unless you specify your fs modules in MODULES -# Examples: -## This setup specifies all modules in the MODULES setting above. -## No RAID, lvm2, or encrypted root is needed. -# HOOKS=(base) -# -## This setup will autodetect all modules for your system and should -## work as a sane default -# HOOKS=(base udev autodetect modconf block filesystems fsck) -# -## This setup will generate a 'full' image which supports most systems. -## No autodetection is done. -# HOOKS=(base udev modconf block filesystems fsck) -# -## This setup assembles a mdadm array with an encrypted root file system. -## Note: See 'mkinitcpio -H mdadm_udev' for more information on RAID devices. -# HOOKS=(base udev modconf keyboard keymap consolefont block mdadm_udev encrypt filesystems fsck) -# -## This setup loads an lvm2 volume group. -# HOOKS=(base udev modconf block lvm2 filesystems fsck) -# -## This will create a systemd based initramfs which loads an encrypted root filesystem. -# HOOKS=(base systemd autodetect modconf kms keyboard sd-vconsole sd-encrypt block filesystems fsck) -# -## NOTE: If you have /usr on a separate partition, you MUST include the -# usr and fsck hooks. -HOOKS=(base systemd plymouth autodetect microcode modconf kms keyboard keymap sd-vconsole block sd-encrypt lvm2 filesystems fsck) - -# COMPRESSION -# Use this to compress the initramfs image. By default, zstd compression -# is used for Linux ≥ 5.9 and gzip compression is used for Linux < 5.9. -# Use 'cat' to create an uncompressed image. -#COMPRESSION="zstd" -#COMPRESSION="gzip" -#COMPRESSION="bzip2" -#COMPRESSION="lzma" -#COMPRESSION="xz" -#COMPRESSION="lzop" -#COMPRESSION="lz4" - -# COMPRESSION_OPTIONS -# Additional options for the compressor -#COMPRESSION_OPTIONS=() - -# MODULES_DECOMPRESS -# Decompress loadable kernel modules and their firmware during initramfs -# creation. Switch (yes/no). -# Enable to allow further decreasing image size when using high compression -# (e.g. xz -9e or zstd --long --ultra -22) at the expense of increased RAM usage -# at early boot. -# Note that any compressed files will be placed in the uncompressed early CPIO -# to avoid double compression. -#MODULES_DECOMPRESS="no" diff --git a/etc/pacman.conf b/etc/pacman.conf deleted file mode 100644 index c834223c6..000000000 --- a/etc/pacman.conf +++ /dev/null @@ -1,100 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -Color -#NoProgressBar -CheckSpace -#VerbosePkgLists -ParallelDownloads = 5 -ILoveCandy - -# By default, pacman accepts packages signed by keys that its local keyring -# trusts (see pacman-key and its man page), as well as unsigned packages. -SigLevel = Required DatabaseOptional -LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[core-testing] -#Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -#[extra-testing] -#Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -#[multilib] -#Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs -[chaotic-aur] -Include = /etc/pacman.d/chaotic-mirrorlist diff --git a/etc/pam.d/login b/etc/pam.d/login index 3f8c286c2..7d9c51ad4 100644 --- a/etc/pam.d/login +++ b/etc/pam.d/login @@ -1,9 +1,9 @@ #%PAM-1.0 -auth requisite pam_nologin.so -auth include system-local-login -auth optional pam_gnome_keyring.so -account include system-local-login -session include system-local-login -password include system-local-login -session optional pam_gnome_keyring.so auto_start +auth required pam_securetty.so +auth requisite pam_nologin.so +auth include system-local-login +auth optional pam_gnome_keyring.so +account include system-local-login +session include system-local-login +session optional pam_gnome_keyring.so auto_start diff --git a/etc/sv/runsvdir-drk/run b/etc/sv/runsvdir-drk/run new file mode 100755 index 000000000..952337efc --- /dev/null +++ b/etc/sv/runsvdir-drk/run @@ -0,0 +1,14 @@ +#!/bin/sh + +export USER="drk" +export HOME="/home/$USER" +export XDG_RUNTIME_DIR="/run/user/$(id -u $USER)" +mkdir $XDG_RUNTIME_DIR +chown $USER:$USER $XDG_RUNTIME_DIR + +groups="$(id -Gn "$USER" | tr ' ' ':')" +svdir="$HOME/.config/runit/service" +mkdir -p "$svdir" +chown $USER:$USER "$svdir" + +exec chpst -u "$USER:$groups" runsvdir "$svdir" diff --git a/home/.bash_profile b/home/.bash_profile index a4419c01f..1440202f0 100644 --- a/home/.bash_profile +++ b/home/.bash_profile @@ -23,8 +23,8 @@ export BASHRC="$HOME/.bashrc" # Default apps export TERMINAL="foot" export EDITOR="$HOME/.local/bin/lvim" -export VISUAL="zed" -export BROWSER="flatpak run com.brave.Browser" +export VISUAL="foot -T lunarvim -a lunarvim lvim" +export BROWSER="flatpak run org.mozilla.firefox" export VIEWER="zathura" # Programming languages specific environment variables @@ -35,7 +35,7 @@ export GOPATH="$XDG_DATA_HOME/go" export CARGO_HOME="$XDG_DATA_HOME/cargo" ## Flutter -export CHROME_EXECUTABLE="/var/lib/flatpak/app/com.brave.Browser/x86_64/stable/active/export/bin/com.brave.Browser" +export CHROME_EXECUTABLE="/var/lib/flatpak/app/io.github.ungoogled_software.ungoogled_chromium/x86_64/stable/active/export/bin/io.github.ungoogled_software.ungoogled_chromium" export PUB_CACHE="$XDG_DATA_HOME/pub-cache" export FLUTTER_ROOT="$XDG_LIB_HOME/flutter" export FLUTTER_ANALYTICS_DISABLED=true @@ -47,7 +47,7 @@ export ANDROID_SDK_ROOT="$ANDROID_HOME" export ANDROID_USER_HOME="$XDG_DATA_HOME/android" export ANDROID_EMULATOR_HOME="$ANDROID_USER_HOME" export ANDROID_AVD_HOME="$ANDROID_USER_HOME/avd" -export JAVA_HOME="/usr/lib/jvm/jre-17-openjdk" +export JAVA_HOME="/usr/lib/jvm/openjdk21" export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle" # Set path @@ -108,11 +108,6 @@ if [ ! -d "$WGETDIR" ] || [ ! -d "$GNUPGHOME" ]; then mkdir -p "$WGETDIR" "$GNUPGHOME" fi -# export SSH_AUTH_SOCK -if [[ -z "${SSH_CONNECTION}" ]]; then - export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket" -fi - # Bashrc source "$BASHRC" diff --git a/home/.bashrc b/home/.bashrc index a07a27603..b20f2dbe8 100644 --- a/home/.bashrc +++ b/home/.bashrc @@ -3,7 +3,7 @@ export TERM="xterm-256color" # getting proper colors export HISTCONTROL=ignoredups:erasedups # no duplicate entries ### "bat" as manpager -export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman'" +export MANPAGER="batman" # use bash-completion, if available [[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \ @@ -128,12 +128,12 @@ fi # function to detect os and assign aliases to package managers alias \ - pkg-update="paru -Syu" \ - pkg-install="paru -S" \ - pkg-remove="paru -Rcns" \ - pkg-remove-sec="paru -R" \ - pkg-clean="paru -Scc && paru -Rns (pacman -Qtdq)" \ - pkg-search="paru -Qs" + xbu="sudo xbps-install -Su" \ + xbi="sudo xbps-install -S" \ + xbr="sudo xbps-remove -R" \ + xbrs="sudo xbps-remove" \ + xbc="sudo xbps-remove -Oo" \ + xbs="sudo xbps-query -R" # colorize grep output (good for log files) alias \ @@ -176,9 +176,9 @@ alias \ # power management alias \ - po="systemctl poweroff" \ - sp="systemctl suspend" \ - rb="systemctl reboot" + po="loginctl poweroff" \ + sp="loginctl suspend" \ + rb="loginctl reboot" # file management alias \ @@ -220,10 +220,13 @@ alias \ wfi-off="nmcli radio wifi off" \ blt="bluetoothctl" -# android emulator -alias avd="QT_QPA_PLATFORM=xcb emulator -avd Pixel_7_Pro_API_35" -alias avds="emulator -list-avds" -alias avde="QT_QPA_PLATFORM=xcb emulator -avd" +export SSH_AUTH_SOCK=${HOME}/.ssh/agent +if ! pgrep -u ${USER} ssh-agent > /dev/null; then + rm -f ${SSH_AUTH_SOCK} +fi +if [ ! -S ${SSH_AUTH_SOCK} ]; then + eval $(ssh-agent -a ${SSH_AUTH_SOCK} 2> /dev/null) +fi # starship prompt eval "$(starship init bash)"