Cleanup
This commit is contained in:
tactonbishop
parent
37b42223f8
commit
55a4496b20
6 changed files with 60 additions and 137 deletions
37
.zshrc
37
.zshrc
|
|
@ -1,37 +0,0 @@
|
|||
export ZSH="/home/thomas/.oh-my-zsh"
|
||||
|
||||
alias vim="nvim"
|
||||
alias cat="bat"
|
||||
|
||||
ZSH_THEME=spaceship
|
||||
|
||||
SPACESHIP_PACKAGE_SHOW=true
|
||||
SPACESHIP_TIME_SHOW=true
|
||||
SPACESHIP_NODE_SHOW=true
|
||||
SPACESHIP_PACKAGE_SYMBOL=""
|
||||
SPACESHIP_PACKAGE_COLOR="#e08009"
|
||||
SPACESHIP_GIT_BRANCH_COLOR="#00aae0"
|
||||
SPACESHIP_DIR_COLOR="#18e000"
|
||||
SPACESHIP_TIME_COLOR="#bde000"
|
||||
SPACESHIP_EXEC_TIME_SHOW=true
|
||||
|
||||
plugins=(git npm zsh-syntax-highlighting)
|
||||
|
||||
# User configuration
|
||||
|
||||
# Prompt on new line
|
||||
prompt_end() {
|
||||
if [[ -n $CURRENT_BG ]]; then
|
||||
echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
|
||||
else
|
||||
echo -n "%{%k%}"
|
||||
fi
|
||||
echo -n "\n%{%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{%f%}"
|
||||
CURRENT_BG=''
|
||||
}
|
||||
|
||||
BROWSER=/usr/bin/google-chrome-stable
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<alias>
|
||||
<family>sans-serif</family>
|
||||
<prefer>
|
||||
<family>Roboto</family>
|
||||
<family>Inter</family>
|
||||
</prefer>
|
||||
</alias>
|
||||
|
||||
|
|
|
|||
31
i3/config
31
i3/config
|
|
@ -60,10 +60,11 @@ bindsym $mod+d exec --no-startup-id dmenu_run
|
|||
# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
|
||||
|
||||
# change focus
|
||||
bindsym $mod+j focus left
|
||||
bindsym $mod+k focus down
|
||||
bindsym $mod+l focus up
|
||||
bindsym $mod+semicolon focus right
|
||||
|
||||
bindsym $mod+h focus left
|
||||
bindsym $mod+j focus down
|
||||
bindsym $mod+k focus up
|
||||
bindsym $mod+l focus right
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
bindsym $mod+Left focus left
|
||||
|
|
@ -78,16 +79,17 @@ bindsym $mod+Shift+l move up
|
|||
bindsym $mod+Shift+semicolon move right
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
bindsym $mod+Shift+Left move left
|
||||
bindsym $mod+Shift+Down move down
|
||||
bindsym $mod+Shift+Up move up
|
||||
bindsym $mod+Shift+Right move right
|
||||
# bindsym $mod+Shift+Left move left
|
||||
# bindsym $mod+Shift+Down move down
|
||||
# bindsym $mod+Shift+Up move up
|
||||
# bindsym $mod+Shift+Right move right
|
||||
|
||||
|
||||
# split in horizontal orientation
|
||||
bindsym $mod+h split h
|
||||
bindsym $mod+Shift+Right split h
|
||||
|
||||
# split in vertical orientation
|
||||
bindsym $mod+v split v
|
||||
bindsym $mod+Shift+Down split v
|
||||
|
||||
# enter fullscreen mode for the focused container
|
||||
bindsym $mod+f fullscreen toggle
|
||||
|
|
@ -161,10 +163,11 @@ mode "resize" {
|
|||
# Pressing right will grow the window’s width.
|
||||
# Pressing up will shrink the window’s height.
|
||||
# Pressing down will grow the window’s height.
|
||||
bindsym j resize shrink width 10 px or 10 ppt
|
||||
bindsym k resize grow height 10 px or 10 ppt
|
||||
bindsym l resize shrink height 10 px or 10 ppt
|
||||
bindsym semicolon resize grow width 10 px or 10 ppt
|
||||
|
||||
bindsym $mod+h resize shrink width 10 px or 10 ppt
|
||||
bindsym $mod+j resize grow height 10 px or 10 ppt
|
||||
bindsym $mod+k resize shrink height 10 px or 10 ppt
|
||||
bindsym $mod+l resize grow width 10 px or 10 ppt
|
||||
|
||||
# same bindings, but for the arrow keys
|
||||
bindsym Left resize shrink width 10 px or 10 ppt
|
||||
|
|
|
|||
|
|
@ -17,61 +17,40 @@
|
|||
;==========================================================
|
||||
[colors]
|
||||
background = #112615
|
||||
background-alt = #444
|
||||
foreground = #637d75
|
||||
foreground-alt = #717f24
|
||||
primary = #2f7e25
|
||||
secondary = #2f6a7f
|
||||
alert = #7f2b26
|
||||
disabled = #707880
|
||||
; [colors]
|
||||
; background = #282A2E
|
||||
; background-alt = #373B41
|
||||
; foreground = #C5C8C6
|
||||
; primary = #F0C674
|
||||
; secondary = #8ABEB7
|
||||
; alert = #A54242
|
||||
; disabled = #707880
|
||||
|
||||
|
||||
[bar/example]
|
||||
|
||||
width = 100%
|
||||
height = 27
|
||||
radius = 0
|
||||
|
||||
; dpi = 96
|
||||
|
||||
monitor = ${env:MONITOR:}
|
||||
|
||||
background = ${colors.background}
|
||||
foreground = ${colors.foreground}
|
||||
|
||||
line-size = 2
|
||||
|
||||
border-size = 0
|
||||
border-color = #00000000
|
||||
|
||||
padding-left = 2
|
||||
padding-right = 2
|
||||
|
||||
module-margin-left = 1
|
||||
<<<<<<< HEAD
|
||||
module-margin-right =3
|
||||
=======
|
||||
module-margin-right =2
|
||||
>>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb
|
||||
|
||||
;separator = |
|
||||
;separator-foreground = ${colors.disabled}
|
||||
|
||||
font-0 = Roboto:pixelsize=11:style=Medium; 2
|
||||
font-1 = unicode:fontformat=truetype:size=8:antialias=false;0
|
||||
font-2 = siji:pixelsize=10;1
|
||||
<<<<<<< HEAD
|
||||
font-2 = FontAwesome:size=10;1"
|
||||
font-3 = SymbolsNerdFont:size=15;3
|
||||
=======
|
||||
font-3 = SymbolsNerdFont:size=14;5
|
||||
>>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb
|
||||
|
||||
|
||||
modules-left = my-text-label xworkspaces xwindow
|
||||
modules-right = filesystem memory cpu battery temperature wlan date
|
||||
; modules-right = filesystem pulseaudio xkeyboard memory cpu wlan eth date
|
||||
|
|
@ -84,21 +63,11 @@ cursor-scroll = ns-resize
|
|||
|
||||
enable-ipc = true
|
||||
|
||||
; tray-position = right
|
||||
|
||||
; wm-restack = generic
|
||||
; wm-restack = bspwm
|
||||
; wm-restack = i3
|
||||
|
||||
; override-redirect = true
|
||||
|
||||
[module/xworkspaces]
|
||||
type = internal/xworkspaces
|
||||
|
||||
label-active = %name%
|
||||
label-active-foreground = #0f1610
|
||||
label-active-background = #2f7e25
|
||||
;label-active-underline= #18e000
|
||||
label-active-padding = 3
|
||||
|
||||
label-occupied = %name%
|
||||
|
|
@ -116,37 +85,31 @@ label-empty-padding = 3
|
|||
[module/xwindow]
|
||||
type = internal/xwindow
|
||||
label = %title:0:60:...%
|
||||
;format-foreground = #717f24
|
||||
|
||||
[module/filesystem]
|
||||
type = internal/fs
|
||||
interval = 25
|
||||
|
||||
mount-0 = /
|
||||
|
||||
label-mounted = %{F#18e000}%mountpoint%%{F-} %percentage_used%% (%used%/%free%)
|
||||
label-mounted = %{F#2f7e25} %{F-} %percentage_used%% (%used%/%free%)
|
||||
label-mounted-underline = #2f7e25
|
||||
label-unmounted = %mountpoint% not mounted
|
||||
label-unmounted-foreground = ${colors.disabled}
|
||||
|
||||
[module/pulseaudio]
|
||||
type = internal/pulseaudio
|
||||
|
||||
format-volume-prefix = "VOL "
|
||||
format-volume-prefix-foreground = ${colors.primary}
|
||||
format-volume = <label-volume>
|
||||
|
||||
label-volume = %percentage%%
|
||||
|
||||
label-muted = muted
|
||||
label-muted-foreground = ${colors.disabled}
|
||||
|
||||
[module/xkeyboard]
|
||||
type = internal/xkeyboard
|
||||
blacklist-0 = num lock
|
||||
|
||||
label-layout = %layout%
|
||||
label-layout-foreground = ${colors.primary}
|
||||
|
||||
label-indicator-padding = 2
|
||||
label-indicator-margin = 1
|
||||
label-indicator-foreground = ${colors.background}
|
||||
|
|
@ -155,16 +118,15 @@ label-indicator-background = ${colors.secondary}
|
|||
[module/memory]
|
||||
type = internal/memory
|
||||
interval = 2
|
||||
format-prefix = ""
|
||||
format-prefix = ""
|
||||
format-underline = #707f23
|
||||
format-prefix-foreground = ${colors.primary}
|
||||
;format-prefix-foreground = ${colors.primary}
|
||||
label = %percentage_used:2% (%gb_used%/%gb_free%)
|
||||
|
||||
label = %percentage_used:2%% (%gb_used%/%gb_free%)
|
||||
label-padding = 1
|
||||
[module/cpu]
|
||||
type = internal/cpu
|
||||
interval = 2
|
||||
format-prefix = ""
|
||||
format-prefix = ""
|
||||
format-underline = #df8008
|
||||
format-prefix-foreground = ${colors.primary}
|
||||
label = %percentage:2%%
|
||||
|
|
@ -179,18 +141,16 @@ label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
|
|||
[module/wlan]
|
||||
inherit = network-base
|
||||
interface-type = wireless
|
||||
;label-connected = %{F#F0C674}%ifname%%{F-} %essid%
|
||||
|
||||
interval = 3.0
|
||||
|
||||
format-connected = <ramp-signal> <label-connected>
|
||||
format-connected-underline = #47577e
|
||||
label-connected = %essid%
|
||||
ramp-signal-0 =
|
||||
ramp-signal-1 =
|
||||
ramp-signal-2 =
|
||||
ramp-signal-3 =
|
||||
ramp-signal-4 =
|
||||
label-connected-padding = 1
|
||||
ramp-signal-0 =
|
||||
ramp-signal-1 =
|
||||
ramp-signal-2 =
|
||||
ramp-signal-3 =
|
||||
ramp-signal-4 =
|
||||
ramp-signal-foreground = ${colors.primary}
|
||||
|
||||
[module/eth]
|
||||
|
|
@ -201,82 +161,79 @@ label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%
|
|||
[module/date]
|
||||
type = internal/date
|
||||
interval = 1
|
||||
|
||||
format-underline = #2f697f
|
||||
format-prefix-foreground = ${colors.primary}
|
||||
format-prefix = " "
|
||||
format-prefix = ""
|
||||
date = %a %d %b %Y
|
||||
date-alt = %Y-%m-%d %H:%M:%S
|
||||
time = %H:%M
|
||||
time-alt = %H:%M:%S
|
||||
label = %date% %{F#717f24}%time%
|
||||
; label-foreground = ${colors.primary}
|
||||
label-padding = 2
|
||||
|
||||
[module/temperature]
|
||||
type = internal/temperature
|
||||
thermal-zone = 0
|
||||
warn-temperature = 60
|
||||
|
||||
format = <ramp> <label>
|
||||
format-underline = #327f77
|
||||
format-warn = <ramp> <label-warn>
|
||||
format-warn-underline = ${self.format-underline}
|
||||
|
||||
label = %temperature-c%
|
||||
label-warn = %temperature-c%
|
||||
label-warn-foreground = ${colors.alert}
|
||||
ramp-0 =
|
||||
ramp-1 =
|
||||
ramp-2 =
|
||||
label-padding = 1
|
||||
label-warn-padding = 2
|
||||
ramp-0 =
|
||||
ramp-1 =
|
||||
ramp-2 =
|
||||
ramp-foreground = ${colors.primary}
|
||||
|
||||
[module/battery]
|
||||
type = internal/battery
|
||||
battery = BAT0
|
||||
adapter = ADP1
|
||||
<<<<<<< HEAD
|
||||
full-at = 100
|
||||
=======
|
||||
full-at = 98
|
||||
>>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb
|
||||
interval = 1
|
||||
format-charging = <animation-charging> <label-charging>
|
||||
format-charging-underline = #637d75
|
||||
|
||||
format-charging = <animation-charging> <label-charging>
|
||||
label-charging-padding = 1
|
||||
label-discharging-padding = 1
|
||||
label-full-padding = 1
|
||||
format-charging-underline = #637d75
|
||||
format-discharging = <animation-discharging> <label-discharging>
|
||||
format-discharging-underline = ${self.format-charging-underline}
|
||||
|
||||
format-full-prefix = " "
|
||||
format-full-prefix = ""
|
||||
format-full-prefix-foreground = ${colors.primary}
|
||||
format-full-underline = ${self.format-charging-underline}
|
||||
|
||||
ramp-capacity-0 =
|
||||
ramp-capacity-1 = c
|
||||
ramp-capacity-1 =
|
||||
ramp-capacity-2 =
|
||||
ramp-capacity-foreground = ${colors.primary}
|
||||
|
||||
animation-charging-0 =
|
||||
animation-charging-1 =
|
||||
animation-charging-2 =
|
||||
animation-charging-0 =
|
||||
animation-charging-1 =
|
||||
animation-charging-2 =
|
||||
animation-charging-3 =
|
||||
animation-charging-4 =
|
||||
animation-charging-foreground = ${colors.foreground-alt}
|
||||
animation-charging-framerate = 750
|
||||
|
||||
animation-discharging-0 =
|
||||
animation-discharging-1 =
|
||||
animation-discharging-2 =
|
||||
animation-discharging-0 =
|
||||
animation-discharging-1 =
|
||||
animation-discharging-2 =
|
||||
animation-discharging-3 =
|
||||
animation-discharging-4 =
|
||||
animation-discharging-foreground = ${colors.alert}
|
||||
animation-discharging-framerate = 750
|
||||
|
||||
[module/my-text-label]
|
||||
type = custom/text
|
||||
content =
|
||||
;content-background = #2f7e25
|
||||
content-foreground = #2f6a7f
|
||||
<<<<<<< HEAD
|
||||
content-padding = 1
|
||||
=======
|
||||
content-padding = 3
|
||||
>>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb
|
||||
|
||||
[settings]
|
||||
screenchange-reload = true
|
||||
pseudo-transparency = true
|
||||
|
|
|
|||
|
|
@ -77,6 +77,6 @@
|
|||
"[shellscript]": {
|
||||
"editor.defaultFormatter": "foxundermoon.shell-format"
|
||||
},
|
||||
"workbench.colorTheme": "Default Light+",
|
||||
"workbench.colorTheme": "Alien Blood ",
|
||||
"window.titleBarStyle": "custom"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue