a/dotfiles
1
0
Fork 0
mirror of https://codeberg.org/andyscott/dotfiles.git synced 2024-12-22 18:03:11 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: a:c3af2f43630c1f3f5e357b984a4b3094518e5ece
Branches Tags
a:main
a:xorg-archive
..
compare: a:ff0e775e0d734d602a09e92ee8cb263e908d694d
Branches Tags
a:main
a:xorg-archive

No commits in common. "c3af2f43630c1f3f5e357b984a4b3094518e5ece" and "ff0e775e0d734d602a09e92ee8cb263e908d694d" have entirely different histories.
c3af2f4363 ... ff0e775e0d

7 changed files with 115 additions and 338 deletions
Show stats Expand all files Collapse all files

22
dot_config/fuzzel/fuzzel.ini
View file

@ -26,22 +26,12 @@ terminal=kitty
# launch-prefix= # launch-prefix=
[colors] [colors]
# Catppuccin Mocha background=323d43ee
background=1e1e2eee text=d8caacff
input=cdd6f4ff match=83c092ff
text=cdd6f4ff selection=72b783dd
match=a6adc8ff selection-text=4a555bff
selection=a6adc8dd border=d5b26bff
selection-text=1e1e2eff
border=f9e2afff
# Everforest Dark
#background=323d43ee
#text=d8caacff
#match=83c092ff
#selection=72b783dd
#selection-text=4a555bff
#border=d5b26bff
[border] [border]
width=1 width=1

4
dot_config/gtk-2.0/gtkrc
View file

@ -1,4 +1,4 @@
# GTK2 Settings # GTK2 Settings
gtk-theme-name="Colloid-Dark-Compact-Catppuccin" gtk-theme-name="Colloid-Dark-Compact-Everforest"
gtk-icon-theme-name="Colloid-Grey-Dark" gtk-icon-theme-name="Qogir-dark"
gtk-font-name="DejaVu Sans 10" gtk-font-name="DejaVu Sans 10"

4
dot_config/gtk-3.0/settings.ini
View file

@ -1,4 +1,4 @@
[Settings] [Settings]
gtk-theme-name = Colloid-Dark-Compact-Catppuccin gtk-theme-name = Colloid-Dark-Compact-Everforest
gtk-icon-theme-name = Colloid-Grey-Dark gtk-icon-theme-name = Qogir-dark
gtk-font-name = DejaVu Sans 10 gtk-font-name = DejaVu Sans 10

4
dot_config/gtk-4.0/settings.ini
View file

@ -1,5 +1,5 @@
[Settings] [Settings]
gtk-application-preferdark-theme = true gtk-application-preferdark-theme = true
gtk-theme-name = Colloid-Dark-Compact-Catppuccin gtk-theme-name = Colloid-Dark-Compact-Everforest
gtk-icon-theme-name = Colloid-Grey-Dark gtk-icon-theme-name = Qogir-dark
gtk-font-name = "DejaVu Sans 10" gtk-font-name = "DejaVu Sans 10"

5
dot_config/river/executable_init.tmpl
View file

@ -5,11 +5,8 @@
#trap 'exec 2>&4 1>&3' 0 1 2 3 #trap 'exec 2>&4 1>&3' 0 1 2 3
#exec 1>"${XDG_STATE_HOME}"/river.log 2>&1 #exec 1>"${XDG_STATE_HOME}"/river.log 2>&1
#Start Emacs
riverctl map normal Super E spawn emacs
# Start kitty # Start kitty
riverctl map normal Super Return spawn alacritty riverctl map normal Super Return spawn kitty
# Start fuzzel # Start fuzzel
riverctl map normal Super Space spawn fuzzel riverctl map normal Super Space spawn fuzzel

186
dot_config/yambar/bar2.yml.tmpl
View file

