Skip to content

Commit 590ad8d

Browse files
JanLungeJanLunge
committed
fish config with startship, lf, tmux styling, hlwm updates, nixos config
1 parent 769c9ee commit 590ad8d

29 files changed

+809
-18
lines changed

‎.tmux.conf

100755100644
File mode changed.

‎fish/config.fish

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
set -g fish_key_bindings fish_vi_key_bindings
2+
set -g fish_bind_mode insert
3+
set -g TERM xterm-256color
4+
5+
# Prompt options
6+
set -g theme_display_ruby yes
7+
set -g theme_display_virtualenv yes
8+
set -g theme_display_vagrant no
9+
set -g theme_display_vi yes
10+
set -g theme_display_k8s_context no # yes
11+
set -g theme_display_user yes
12+
set -g theme_display_hostname yes
13+
set -g theme_show_exit_status yes
14+
set -g theme_git_worktree_support no
15+
set -g theme_display_git yes
16+
set -g theme_display_git_dirty yes
17+
set -g theme_display_git_untracked yes
18+
set -g theme_display_git_ahead_verbose yes
19+
set -g theme_display_git_dirty_verbose yes
20+
set -g theme_display_git_master_branch yes
21+
set -g theme_display_date yes
22+
set -g theme_display_cmd_duration yes
23+
set -g theme_powerline_fonts yes
24+
set -g theme_nerd_fonts yes
25+
set -g theme_color_scheme solarized-dark
26+
27+
bind -M insert \cg forget
28+
29+
30+
if status is-interactive
31+
# Commands to run in interactive sessions can go here
32+
end
33+
starship init fish | source

‎fish/fish

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/home/jan/dotfiles/fish

‎fish/fish_variables

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# This file contains fish universal variable definitions.
2+
# VERSION: 3.0
3+
SETUVAR EDITOR:nvim
4+
SETUVAR __fish_initialized:3400
5+
SETUVAR fish_color_autosuggestion:brblack
6+
SETUVAR fish_color_cancel:\x2dr
7+
SETUVAR fish_color_command:blue
8+
SETUVAR fish_color_comment:red
9+
SETUVAR fish_color_cwd:green
10+
SETUVAR fish_color_cwd_root:red
11+
SETUVAR fish_color_end:green
12+
SETUVAR fish_color_error:brred
13+
SETUVAR fish_color_escape:brcyan
14+
SETUVAR fish_color_history_current:\x2d\x2dbold
15+
SETUVAR fish_color_host:normal
16+
SETUVAR fish_color_host_remote:yellow
17+
SETUVAR fish_color_normal:normal
18+
SETUVAR fish_color_operator:brcyan
19+
SETUVAR fish_color_param:cyan
20+
SETUVAR fish_color_quote:yellow
21+
SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
22+
SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
23+
SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
24+
SETUVAR fish_color_status:red
25+
SETUVAR fish_color_user:brgreen
26+
SETUVAR fish_color_valid_path:\x2d\x2dunderline
27+
SETUVAR fish_key_bindings:fish_default_key_bindings
28+
SETUVAR fish_pager_color_completion:normal
29+
SETUVAR fish_pager_color_description:yellow\x1e\x2di
30+
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
31+
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
32+
SETUVAR fish_pager_color_selected_background:\x2dr

‎grabwindow.zsh

100755100644
File mode changed.

‎herbstluftwm/auto-monitor-config.sh

100755100644
Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,52 @@
22
MONSTR=""
33
MONOFFSET=0
44

5+
# TODO: if monitor settings file doesnt exist create it, with default settings
6+
if [ -f ~/.config/monitorsettings.json ]; then
7+
echo 'File exists.'
8+
else
9+
cat << EOF > ~/.config/monitorsettings.json
10+
{
11+
"main": {
12+
"split": "21x9"
13+
}
14+
}
15+
EOF
16+
fi
17+
18+
519
#left
620
MONLEFT="HDMI-0"
721
#center
8-
MONCENTER="DP-2"
22+
MONCENTER="DP-4"
923
#right
10-
MONRIGHT="DP-1"
24+
MONRIGHT="DP-2"
1125

12-
if xrandr | grep " connected" | grep $MONRIGHT | grep -q mm;
13-
then
14-
MONSTR+="1680x1050+$(( $MONOFFSET + 0 ))+0 "
15-
MONOFFSET=$(( $MONOFFSET + 1680 ))
16-
fi
1726

