1
0
Fork 0

Compare commits

...

4 Commits

Author SHA1 Message Date
Nigel Barink 1945d5a56d
Point to new neovim config 2024-05-09 20:16:03 +02:00
Nigel Barink 39a4421e84
FEAT: Improved zsh, starship and i3 config
Changed colorscheme to fit otter for starship
Edited zshrc aliases
2024-05-09 20:12:36 +02:00
Nigel Barink 37f8620d93
FEAT: Changed tmux theme to catppuccin 2024-05-09 20:11:09 +02:00
Nigel Barink dc1eb8a69a
FEAT: Spread polybar config
Polybar configuration has been spread out over multiple files.
Each file contains a certain topic:
- colors.ini # Defines colors used
- modules.ini # Defines config for modules used
- mybar.ini # Defines mybar
- settings.ini # General polybar settings
2024-05-09 20:06:50 +02:00
10 changed files with 200 additions and 190 deletions

View File

@ -16,6 +16,9 @@ set $mod Mod4
font pango:Hack Nerd Font 11
exec --no-startup-id picom -b
exec --no-startup-id feh --bg-fill $HOME/Pictures/Wallpapers/430795.jpg
exec_always --no-startup-id autotiling -w 1 3 5 7 9
exec --no-startup-id "sh ~/.xprofile"
focus_follows_mouse no
# This font is widely installed, provides lots of unicode glyphs, right-to-left
# text rendering and scalability on retina/hidpi displays (thanks to pango).
@ -30,7 +33,6 @@ focus_follows_mouse no
# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
# start a terminal
bindsym $mod+Return exec alacritty
@ -211,5 +213,7 @@ bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightne
bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% # raise volume
bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% # lower volume
bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle # toggle mute for default device
# use i3lock-fancy
bindsym $mod-z exec i3lock-fancy
for_window [title="virtual Machine Manager"] floating enable
for_window [class="plasmashell" window_type="notification"] floating enable, border none, move right 700px, move down 450px
no_focus [class="plasmashell" window_type="notification"]

2
nvim

@ -1 +1 @@
Subproject commit e9488d594881b481094c1e4e4897caef68cfc38c
Subproject commit 0d5552904c43bdbd610c73d998a65c1c27ef5d7e

9
polybar/colors.ini Normal file
View File

@ -0,0 +1,9 @@
[colors]
background = #64391d
background-alt = #b38a5b
foreground = #FFFFFF
primary = #b7d72c
secondary = #dde368
alert = #7c2c09
disabled = #4f3b22

View File

@ -15,158 +15,8 @@
; The README contains a lot of information
;
;==========================================================
[colors]
background = #64391d
background-alt = #b38a5b
foreground = #FFFFFF
primary = #b7d72c
secondary = #dde368
alert = #7c2c09
disabled = #4f3b22
[bar/MyBar]
width = 100%
height = 24pt
radius = 3
; dpi = 96
background = ${colors.background}
foreground = ${colors.foreground}
line-size = 4pt
border-size = 4pt
border-color = #64391d
padding-left = 0
padding-right = 1
module-margin = 1
separator = |
separator-foreground = ${colors.disabled}
font-0 = monospace;2
modules-left = xworkspaces xwindow
modules-right = pulseaudio memory cpu eth date
cursor-click = pointer
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-background = ${colors.background-alt}
label-active-underline= ${colors.primary}
label-active-padding = 1
label-occupied = %name%
label-occupied-padding = 1
label-urgent = %name%
label-urgent-background = ${colors.alert}
label-urgent-padding = 1
label-empty = %name%
label-empty-foreground = ${colors.disabled}
label-empty-padding = 1
[module/xwindow]
type = internal/xwindow
label = %title:0:60:...%
[module/filesystem]
type = internal/fs
interval = 25
mount-0 = /
label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%%
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}
label-indicator-background = ${colors.secondary}
[module/memory]
type = internal/memory
interval = 2
format-prefix = "RAM "
format-prefix-foreground = ${colors.primary}
label = %percentage_used:2%%
[module/cpu]
type = internal/cpu
interval = 2
format-prefix = "CPU "
format-prefix-foreground = ${colors.primary}
label = %percentage:2%%
[network-base]
type = internal/network
interval = 5
format-connected = <label-connected>
format-disconnected = <label-disconnected>
label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
[module/wlan]
inherit = network-base
interface-type = wireless
label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%
[module/eth]
inherit = network-base
interface-type = wired
label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%
[module/date]
type = internal/date
interval = 1
date = %d-%m-%Y %H:%M
date-alt = %Y-%m-%d %H:%M:%S
label = %date%
label-foreground = ${colors.primary}
[settings]
screenchange-reload = true
pseudo-transparency = true
include-file = colors.ini
include-file = settings.ini
include-file = mybar.ini
include-file = modules.ini
; vim:ft=dosini