@ -1,46 +1,25 @@
# Colors # Colors
.catppuccin_mocha: .everforest:
0: &foreground cdd6f4ff 0: &foreground d8caacff
1: &background 1e1e2edd 1: &background 323d43dd
2: &black 45475aff 2: &black 4a555bff
3: &dark_grey 45475aff 3: &dark_grey 525c62ff
4: &dark_red f38ba8ff 4: &dark_red e26c6eff
5: &red f38ba8ff 5: &red e68183ff
6: &dark_green a6e3a1ff 6: &dark_green 9bb86fff
7: &green a6e3a1ff 7: &green a7c080ff
8: &dark_yellow f9e2afff 8: &dark_yellow d5b26bff
9: &yellow f9e2afff 9: &yellow dbbc7fff
10: &dark_blue 89b4faff 10: &dark_blue 6eb2a9ff
11: &blue 89b4faff 11: &blue 7fbbb3ff
12: &dark_magenta f5c2e7ff 12: &dark_magenta cf87a9ff
13: &magenta f5c2e7ff 13: &magenta d699b6ff
14: &dark_cyan 94e2d5ff 14: &dark_cyan 72b783ff
15: &cyan 94e2d5ff 15: &cyan 83c092ff
16: &light_grey bac2deff 16: &light_grey d0bf9bff
17: &white a6adc8ff 17: &white d8caacff
transparent_light_grey: &transparent_light_grey bac2deaa transparent_light_grey: &transparent_light_grey d0bf9b99
transparent_black: &transparent_black 45475aaa transparent_black: &transparent_black 4a555b99
# .everforest:
# 0: &foreground d8caacff
# 1: &background 323d43dd
# 2: &black 4a555bff
# 3: &dark_grey 525c62ff
# 4: &dark_red e26c6eff
# 5: &red e68183ff
# 6: &dark_green 9bb86fff
# 7: &green a7c080ff
# 8: &dark_yellow d5b26bff
# 9: &yellow dbbc7fff
# 10: &dark_blue 6eb2a9ff
# 11: &blue 7fbbb3ff
# 12: &dark_magenta cf87a9ff
# 13: &magenta d699b6ff
# 14: &dark_cyan 72b783ff
# 15: &cyan 83c092ff
# 16: &light_grey d0bf9bff
# 17: &white d8caacff
# transparent_light_grey: &transparent_light_grey d0bf9b99
# transparent_black: &transparent_black 4a555b99
# Fonts # Fonts
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
hack: &hack Hack:pixelsize=28 hack: &hack Hack:pixelsize=28
@ -50,8 +29,7 @@ hack: &hack Hack:pixelsize=13
awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12 awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12
{{- end }} {{- end }}
# Labels # Labels
separator: separator: &separator {string: {text: " ", font: *hack, foreground: *light_grey}}
&separator { string: { text: " ", font: *hack, foreground: *light_grey } }
bar: bar:
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
@ -144,88 +122,39 @@ bar:
urgent: urgent:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *dark_red}}, {border: {size: 2, color: *black}}]}
{
stack:
[
{ background: { color: *dark_red } },
{ border: { size: 2, color: *black } },
],
}
foreground: *black foreground: *black
focused: focused:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
{
stack:
[
{ background: { color: *light_grey } },
{ underline: { size: 1, color: *transparent_black } },
],
}
foreground: *dark_grey foreground: *dark_grey
visible && occupied: visible && occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
{
stack:
[
{ background: { color: *transparent_light_grey } },
{ underline: { size: 1, color: *transparent_black } },
],
}
foreground: *light_grey foreground: *light_grey
visible && ~occupied: visible && ~occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
{
stack:
[
{ background: { color: *transparent_light_grey } },
{ underline: { size: 1, color: *transparent_black } },
],
}
foreground: *light_grey foreground: *light_grey
~visible && occupied: ~visible && occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]}
{
stack:
[
{ background: { color: *dark_grey } },
{
underline:
{ size: 1, color: *transparent_light_grey },
},
],
}
foreground: *light_grey foreground: *light_grey
~focused && occupied: ~focused && occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]}
{
stack:
[
{ background: { color: *dark_grey } },
{
underline:
{ size: 1, color: *transparent_light_grey },
},
],
}
foreground: *light_grey foreground: *light_grey
id < 10 && ~visible && ~occupied: id < 10 && ~visible && ~occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {underline: {size: 1, color: *transparent_light_grey}}
{ underline: { size: 1, color: *transparent_light_grey } }
foreground: *light_grey foreground: *light_grey
id >= 10 && ~visible && ~occupied: { empty: {} } id >= 10 && ~visible && ~occupied: {empty: {}}
{{ end }} {{ end }}
center: center:
- foreign-toplevel: - foreign-toplevel:
@ -233,8 +162,8 @@ bar:
map: map:
conditions: conditions:
activated: activated:
- string: { text: "{app-id}: {title}" } - string: {text: "{app-id}: {title}"}
~activated: { empty: {} } ~activated: {empty: {}}
right: right:
{{- if eq .chezmoi.hostname "hydrus" }} {{- if eq .chezmoi.hostname "hydrus" }}
@ -243,54 +172,42 @@ bar:
- network: - network:
content: content:
map: map:
default: { empty: {} } default: {empty: {}}
conditions: conditions:
name >= wlan0 && name <= wlan9: name >= wlan0 && name <= wlan9:
map: map:
conditions: conditions:
~carrier: { empty: {} } ~carrier: {empty: {}}
carrier: carrier:
map: map:
default: default:
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: - string: {text: " {name}: {dl-speed:mb} mb/s down - {ul-speed:mb} mb/s up"}
{
text: " {name}: {dl-speed:mb} mb/s down - {ul-speed:mb} mb/s up",
}
conditions: conditions:
ipv4 == "": ipv4 == "":
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
{
text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up",
}
- network: - network:
content: content:
map: map:
default: { empty: {} } default: {empty: {}}
conditions: conditions:
name >= eth0 && name <= eth9: name >= eth0 && name <= eth9:
map: map:
conditions: conditions:
~carrier: { empty: {} } ~carrier: {empty: {}}
carrier: carrier:
map: map:
default: default:
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
{
text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up",
}
conditions: conditions:
state == down: { string: { text: , font: *awesome } } state == down: {string: {text: , font: *awesome}}
ipv4 == "": ipv4 == "":
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: - string: {text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up"}
{
text: " {name}: {dl-speed:mb} mb/s down / {ul-speed:mb} mb/s up",
}
- label: - label:
content: *separator content: *separator
{{- end }} {{- end }}
- cpu: - cpu:
poll-interval: 2000 poll-interval: 2000
@ -298,12 +215,13 @@ bar:
map: map:
conditions: conditions:
id == -1: id == -1:
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: { text: " {cpu}%" } - string: {text: " {cpu}%"}
- label: - label:
content: *separator content: *separator
- mem: - mem:
poll-interval: 5000 poll-interval: 5000
content: content:
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: { text: " {used:mb} MiB ({percent_used}% Used)" } - string: {text: " {used:mb} MiB ({percent_used}% Used)"}

224
dot_config/yambar/config.yml.tmpl
View file

@ -1,46 +1,25 @@
# Colors # Colors
.catppuccin_mocha: .everforest:
0: &foreground cdd6f4ff 0: &foreground d3c6aaff
1: &background 1e1e2edd 1: &background 272e33dd
2: &black 45475aff 2: &black 4a555bff
3: &dark_grey 45475aff 3: &dark_grey 525c62ff
4: &dark_red f38ba8ff 4: &dark_red e26c6eff
5: &red f38ba8ff 5: &red e68183ff
6: &dark_green a6e3a1ff 6: &dark_green 9bb86fff
7: &green a6e3a1ff 7: &green a7c080ff
8: &dark_yellow f9e2afff 8: &dark_yellow d5b26bff
9: &yellow f9e2afff 9: &yellow dbbc7fff
10: &dark_blue 89b4faff 10: &dark_blue 6eb2a9ff
11: &blue 89b4faff 11: &blue 7fbbb3ff
12: &dark_magenta f5c2e7ff 12: &dark_magenta cf87a9ff
13: &magenta f5c2e7ff 13: &magenta d699b6ff
14: &dark_cyan 94e2d5ff 14: &dark_cyan 72b783ff
15: &cyan 94e2d5ff 15: &cyan 83c092ff
16: &light_grey bac2deff 16: &light_grey d0bf9bff
17: &white a6adc8ff 17: &white d8caacff
transparent_light_grey: &transparent_light_grey bac2deaa transparent_light_grey: &transparent_light_grey d0bf9baa
transparent_black: &transparent_black 45475aaa transparent_black: &transparent_black 4a555baa
# .everforest:
# 0: &foreground d8caacff
# 1: &background 323d43dd
# 2: &black 4a555bff
# 3: &dark_grey 525c62ff
# 4: &dark_red e26c6eff
# 5: &red e68183ff
# 6: &dark_green 9bb86fff
# 7: &green a7c080ff
# 8: &dark_yellow d5b26bff
# 9: &yellow dbbc7fff
# 10: &dark_blue 6eb2a9ff
# 11: &blue 7fbbb3ff
# 12: &dark_magenta cf87a9ff
# 13: &magenta d699b6ff
# 14: &dark_cyan 72b783ff
# 15: &cyan 83c092ff
# 16: &light_grey d0bf9bff
# 17: &white d8caacff
# transparent_light_grey: &transparent_light_grey d0bf9baa
# transparent_black: &transparent_black 4a555baa
# Fonts # Fonts
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
hack: &hack Hack:pixelsize=28 hack: &hack Hack:pixelsize=28
@ -50,8 +29,7 @@ hack: &hack Hack:pixelsize=13
awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12 awesome: &awesome Font Awesome 6 Free:style=solid:pixelsize=12
{{- end }} {{- end }}
# Labels # Labels
separator: separator: &separator {string: {text: " ", font: *hack, foreground: *light_grey}}
&separator { string: { text: " ", font: *hack, foreground: *light_grey } }
bar: bar:
{{- if eq .chezmoi.hostname "helix" }} {{- if eq .chezmoi.hostname "helix" }}
@ -107,80 +85,32 @@ bar:
urgent: urgent:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *dark_red}}, {border: {size: 6, color: *black}}]}
{
stack:
[
{ background: { color: *dark_red } },
{ border: { size: 2, color: *black } },
],
}
foreground: *black foreground: *black
focused: focused:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 6, color: *transparent_black}}]}
{
stack:
[
{ background: { color: *light_grey } },
{ underline: { size: 1, color: *transparent_black } },
],
}
foreground: *dark_grey foreground: *dark_grey
visible && occupied: visible && occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 6, color: *transparent_black}}]}
{
stack:
[
{ background: { color: *transparent_light_grey } },
{ underline: { size: 1, color: *transparent_black } },
],
}
foreground: *light_grey foreground: *light_grey
visible && ~occupied: visible && ~occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 6, color: *transparent_black}}]}
{
stack:
[
{ background: { color: *transparent_light_grey } },
{ underline: { size: 1, color: *transparent_black } },
],
}
foreground: *light_grey foreground: *light_grey
~visible && occupied: ~visible && occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 6, color: *transparent_light_grey}}]}
{
stack:
[
{ background: { color: *dark_grey } },
{
underline:
{ size: 1, color: *transparent_light_grey },
},
],
}
foreground: *light_grey foreground: *light_grey
~focused && occupied: ~focused && occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 6, color: *transparent_light_grey}}]}
{
stack:
[
{ background: { color: *dark_grey } },
{
underline:
{ size: 1, color: *transparent_light_grey },
},
],
}
foreground: *light_grey foreground: *light_grey
id < 10 && ~visible && ~occupied: id < 10 && ~visible && ~occupied:
string: string:
@ -192,88 +122,39 @@ bar:
urgent: urgent:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *dark_red}}, {border: {size: 2, color: *black}}]}
{
stack:
[
{ background: { color: *dark_red } },
{ border: { size: 2, color: *black } },
],
}
foreground: *black foreground: *black
focused: focused:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
{
stack:
[
{ background: { color: *light_grey } },
{ underline: { size: 1, color: *transparent_black } },
],
}
foreground: *dark_grey foreground: *dark_grey
visible && occupied: visible && occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
{
stack:
[
{ background: { color: *transparent_light_grey } },
{ underline: { size: 1, color: *transparent_black } },
],
}
foreground: *light_grey foreground: *light_grey
visible && ~occupied: visible && ~occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *transparent_light_grey}}, {underline: {size: 1, color: *transparent_black}}]}
{
stack:
[
{ background: { color: *transparent_light_grey } },
{ underline: { size: 1, color: *transparent_black } },
],
}
foreground: *light_grey foreground: *light_grey
~visible && occupied: ~visible && occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]}
{
stack:
[
{ background: { color: *dark_grey } },
{
underline:
{ size: 1, color: *transparent_light_grey },
},
],
}
foreground: *light_grey foreground: *light_grey
~focused && occupied: ~focused && occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {stack: [{background: {color: *dark_grey}}, {underline: {size: 1, color: *transparent_light_grey}}]}
{
stack:
[
{ background: { color: *dark_grey } },
{
underline:
{ size: 1, color: *transparent_light_grey },
},
],
}
foreground: *light_grey foreground: *light_grey
id < 10 && ~visible && ~occupied: id < 10 && ~visible && ~occupied:
string: string:
<<: *river_base <<: *river_base
deco: deco: {underline: {size: 1, color: *transparent_light_grey}}
{ underline: { size: 1, color: *transparent_light_grey } }
foreground: *light_grey foreground: *light_grey
id >= 10 && ~visible && ~occupied: { empty: {} } id >= 10 && ~visible && ~occupied: {empty: {}}
{{ end }} {{ end }}
center: center:
- foreign-toplevel: - foreign-toplevel:
@ -281,8 +162,8 @@ bar:
map: map:
conditions: conditions:
activated: activated:
- string: { text: "{app-id}: {title}" } - string: {text: "{app-id}: {title}"}
~activated: { empty: {} } ~activated: {empty: {}}
right: right:
- pulse: - pulse:
@ -294,25 +175,16 @@ bar:
wheel-down: sh -c "pactl set-sink-volume @DEFAULT_SINK@ -5%" wheel-down: sh -c "pactl set-sink-volume @DEFAULT_SINK@ -5%"
conditions: conditions:
sink_muted: sink_muted:
- string: - string: {text: , font: *awesome, foreground: *transparent_light_grey}
{ - string: {text: " {sink_percent}% ({sink_port})", foreground: *transparent_light_grey}
text: ,
font: *awesome,
foreground: *transparent_light_grey,
}
- string:
{
text: " {sink_percent}% ({sink_port})",
foreground: *transparent_light_grey,
}
~sink_muted: ~sink_muted:
- ramp: - ramp:
tag: sink_percent tag: sink_percent
items: items:
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: { text: " {sink_percent}% ({sink_port})" } - string: {text: " {sink_percent}% ({sink_port})"}
{{- if ne .chezmoi.hostname "hydrus" }} {{- if ne .chezmoi.hostname "hydrus" }}
- label: - label:
content: *separator content: *separator
@ -405,7 +277,7 @@ bar:
date-format: "%a %b %d" date-format: "%a %b %d"
time-format: "%R" time-format: "%R"
content: content:
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: { text: " {date} " } - string: {text: " {date} "}
- string: { text: , font: *awesome } - string: {text: , font: *awesome}
- string: { text: " {time} " } - string: {text: " {time} "}