1827
if xrandr | grep " connected" | grep $MONCENTER | grep -q mm;
1928
then
2029
mode=$( cat ~/.config/monitorsettings.json | jq .main.split -r )
21-
if [ $mode == "21x9" ];
30+
if [ "$mode" == "21x9" ];
2231
then
2332
MONSTR+="1110x1440+$(( $MONOFFSET + 0 ))+0 2900x1400+$(( $MONOFFSET + 1110 ))+40 1110x1440+$(( $MONOFFSET + 4010 ))+0 "
24-
elif [ $mode == "16x9" ];
33+
elif [ "$mode" == "16x9" ];
2534
then
2635
MONSTR+="1280x1440+$(( $MONOFFSET + 0 ))+0 2560x1400+$(( $MONOFFSET + 1280 ))+40 1280x1440+$(( $MONOFFSET + 3840 ))+0 "
2736
fi
2837
MONOFFSET=$(( $MONOFFSET + 5120 ))
2938
fi
3039

40+
if xrandr | grep " connected" | grep $MONRIGHT | grep -q mm;
41+
then
42+
MONSTR+="3840x2160+$(( $MONOFFSET + 0 ))+0 "
43+
#MONOFFSET=$(( $MONOFFSET + 1680 ))
44+
fi
3145

32-
if xrandr | grep " connected" | grep $MONLEFT | grep -q mm;
46+
47+
if xrandr | grep " connected" | grep "$MONLEFT" | grep -q mm;
3348
then
3449
MONSTR+="1920x1080+$(( $MONOFFSET + 0 ))+0 "
3550
MONOFFSET=$(( $MONOFFSET + 1920 ))
3651
fi
37-
52+
echo $MONSTR
3853
herbstclient set_monitors $MONSTR

‎herbstluftwm/autostart

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ hc unlock
190190

191191
#xrandr --output HDMI-1 --mode 5120x1440 --rate 60 --right-of DP-2
192192
#xrandr --output HDMI-0 --primary --mode 1920x1080 --pos 7680x0 --rotate normal --output DP-0 --mode 2560x1440 --pos 0x0 --rotate normal --output DP-1 --off --output DP-2 --mode 5120x1440 --pos 2560x0 --rotate normal --output DP-3 --off --output DP-4 --off --output DP-5 --off
193-
xrandr --output HDMI-0 --primary --mode 1920x1080 --pos 5120x0 --rotate normal --output DP-0 --off --output DP-1 --off --output DP-2 --mode 5120x1440 --pos 0x0 --rotate normal --output DP-3 --off --output DP-4 --off --output DP-5 --off
193+
xrandr --output HDMI-0 --off --rotate normal --output DP-0 --off --output DP-1 --off --output DP-4 --mode 5120x1440 --pos 0x0 --rotate normal --output DP-3 --off --output DP-4 --off --output DP-5 --off
194194

195195
sleep 3
196196
# hc set_monitors 1920x1080+0+0 1110x1440+1920+0 2900x1400+3030+40 1110x1440+5930+0

‎herbstluftwm/changeVolume.bash

100755100644
File mode changed.

‎lf/colors

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
# vim:ft=dircolors
2+
# (This is not a dircolors file but it helps to highlight colors and comments)
3+
4+
# default values from dircolors
5+
# (entries with a leading # are not implemented in lf)
6+
# #no 00 # NORMAL
7+
# fi 00 # FILE
8+
# #rs 0 # RESET
9+
# di 01;34 # DIR
10+
# ln 01;36 # LINK
11+
# #mh 00 # MULTIHARDLINK
12+
# pi 40;33 # FIFO
13+
# so 01;35 # SOCK
14+
# #do 01;35 # DOOR
15+
# bd 40;33;01 # BLK
16+
# cd 40;33;01 # CHR
17+
# or 40;31;01 # ORPHAN
18+
# #mi 00 # MISSING
19+
# su 37;41 # SETUID
20+
# sg 30;43 # SETGID
21+
# #ca 30;41 # CAPABILITY
22+
# tw 30;42 # STICKY_OTHER_WRITABLE
23+
# ow 34;42 # OTHER_WRITABLE
24+
# st 37;44 # STICKY
25+
# ex 01;32 # EXEC
26+
27+
# default values from lf (with matching order)
28+
# ln 01;36 # LINK
29+
# or 31;01 # ORPHAN
30+
# tw 01;34 # STICKY_OTHER_WRITABLE
31+
# ow 01;34 # OTHER_WRITABLE
32+
# st 01;34 # STICKY
33+
# di 01;34 # DIR
34+
# pi 33 # FIFO
35+
# so 01;35 # SOCK
36+
# bd 33;01 # BLK
37+
# cd 33;01 # CHR
38+
# su 01;32 # SETUID
39+
# sg 01;32 # SETGID
40+
# ex 01;32 # EXEC
41+
# fi 00 # FILE
42+
43+
# file types (with matching order)
44+
ln 01;36 # LINK
45+
or 31;01 # ORPHAN
46+
tw 34 # STICKY_OTHER_WRITABLE
47+
ow 34 # OTHER_WRITABLE
48+
st 01;34 # STICKY
49+
di 01;34 # DIR
50+
pi 33 # FIFO
51+
so 01;35 # SOCK
52+
bd 33;01 # BLK
53+
cd 33;01 # CHR
54+
su 01;32 # SETUID
55+
sg 01;32 # SETGID
56+
ex 01;32 # EXEC
57+
fi 00 # FILE
58+
59+
# archives or compressed (dircolors defaults)
60+
*.tar 01;31
61+
*.tgz 01;31
62+
*.arc 01;31
63+
*.arj 01;31
64+
*.taz 01;31
65+
*.lha 01;31
66+
*.lz4 01;31
67+
*.lzh 01;31
68+
*.lzma 01;31
69+
*.tlz 01;31
70+
*.txz 01;31
71+
*.tzo 01;31
72+
*.t7z 01;31
73+
*.zip 01;31
74+
*.z 01;31
75+
*.dz 01;31
76+
*.gz 01;31
77+
*.lrz 01;31
78+
*.lz 01;31
79+
*.lzo 01;31
80+
*.xz 01;31
81+
*.zst 01;31
82+
*.tzst 01;31
83+
*.bz2 01;31
84+
*.bz 01;31
85+
*.tbz 01;31
86+
*.tbz2 01;31
87+
*.tz 01;31
88+
*.deb 01;31
89+
*.rpm 01;31
90+
*.jar 01;31
91+
*.war 01;31
92+
*.ear 01;31
93+
*.sar 01;31
94+
*.rar 01;31
95+
*.alz 01;31
96+
*.ace 01;31
97+
*.zoo 01;31
98+
*.cpio 01;31
99+
*.7z 01;31
100+
*.rz 01;31
101+
*.cab 01;31
102+
*.wim 01;31
103+
*.swm 01;31
104+
*.dwm 01;31
105+
*.esd 01;31
106+
107+
# image formats (dircolors defaults)
108+
*.jpg 01;35
109+
*.jpeg 01;35
110+
*.mjpg 01;35
111+
*.mjpeg 01;35
112+
*.gif 01;35
113+
*.bmp 01;35
114+
*.pbm 01;35
115+
*.pgm 01;35
116+
*.ppm 01;35
117+
*.tga 01;35
118+
*.xbm 01;35
119+
*.xpm 01;35
120+
*.tif 01;35
121+
*.tiff 01;35
122+
*.png 01;35
123+
*.svg 01;35
124+
*.svgz 01;35
125+
*.mng 01;35
126+
*.pcx 01;35
127+
*.mov 01;35
128+
*.mpg 01;35
129+
*.mpeg 01;35
130+
*.m2v 01;35
131+
*.mkv 01;35
132+
*.webm 01;35
133+
*.ogm 01;35
134+
*.mp4 01;35
135+
*.m4v 01;35
136+
*.mp4v 01;35
137+
*.vob 01;35
138+
*.qt 01;35
139+
*.nuv 01;35
140+
*.wmv 01;35
141+
*.asf 01;35
142+
*.rm 01;35
143+
*.rmvb 01;35
144+
*.flc 01;35
145+
*.avi 01;35
146+
*.fli 01;35
147+
*.flv 01;35
148+
*.gl 01;35
149+
*.dl 01;35
150+
*.xcf 01;35
151+
*.xwd 01;35
152+
*.yuv 01;35
153+
*.cgm 01;35
154+
*.emf 01;35
155+
*.ogv 01;35
156+
*.ogx 01;35
157+
158+
# audio formats (dircolors defaults)
159+
*.aac 00;36
160+
*.au 00;36
161+
*.flac 00;36
162+
*.m4a 00;36
163+
*.mid 00;36
164+
*.midi 00;36
165+
*.mka 00;36
166+
*.mp3 00;36
167+
*.mpc 00;36
168+
*.ogg 00;36
169+
*.ra 00;36
170+
*.wav 00;36
171+
*.oga 00;36
172+
*.opus 00;36
173+
*.spx 00;36
174+
*.xspf 00;36

0 commit comments

Comments
 (0)