Skip to content

Commit

Permalink
updated stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
usymmij committed May 2, 2024
1 parent cb1a4bc commit 792c92b
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .bash_aliases
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ alias envpip='$CONDA_PREFIX/bin/pip'
alias get_idf='. $HOME/code/esp-idf/export.sh'
alias z='zoxide'
alias kvim='nvim ~/agenda.md -c "KanbanOpen ~/agenda.md"'

alias windows='sudo bootctl set-oneshot windows.conf'

if [ -f ~/.hidden_aliases ]; then
. ~/.hidden_aliases
Expand Down
25 changes: 22 additions & 3 deletions .bash_profile
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
#
#! /bin/bash
# ~/.bash_profile
#

[[ -f ~/.bashrc ]] && . ~/.bashrc
export PATH=$PATH:/home/jimmy/.spicetify

export HYPRSHOT_DIR="screenshots"

# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/usr/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/usr/etc/profile.d/conda.sh" ]; then
. "/usr/etc/profile.d/conda.sh"
elif [ -f "/opt/miniconda3/bin/conda" ]; then
export PATH="/opt/miniconda3/bin:$PATH"
else
export PATH="/usr/bin:$PATH"
fi
fi
unset __conda_setup

export CRYPTOGRAPHY_OPENSSL_NO_LEGACY=1
# <<< conda initialize <<<
20 changes: 4 additions & 16 deletions .bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,7 @@ export PATH="/home/jimmy/.local/bin:$PATH"

eval "$(starship init bash)"

# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/usr/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/usr/etc/profile.d/conda.sh" ]; then
. "/usr/etc/profile.d/conda.sh"
else
export PATH="/usr/bin:$PATH"
fi
fi
unset __conda_setup
# <<< conda initialize <<<

#
# some more ls aliases
alias ll='ls -lh'
Expand All @@ -40,6 +27,9 @@ alias l='ls -CF'
if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
fi
if [ -f ~/.bash_profile ]; then
. ~/.bash_profile
fi

# Default parameter to send to the "less" command
# -R: show ANSI colors correctly; -i: case insensitive search
Expand All @@ -52,5 +42,3 @@ export PATH=$PATH:/home/jimmy/.spicetify
fastfetch -c paleofetch.jsonc



[ -f "/home/jimmy/.ghcup/env" ] && . "/home/jimmy/.ghcup/env" # ghcup-env
8 changes: 5 additions & 3 deletions .config/hypr/hyprland.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#monitor=DP-1, 1920x1080, 0x0, 1, mirror, eDP-1

monitor=DP-1, 1920x1080, 0x0, 1
monitor=HDMI-A-1, 1920x1080, 1920x0, 1, transform, 3
monitor=HDMI-A-1, 1920x1080, 1920x0, 1

# requires running swww init not sure why

# LANDSCAPE
Expand Down Expand Up @@ -40,11 +41,12 @@ input {

touchpad {
natural_scroll = no
scroll_factor = 0.5
scroll_factor = 0.5

}

sensitivity = -0.5 # -1.0 - 1.0, 0 means no modification.
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
accel_profile = flat
}

general {
Expand Down
5 changes: 3 additions & 2 deletions .config/hypr/scripts/bgaction
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#!/usr/bin/bash

#start swwww
swww query || swww init
swww query || swww-daemon & disown

#figure out which waybar theme is set
THEMEIS=$(readlink -f ~/.config/waybar/style.css | cut -d '-' -f2)

#show the correct wallpapper based on the theme
if [ $THEMEIS == "dark.css" ]; then
swww img ~/.config/hypr/wallpaper-dark.jpg
swww img ~/.config/hypr/wallpaper-dark.jpg
swww img ~/.config/hypr/wallpaper-dark.gif
else
swww img ~/.config/hypr/wallpaper.jpg
fi
Binary file removed .config/hypr/wallpaper-backup.jpg
Binary file not shown.
Binary file added .config/hypr/wallpaper-dark.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .config/hypr/wallpaper-dark.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 792c92b

Please sign in to comment.