diff options
-rw-r--r-- | .bash_aliases | 2 | ||||
-rw-r--r-- | .bashrc | 20 | ||||
-rw-r--r-- | .config/alacritty/alacritty.toml | 2 | ||||
-rw-r--r-- | .config/i3/config | 6 | ||||
-rw-r--r-- | .config/polybar/config.ini | 51 |
5 files changed, 53 insertions, 28 deletions
diff --git a/.bash_aliases b/.bash_aliases index f036f6b..8c511ce 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -1,5 +1,5 @@ # -*- mode: sh -*- alias cg="git --git-dir=$HOME/.config.git/ --work-tree=$HOME" \ userctl="systemctl --user" \ - e="emacsclient --alternate-editor= --create-frame" + e="emacsclient --alternate-editor= --create-frame" \ pf="ps aux | grep" @@ -17,26 +17,20 @@ shopt -s checkwinsize # If set, the pattern "**" used in a pathname expansion context will # match all files and zero or more directories and subdirectories. shopt -s globstar -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi +eval "$(dircolors -b)" +alias ls='ls --color=auto' +alias grep='grep --color=auto' +alias fgrep='fgrep --color=auto' +alias egrep='egrep --color=auto' + # colored GCC warnings and errors export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' source ~/.bash_aliases -export PATH="$PATH:$HOME/.local/bin:$HOME/.config/emacs/bin:$HOME/qmk-work/venv/bin" +export PATH="$PATH:$HOME/.local/bin:$HOME/.config/emacs/bin" export PS1="\[\033[01;32m\]\h\[\033[00m\] \[\033[01;34m\]\w\[\033[00m\] \$ " # IME setup (i don't even know if this works) export GTK_IM_MODULE='uim' export QT_IM_MODULE='uim' export XMODIFIERS='@im=uim' - -# shut up i don't write soy this is the only way i can get beatoraja to work -#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! -export SDKMAN_DIR="$HOME/.sdkman" -[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 32c0811..a846636 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -202,7 +202,7 @@ multiplier = 3 [font] normal = { family = "Hack Nerd Font", style = "Regular" } -size = 9 +size = 6.75 builtin_box_drawing = true # COLORS diff --git a/.config/i3/config b/.config/i3/config index 6c94229..a23a865 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -1,5 +1,6 @@ set $mod Mod4 set $alt Mod1 +exec setxkbmap -option ctrl:nocaps exec setxkbmap -option compose:menu font pango:Hack Nerd Font 10 @@ -12,7 +13,7 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork --image / exec --no-startup-id feh --bg-center --no-fehbg /home/hydrogen/画像/AwayTooLong.png exec_always --no-startup-id /home/hydrogen/.config/i3/polybar.sh exec_always --no-startup-id picom -b -exec_always --no-startup-id killall xborders; ~/.local/bin/xborders --border-radius 11 --border-width 3 --border-rgba '#C4DDDD' +# TODO Add xborders floating_modifier $mod tiling_drag modifier @@ -39,8 +40,7 @@ for_window [class="protonvpn-app"] floating enable for_window [class="Anki"] floating enable for_window [class="feh"] floating enable for_window [class="mpv"] floating enable -for_window [title="フレンドリスト"] floating enable -for_window [title="仮想マシンマネージャー"] floating enable, move position 1530 px 100 px, resizeset 320 px 550 px + # scratchpad keys bindsym $mod+minus move scratchpad diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index 5331d56..5b5ddb2 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -16,6 +16,17 @@ ; ;========================================================== +;[colors] +;background = #00282A2E +;background-alt = #00373B41 +;; foreground = #C5C8C6 +;foreground = #EAFFFF +;primary = #298FC2 +;secondary = #8ABEB7 +;#alert = #4F92BB +;;disabled = #88857C +;disabled = #093E68 + [colors] background = #00282A2E background-alt = #00373B41 @@ -54,9 +65,7 @@ font-0 = monospace;2 modules-left = xworkspaces xwindow modules-center = mpd-artist mpd-bar mpd-song -modules-right = pulseaudio memory cpu systray date - -fixed-center = true +modules-right = pulseaudio battery backlight memory cpu date ;cursor-click = pointer ;cursor-scroll = ns-resize @@ -90,7 +99,7 @@ reverse-scroll = true label-active = %name% label-active-background = ${colors.background-alt} -label-active-underline= ${colors.clock-primary} +label-active-underline= ${colors.primary} label-active-padding = 1 label-occupied = %name% @@ -182,7 +191,7 @@ date = %H:%M date-alt = %Y-%m-%d %H:%M:%S label = %date% -label-foreground = ${colors.clock-primary} +label-foreground = ${colors.primary} [module/mpd-artist] type = internal/mpd @@ -207,11 +216,33 @@ port = 6600 label-song = %title% format-online = <label-song> -;[module/greg] -;type = custom/script -;exec = ~/.local/bin/howgreg -;format-prefix = "GRG " -;format-prefix-foreground = ${colors.primary} +[module/battery] +type = internal/battery +poll-interval = 1 + +format-charging-prefix = "CHG " +format-discharging-prefix = "BAT " +format-full-prefix = "CHG " +format-low-prefix = "LOW " + +format-charging-prefix-foreground = ${colors.primary} +format-discharging-prefix-foreground = ${colors.primary} +format-full-prefix-foreground = ${colors.primary} +format-low-prefix-foreground = ${colors.alert} + +[module/backlight] +type = internal/backlight +card = amdgpu_bl0 +use-actual-brightness = true + +format-prefix = "BGT " +format-prefix-foreground = ${colors.primary} + +[module/greg] +type = custom/script +exec = ~/.local/bin/howgreg +format-prefix = "GRG " +format-prefix-foreground = ${colors.primary} [settings] screenchange-reload = true |