diff --git a/.bash_login b/.bash_login index babcc11..d8f48cb 100644 --- a/.bash_login +++ b/.bash_login @@ -20,56 +20,13 @@ if [ -f "$HOME/.config/localconfig.env" ]; then . "$HOME/.config/localconfig.env" fi -# Load bash -# shellcheck source=./.bashrc -source ./.bashrc +export DOTFILES_BIN="${HOME}/bin" +# gopath should be on ~/.local/share/go to not fuck up with local insta> +# at ~/go if exists +export GOPATH="$HOME/.local/share/go" +# Context: https://git.sr.ht/~sircmpwn/dotfiles/tree/master/item/.profi> +# and https://drewdevault.com/2021/08/06/goproxy-breaks-go.html +export GOPROXY=direct GOSUMDB=off +export PATH="${DOTFILES_BIN}:${GOPATH}/bin:${HOME}/.local/bin:${PATH}" -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/bin" ] ; then - PATH="$HOME/bin:$PATH" -fi - -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/.local/bin" ] ; then - PATH="$HOME/.local/bin:$PATH" -fi - -export PATH="/usr/local/bin:$HOME/.local/bin:$HOME/bin${PATH:+:}$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts" # ~vern specifics and more -mesg n 2> /dev/null || true - -# then import the rest -source "$HOME/.env" -source "$HOME/.config/aliases" -export POSIX_PROFILE_SOURCED=true - -# how about detecting local configs -if [ -f "$HOME/.config/localconfig.env" ]; then - . "$HOME/.config/localconfig.env" -fi - -########################################################################################## -# Code snippets from https://git.sr.ht/~sircmpwn/dotfiles/tree/db5945a4/item/.env -########################################################################################## -if ls --version 2>&1 | grep -i gnu >/dev/null -then - alias ls='ls --color=auto ' -elif ls --version 2>&1 | grep -i busybox >/dev/null -then - alias ls='ls --color=auto ' -fi - -alias recent='ls -ltch' - -# Add optmizations for multicore builds -if [ $(uname) = "Linux" ] -then - nproc=$(grep '^processor' /proc/cpuinfo | wc -l) - if [ $nproc -gt 4 ] - then - # Reserve two cores - nproc=$((nproc - 2)) - fi - export MAKEFLAGS="-j$nproc" - export SAMUFLAGS="-j$nproc" -fi -########################################################################################## +_byobu_sourced=1 . /usr/bin/byobu-launch 2>/dev/null || true diff --git a/.bashrc b/.bashrc index 58582f0..db95831 100644 --- a/.bashrc +++ b/.bashrc @@ -28,7 +28,7 @@ fi ## Note that ~/.env and ~/.env.local should be loaded eariler on ## # Dotfiles stuff, maybe should be on ~/.env? #export DOTFILES_HOME="$HOME/.dotfiles" -export DOTFILES_BIN="$DOTFILES_HOME/bin" +export DOTFILES_BIN="$HOME/bin" # gopath should be on ~/.local/share/go to not fuck up with local install # at ~/go if exists export GOPATH="$HOME/.local/share/go" @@ -44,6 +44,7 @@ export EDITOR=nano export GOPROXY=direct GOSUMDB=off # nix profile install nixpkgs#glibcLocale export LOCALE_ARCHIVE="$HOME/.nix-profile/lib/locale/locale-archive" +export PATH="${DOTFILES_BIN}:${GOPATH}/bin:${HOME}/.local/bin:${PATH}" ## Stage 2: Source literally everything else ## if [[ -d "$HOME/.bashbox" ]]; then diff --git a/.config/gh/config.yml b/.config/gh/config.yml index 89d7b02..b590458 100644 --- a/.config/gh/config.yml +++ b/.config/gh/config.yml @@ -20,3 +20,4 @@ aliases: http_unix_socket: # What web browser gh should use when opening URLs. If blank, will refer to environment. browser: +version: "1" diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 0dc6257..c84ce8e 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -19,6 +19,8 @@ highlight_changes_delay_secs=5 find_comm_in_cmdline=1 strip_exe_from_cmdline=1 show_merged_command=1 +tree_view=1 +tree_view_always_by_pid=0 header_margin=1 screen_tabs=0 detailed_cpu_time=1 diff --git a/.config/konsolerc b/.config/konsolerc new file mode 100644 index 0000000..e8af62a --- /dev/null +++ b/.config/konsolerc @@ -0,0 +1,94 @@ +[Desktop Entry] +DefaultProfile=Byobu.profile + +[General] +ConfigVersion=1 + +[KFileDialog Settings] +Recent Files[$e]=personal,file:$HOME/.ssh/personal +Recent URLs[$e]=file:$HOME/.ssh/ +detailViewIconSize=16 + +[KonsoleWindow] +RememberWindowSize=false +ShowWindowTitleOnTitleBar=true + +[MainWindow] +1209x683 screen: Height=624 +1209x683 screen: Width=1209 +1209x683 screen: Window-Maximized=true +1209x683 screen: XPosition=0 +1209x683 screen: YPosition=59 +1214x683 screen: Height=584 +1214x683 screen: Width=911 +1214x683 screen: XPosition=151 +1214x683 screen: YPosition=78 +1280x1024 screen: Window-Maximized=true +1280x720 screen: Window-Maximized=true +1280x960 screen: Window-Maximized=true +1360x768 screen: Height=696 +1360x768 screen: Width=1360 +1360x768 screen: Window-Maximized=true +1360x768 screen: XPosition=0 +1360x768 screen: YPosition=72 +1366x768 screen: Height=704 +1366x768 screen: Width=1366 +1366x768 screen: Window-Maximized=true +1366x768 screen: XPosition=0 +1366x768 screen: YPosition=64 +1920x1080 screen: Height=692 +1920x1080 screen: Width=1280 +1920x1080 screen: Window-Maximized=true +1920x1080 screen: XPosition=320 +1920x1080 screen: YPosition=208 +2 screens: Height=624 +2 screens: Width=607 +2 screens: XPosition=0 +2 screens: YPosition=59 +HDMI-1=HDMI-1 +HDMI-1 Height 1366x768 HDMI-1=701 +HDMI-1 Width 1366x768 HDMI-1=1366 +HDMI-1 Window-Maximized 1366x768 HDMI-1=true +HDMI-1 XPosition 1366x768 HDMI-1=0 +HDMI-1 YPosition 1366x768 HDMI-1=67 +HDMI-1 eDP-1=eDP-1 +HDMI-1 eDP-1 Height 1366x768 HDMI-1=701 +HDMI-1 eDP-1 Width 1366x768 HDMI-1=1366 +HDMI-1 eDP-1 Window-Maximized 1366x768 HDMI-1=true +HDMI-1 eDP-1 Window-Maximized 1366x768 eDP-1=true +HDMI-1 eDP-1 XPosition 1366x768 HDMI-1=1366 +HDMI-1 eDP-1 YPosition 1366x768 HDMI-1=67 +MenuBar=Enabled +RestorePositionForNextInstance=false +State=AAAA/wAAAAD9AAAAAQAAAAAAAAD1AAACjfwCAAAAAvsAAAAiAFEAdQBpAGMAawBDAG8AbQBtAGEAbgBkAHMARABvAGMAawAAAAAA/////wAAAXwBAAAD+wAAABwAUwBTAEgATQBhAG4AYQBnAGUAcgBEAG8AYwBrAAAAAC4AAAKNAAABFQEAAAMAAAOPAAAB/AAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAQAAAOj/////AAAAAAAAAAA= +ToolBarsMovable=Disabled +eDP-1=eDP-1 +eDP-1 HDMI-1=eDP-1 +eDP-1 HDMI-1 Window-Maximized 1366x768 eDP-1=true +eDP-1 HDMI-1 XPosition 1366x768 eDP-1=567 +eDP-1 HDMI-1 YPosition 1366x768 eDP-1=367 +eDP-1 Height 1366x768=701 +eDP-1 Height 1366x768 eDP-1=701 +eDP-1 Height 768=698 +eDP-1 Width 1366=1366 +eDP-1 Width 1366x768=1366 +eDP-1 Width 1366x768 eDP-1=1366 +eDP-1 Window-Maximized 1366x768=true +eDP-1 Window-Maximized 1366x768 eDP-1=true +eDP-1 XPosition=0 +eDP-1 XPosition 1366x768=0 +eDP-1 XPosition 1366x768 eDP-1=0 +eDP-1 YPosition=24 +eDP-1 YPosition 1366x768=67 +rdp0 Height 768=712 +rdp0 Width 1364=1364 +rdp0 Window-Maximized 1364x768=true +rdp0 XPosition=0 +rdp0 YPosition=56 + +[TabBar] +NewTabButton=true +TabBarVisibility=AlwaysShowTabBar + +[UiSettings] +ColorScheme=Default diff --git a/.profile b/.profile index ec21dcf..42c0615 100644 --- a/.profile +++ b/.profile @@ -17,19 +17,7 @@ if [ -n "$BASH_VERSION" ]; then fi fi -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/bin" ] ; then - PATH="$HOME/bin:$PATH" -fi - -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/.local/bin" ] ; then - PATH="$HOME/.local/bin:$PATH" -fi - -# Add $GOPATH/bin into PATH -export GOPATH="$HOME/.local/share/go" -export PATH="$GOPATH/bin:$PATH" +export PATH="/usr/local/bin::$HOME/bin:$HOME/.local/bin:$HOME/bin${PATH:+:}$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts" # ~vern specifics and more mesg n 2> /dev/null || true # then import the rest