98
polybar/modules.ini Normal file
View File

@ -0,0 +1,98 @@
[module/xworkspaces]
type = internal/xworkspaces
label-active = %name%
label-active-background = ${colors.background-alt}
label-active-underline= ${colors.primary}
label-active-padding = 1
label-occupied = %name%
label-occupied-padding = 1
label-urgent = %name%
label-urgent-background = ${colors.alert}
label-urgent-padding = 1
label-empty = %name%
label-empty-foreground = ${colors.disabled}
label-empty-padding = 1
[module/xwindow]
type = internal/xwindow
label = %title:0:60:...%
[module/filesystem]
type = internal/fs
interval = 25
mount-0 = /
label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%%
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}
label-indicator-background = ${colors.secondary}
[module/memory]
type = internal/memory
interval = 2
format-prefix = "RAM "
format-prefix-foreground = ${colors.primary}
label = %percentage_used:2%%
[module/cpu]
type = internal/cpu
interval = 2
format-prefix = "CPU "
format-prefix-foreground = ${colors.primary}
label = %percentage:2%%
[network-base]
type = internal/network
interval = 5
format-connected = <label-connected>
format-disconnected = <label-disconnected>
label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
[module/wlan]
inherit = network-base
interface-type = wireless
label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%
[module/eth]
inherit = network-base
interface-type = wired
label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%
[module/date]
type = internal/date
interval = 1
date = %d-%m-%Y %H:%M
date-alt = %Y-%m-%d %H:%M:%S
label = %date%
label-foreground = ${colors.primary}

40
polybar/mybar.ini Normal file
View File

@ -0,0 +1,40 @@
[bar/MyBar]
width = 100%
height = 24pt
radius = 3
; dpi = 96
background = ${colors.background}
foreground = ${colors.foreground}
line-size = 4pt
border-size = 4pt
border-color = #64391d
padding-left = 0
padding-right = 1
module-margin = 1
separator = |
separator-foreground = ${colors.disabled}
font-0 = monospace;2
modules-left = xworkspaces xwindow
modules-right = pulseaudio memory cpu eth date
cursor-click = pointer
cursor-scroll = ns-resize
enable-ipc = true
; tray-position = right
; wm-restack = generic
; wm-restack = bspwm
; wm-restack = i3
; override-redirect = true

4
polybar/settings.ini Normal file
View File

@ -0,0 +1,4 @@
[settings]
screenchange-reload = true
pseudo-transparency = true

View File

