diff --git a/.gitignore b/.gitignore index 249fb0b..4fefb60 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,9 @@ **/hosts.yml **/*.env .secrets.zsh + +# wallust output. Regenerated on every theme change, so tracking it means every +# machine fights over the other's palette. hypr/waybar/swaync write to real +# files; these two land inside directories this repo links, so ignore them here. +common/kitty/colors.conf +common/qutebrowser/colors.py diff --git a/common/kitty/colors.conf b/common/kitty/colors.conf deleted file mode 100644 index 54882a1..0000000 --- a/common/kitty/colors.conf +++ /dev/null @@ -1,29 +0,0 @@ -# The kitty terminal template for wallust -# Add to wallust config: kitty = { src='kitty.conf', dst='~/.config/kitty/colors.conf'} -# And add to kitty config: include colors.conf - -cursor #B7D1E0 - -background #171917 -foreground #E8EFFC - -color0 #414441 -color1 #718B81 -color2 #86B4C4 -color3 #DCA0D2 -color4 #9CBBDA -color5 #E3B0CE -color6 #BED0F7 -color7 #D6DFF2 -color8 #969CAA -color9 #718B81 -color10 #86B4C4 -color11 #DCA0D2 -color12 #9CBBDA -color13 #E3B0CE -color14 #BED0F7 -color15 #D6DFF2 - -mark1_foreground #98B6F7 -mark2_foreground #ABC2F2 -mark3_foreground #98B6F7 diff --git a/common/qutebrowser/colors.py b/common/qutebrowser/colors.py deleted file mode 100644 index b2d9584..0000000 --- a/common/qutebrowser/colors.py +++ /dev/null @@ -1,25 +0,0 @@ -# Qutebrowser color scheme from wallust - -# You can use this template by adding the following to wallust.toml: -# qutebrowser = { src = "qutebrowser.py", dst = "~/.config/qutebrowser/colors.py" } -# and then on config.py: -# from colors import * - -foreground = "#E8EFFC" -background = "#171917" -color0 = "#414441" -color1 = "#718B81" -color2 = "#86B4C4" -color3 = "#DCA0D2" -color4 = "#9CBBDA" -color5 = "#E3B0CE" -color6 = "#BED0F7" -color7 = "#D6DFF2" -color8 = "#969CAA" -color9 = "#718B81" -color10 = "#86B4C4" -color11 = "#DCA0D2" -color12 = "#9CBBDA" -color13 = "#E3B0CE" -color14 = "#BED0F7" -color15 = "#D6DFF2" diff --git a/hosts/sctfw004/config/swaync/colors.css b/hosts/sctfw004/config/swaync/colors.css deleted file mode 100644 index 78b12c5..0000000 --- a/hosts/sctfw004/config/swaync/colors.css +++ /dev/null @@ -1,19 +0,0 @@ -@define-color background #121110; -@define-color foreground #FCF7F2; - -@define-color color0 #3A3939; -@define-color color1 #A78C72; -@define-color color2 #A99F97; -@define-color color3 #ABB0A9; -@define-color color4 #C9BBAC; -@define-color color5 #F8DEC5; -@define-color color6 #F7E7D9; -@define-color color7 #F3EAE3; -@define-color color8 #AAA49F; -@define-color color9 #A78C72; -@define-color color10 #A99F97; -@define-color color11 #ABB0A9; -@define-color color12 #C9BBAC; -@define-color color13 #F8DEC5; -@define-color color14 #F7E7D9; -@define-color color15 #F3EAE3; diff --git a/hosts/sctfw004/hypr/colors.conf b/hosts/sctfw004/hypr/colors.conf deleted file mode 100644 index 74f01ca..0000000 --- a/hosts/sctfw004/hypr/colors.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Hyprland with colors from wallust -# The -# You can use this template by adding the following to wallust.toml: -# hypr = { src = "hyprland-colors.conf", dst = "~/.config/hypr/colors.conf" } -# and then on hyprland.conf: -# source = ~/.config/hypr/colors.conf - -general { - # Here we use `saturate` filter to have more vibrant colors, - # not matter the scheme, since the border should seek the attention - col.active_border = rgb(A7692E) rgb(A96D3C) rgb(63B044) rgb(C98945) rgb(F8A24F) rgb(F7A257) - # color0 is almost the same as the background color, - # by putting ee as the alpha, it makes it 100% transparent - col.inactive_border = rgba(3A3939ee) -} diff --git a/hosts/sctfw004/waybar/colors.css b/hosts/sctfw004/waybar/colors.css deleted file mode 100644 index 8e21d2d..0000000 --- a/hosts/sctfw004/waybar/colors.css +++ /dev/null @@ -1,19 +0,0 @@ -@define-color cursor #D3CBC4; -@define-color background #121110; -@define-color foreground #FCF7F2; -@define-color color0 #3A3939; -@define-color color1 #A78C72; -@define-color color2 #A99F97; -@define-color color3 #ABB0A9; -@define-color color4 #C9BBAC; -@define-color color5 #F8DEC5; -@define-color color6 #F7E7D9; -@define-color color7 #F3EAE3; -@define-color color8 #AAA49F; -@define-color color9 #A78C72; -@define-color color10 #A99F97; -@define-color color11 #ABB0A9; -@define-color color12 #C9BBAC; -@define-color color13 #F8DEC5; -@define-color color14 #F7E7D9; -@define-color color15 #F3EAE3; diff --git a/hosts/system76/config/swaync/colors.css b/hosts/system76/config/swaync/colors.css deleted file mode 100644 index 24513a7..0000000 --- a/hosts/system76/config/swaync/colors.css +++ /dev/null @@ -1,19 +0,0 @@ -@define-color background #121412; -@define-color foreground #CDFEFF; - -@define-color color0 #393B3A; -@define-color color1 #8FA47F; -@define-color color2 #9A9DB8; -@define-color color3 #B29C9E; -@define-color color4 #A0B483; -@define-color color5 #C9D9AE; -@define-color color6 #70FCFE; -@define-color color7 #AFF5F6; -@define-color color8 #7AABAC; -@define-color color9 #8FA47F; -@define-color color10 #9A9DB8; -@define-color color11 #B29C9E; -@define-color color12 #A0B483; -@define-color color13 #C9D9AE; -@define-color color14 #70FCFE; -@define-color color15 #AFF5F6; diff --git a/hosts/system76/hypr/colors.conf b/hosts/system76/hypr/colors.conf deleted file mode 100644 index 8651aed..0000000 --- a/hosts/system76/hypr/colors.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Hyprland with colors from wallust -# The -# You can use this template by adding the following to wallust.toml: -# hypr = { src = "hyprland-colors.conf", dst = "~/.config/hypr/colors.conf" } -# and then on hyprland.conf: -# source = ~/.config/hypr/colors.conf - -general { - # Here we use `saturate` filter to have more vibrant colors, - # not matter the scheme, since the border should seek the attention - col.active_border = rgb(357EBD) rgb(B66F37) rgb(B57638) rgb(BA8234) rgb(C4823A) rgb(DD9B43) - # color0 is almost the same as the background color, - # by putting ee as the alpha, it makes it 100% transparent - col.inactive_border = rgba(3B3A39ee) -} diff --git a/hosts/system76/waybar/colors.css b/hosts/system76/waybar/colors.css deleted file mode 100644 index d351cf4..0000000 --- a/hosts/system76/waybar/colors.css +++ /dev/null @@ -1,19 +0,0 @@ -@define-color cursor #D4C4B4; -@define-color background #141211; -@define-color foreground #F3EBE0; -@define-color color0 #3B3A39; -@define-color color1 #85A3BD; -@define-color color2 #B69D89; -@define-color color3 #B5A08B; -@define-color color4 #BAA383; -@define-color color5 #C4AC92; -@define-color color6 #DDC6A7; -@define-color color7 #E5DACA; -@define-color color8 #A1998E; -@define-color color9 #85A3BD; -@define-color color10 #B69D89; -@define-color color11 #B5A08B; -@define-color color12 #BAA383; -@define-color color13 #C4AC92; -@define-color color14 #DDC6A7; -@define-color color15 #E5DACA; diff --git a/meta/hosts/sctfw004.conf.yaml b/meta/hosts/sctfw004.conf.yaml index 6ef8d8b..7d7fe0b 100644 --- a/meta/hosts/sctfw004.conf.yaml +++ b/meta/hosts/sctfw004.conf.yaml @@ -23,7 +23,8 @@ ~/.config/uv: common/uv ~/.config/mpv: common/mpv ~/.config/swayimg: common/swayimg - ~/.config/swaync: common/swaync + ~/.config/swaync/config.json: common/swaync/config.json + ~/.config/swaync/style.css: common/swaync/style.css ~/.config/mimeapps.list: common/mimeapps.list ~/.config/ncmpcpp: common/ncmpcpp ~/.config/GIMP: common/GIMP @@ -34,14 +35,11 @@ ~/.config/LightBurn: common/LightBurn ~/.config/obs-studio: common/obs-studio ~/.config/gtk-3.0: hosts/sctfw004/config/gtk-3.0 - ~/.config/swaync: hosts/sctfw004/config/swaync ~/.config/tiling-assistant: hosts/sctfw004/config/tiling-assistant ~/.config/traggo: hosts/sctfw004/config/traggo ~/.config/xdg-desktop-portal: hosts/sctfw004/config/xdg-desktop-portal ~/.ssh/config.local: hosts/sctfw004/ssh/config.local ~/.config/wallust: common/wallust - ~/.config/hypr/colors.conf: hosts/sctfw004/hypr/colors.conf - ~/.config/waybar/colors.css: hosts/sctfw004/waybar/colors.css ~/.config/git/identity: hosts/sctfw004/git/identity ~/.config/kitty: common/kitty ~/.config/alacritty: common/alacritty diff --git a/meta/hosts/system76.conf.yaml b/meta/hosts/system76.conf.yaml index d341d34..c25603c 100644 --- a/meta/hosts/system76.conf.yaml +++ b/meta/hosts/system76.conf.yaml @@ -17,7 +17,8 @@ ~/.config/uv: common/uv ~/.config/mpv: common/mpv ~/.config/swayimg: common/swayimg - ~/.config/swaync: common/swaync + ~/.config/swaync/config.json: common/swaync/config.json + ~/.config/swaync/style.css: common/swaync/style.css ~/.config/mimeapps.list: common/mimeapps.list ~/.config/ncmpcpp: common/ncmpcpp ~/.config/GIMP: common/GIMP @@ -28,11 +29,8 @@ ~/.config/LightBurn: common/LightBurn ~/.config/obs-studio: common/obs-studio ~/.config/gtk-3.0: hosts/system76/config/gtk-3.0 - ~/.config/swaync: hosts/system76/config/swaync ~/.ssh/config.local: hosts/system76/ssh/config.local ~/.config/wallust: common/wallust - ~/.config/hypr/colors.conf: hosts/system76/hypr/colors.conf - ~/.config/waybar/colors.css: hosts/system76/waybar/colors.css ~/.config/git/identity: hosts/system76/git/identity ~/.config/paru: common/paru ~/.config/rbw: common/rbw