@ -1,19 +1,19 @@
format = """
[](#a3aed2)\
[ \ue712 ](bg:#a3aed2 fg:#090c0c)\
[](bg:#769ff0 fg:#a3aed2)\
[](#788F48)\
[ \ue712 ](bg:#648519 fg:#b7b8ba)\
[](bg:#648519 fg:#648519)\
$directory\
[](fg:#769ff0 bg:#394260)\
[](bg:#7D9F3F fg:#648519)\
$git_branch\
$git_status\
[](fg:#394260 bg:#212736)\
[](bg:#8D995B fg:#7D9F3F)\
$python\
$rust\
$golang\
$c\
[](fg:#212736 bg:#1d2230)\
[](fg:#8D995B bg:#648519)\
$time\
[ ](fg:#1d2230)\
[ ](fg:#648519)\
\n$character
"""
[username]
@ -23,7 +23,7 @@ disabled= false
show_always = true
[directory]
style = "fg:#e3e5e5 bg:#769ff0"
style = "fg:#e3e5e5 bg:#648519"
format = "[ $path ]($style)"
truncation_length = 3
truncation_symbol = ".../"
@ -31,35 +31,35 @@ truncation_symbol = ".../"
[git_branch]
symbol = ""
style = "bg:#394260"
format = '[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)'
style = "bg:#7D9F3F"
format = '[[ $symbol $branch ](fg:#b7b8ba bg:#7D9F3F)]($style)'
[git_status]
style = "bg:#394260"
format = '[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)'
style = "bg:#7D9F3F"
format = '[[($all_status$ahead_behind )](fg:#b7b8ba bg:#7D9F3F)]($style)'
[rust]
symbol = ""
style = "bg:#212736"
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
style = "bg:#8D995B"
format = '[[ $symbol ($version) ](fg:#b7b8ba bg:#8D995B)]($style)'
[c]
symbol = "\ue61e"
style = "bg:#212736"
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
format = '[[ $symbol ($version) ](fg:#b7b8ba bg:#212736)]($style)'
[golang]
symbol = ""
style = "bg:#212736"
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
style = "bg:#8D995B"
format = '[[ $symbol ($version) ](fg:#b7b8ba bg:#8D995B)]($style)'
[python]
format = '[[ $symbol ($version) (\($virtualenv\)) ](fg:#769ff0 bg:#212736)]($style)'
format = '[[ $symbol ($version) (\($virtualenv\)) ](fg:#b7b8ba bg:#8D995B)]($style)'
[time]
disabled = false
time_format = "%R" # Hour:Minute Format
style = "bg:#1d2230"
format = '[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)'
style = "bg:#648519"
format = '[[  $time ](fg:#b7b8ba bg:#648519)]($style)'

View File

@ -18,15 +18,14 @@ bind v split-window -v
# set Status bar options
set-option -g status-position top
set-window-option -g window-status-style fg=White,bg="#61f230"
set-window-option -g window-status-current-style fg=White,bg="#9aff78"
set-option -g allow-rename off
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'dracula/tmux'
set -g @dracula-plugins 'cpu-usage git ram-usage time'
set -g @dracula-show-left-icon \uebc8
set -g @plugin 'catppuccin/tmux'
set -g @catppuccin_flavour 'macchiato'
set -g @catppuccin_status_modules_right "application session"
set -g @catppuccin_status_modules_left ""
set -s default-terminal 'xterm-256color'
# set some sanity options
# - This makes sure to keep the window/pane count starting at 1

View File

@ -60,14 +60,14 @@ if [[ -n $SSH_CONNECTION ]]; then
fi
# Personal aliases
alias zshconfig="nvim ~/.zshrc"
alias ohmyzsh="nvim ~/.oh-my-zsh"
alias zshconfig="$EDITOR ~/.zshrc"
alias ohmyzsh="$EDITOR ~/.oh-my-zsh"
alias dev="cd /home/nigel/Development"
alias dotfiles="cd /home/nigel/.dotfiles"
# Personal Aliases
alias zshconfig="mate ~/.zshrc"
alias ohmyzsh="mate ~/.oh-my-zsh"
alias gitconfig="$EDITOR $HOME/.gitconfig"
alias sshconfig="$EDITOR $HOME/.ssh/config"
alias sshhome="cd $HOME/.ssh"
alias reload="source $HOME/.zshrc"
# Add Autocompletion tools
_dotnet_zsh_complete()
@ -82,6 +82,12 @@ source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
# zsh paramater for dotnet cli tab completion
compctl -K _dotnet_zsh_complete dotnet
(cat $HOME/.cache/wal/sequences &)
source $HOME/.cache/wal/colors.sh
eval "$(fzf --zsh)"
eval "$(starship init zsh)"
eval "$(register-python-argcomplete pipx)"
# Created by `pipx` on 2024-04-10 15:28:48
export PATH="$PATH:/home/nigel/.local/bin"