diff --git a/templates/themes/README.adoc b/templates/themes/README.adoc index 7b1adf9e..30c7b08e 100755 --- a/templates/themes/README.adoc +++ b/templates/themes/README.adoc @@ -1,5 +1,5 @@ = NixOS desktop themes These are some of my themes om NixOS as a module ala-link:https://github.com/hlissner/dotfiles[hlissner NixOS modules] as a https://github.com/cookiecutter/cookiecutter[Cookiecutter template]. -Most of them just need a Pywal JSON scheme in the appropriate config file and generate the module with the given color scheme as a result. +Most of them just need a Base16 color scheme in the appropriate config file and generate the module with the given color scheme as a result. diff --git a/templates/themes/fair-and-square/cookiecutter.json b/templates/themes/fair-and-square/cookiecutter.json index 655d64e1..c3dab4b1 100755 --- a/templates/themes/fair-and-square/cookiecutter.json +++ b/templates/themes/fair-and-square/cookiecutter.json @@ -2,29 +2,22 @@ "name": "Fair and square", "slug": "{{ cookiecutter.name | slugify }}", "version": "0.1.0", - "special": { - "background": "#2E3440", - "foreground": "#D8DEE9", - "cursor": "#D8DEE9" - }, - "colors": { - "color0": "#3B4252", - "color1": "#BF616A", - "color2": "#A3BE8C", - "color3": "#EBCB8B", - "color4": "#81A1C1", - "color5": "#B48EAD", - "color6": "#88C0D0", - "color7": "#E5E9F0", - "color8": "#727B8A", - "color9": "#BF616A", - "color10": "#A3BE8C", - "color11": "#EBCB8B", - "color12": "#81A1C1", - "color13": "#B48EAD", - "color14": "#8FBCBB", - "color15": "#ECEFF4" - }, + "base00": "#3B4252", + "base01": "#BF616A", + "base02": "#A3BE8C", + "base03": "#EBCB8B", + "base04": "#81A1C1", + "base05": "#B48EAD", + "base06": "#88C0D0", + "base07": "#E5E9F0", + "base08": "#727B8A", + "base09": "#BF616A", + "base0A": "#A3BE8C", + "base0B": "#EBCB8B", + "base0C": "#81A1C1", + "base0D": "#B48EAD", + "base0E": "#8FBCBB", + "base0F": "#ECEFF4" "font": { "mono": { "name": "Iosevka", diff --git a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/alacritty/alacritty.yml b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/alacritty/alacritty.yml index c8049895..8037463a 100755 --- a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/alacritty/alacritty.yml +++ b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/alacritty/alacritty.yml @@ -56,28 +56,28 @@ window: colors: primary: - background: "{{ cookiecutter.special.background }}" - foreground: "{{ cookiecutter.special.foreground }}" + background: "{{ cookiecutter.base00 }}" + foreground: "{{ cookiecutter.base07 }}" normal: - black: "{{ cookiecutter.colors.color0 }}" - red: "{{ cookiecutter.colors.color1 }}" - green: "{{ cookiecutter.colors.color2 }}" - yellow: "{{ cookiecutter.colors.color3 }}" - blue: "{{ cookiecutter.colors.color4 }}" - magenta: "{{ cookiecutter.colors.color5 }}" - cyan: "{{ cookiecutter.colors.color6 }}" - white: "{{ cookiecutter.colors.color7 }}" + black: "{{ cookiecutter.base00 }}" + red: "{{ cookiecutter.base01 }}" + green: "{{ cookiecutter.base02 }}" + yellow: "{{ cookiecutter.base03 }}" + blue: "{{ cookiecutter.base04 }}" + magenta: "{{ cookiecutter.base05 }}" + cyan: "{{ cookiecutter.base06 }}" + white: "{{ cookiecutter.base07 }}" bright: - black: "{{ cookiecutter.colors.color8 }}" - red: "{{ cookiecutter.colors.color9 }}" - green: "{{ cookiecutter.colors.color10 }}" - yellow: "{{ cookiecutter.colors.color11 }}" - blue: "{{ cookiecutter.colors.color12 }}" - magenta: "{{ cookiecutter.colors.color13 }}" - cyan: "{{ cookiecutter.colors.color14 }}" - white: "{{ cookiecutter.colors.color15 }}" + black: "{{ cookiecutter.base08 }}" + red: "{{ cookiecutter.base09 }}" + green: "{{ cookiecutter.base0A }}" + yellow: "{{ cookiecutter.base0B }}" + blue: "{{ cookiecutter.base0C }}" + magenta: "{{ cookiecutter.base0D }}" + cyan: "{{ cookiecutter.base0E }}" + white: "{{ cookiecutter.base0F }}" scrolling: @@ -93,8 +93,8 @@ scrolling: # Font configuration (changes require restart) font: normal: - family: monospace family: {{ cookiecutter.font.mono.name }} + family: monospace # Point size size: 13.0 diff --git a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/bspwm/bspwmrc b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/bspwm/bspwmrc index 3c7322eb..61f8c42e 100755 --- a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/bspwm/bspwmrc +++ b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/bspwm/bspwmrc @@ -17,7 +17,7 @@ bspc config window_gap 9 bspc config split_ratio 0.50 bspc config borderless_monocle true bspc config gapless_monocle true -bspc config focused_border_color "{{ cookiecutter.colors.color6 }}" +bspc config focused_border_color "{{ cookiecutter.base05 }}" bspc config focus_follows_pointer true # Set the default cursor to pointer diff --git a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc index c04e80f3..216a37ee 100755 --- a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc +++ b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc @@ -64,7 +64,7 @@ frame_width = 2 # Defines color of the frame around the notification window. - frame_color = "{{ cookiecutter.special.foreground }}" + frame_color = "{{ cookiecutter.base07 }}" # Define a color for the separator. # possible values are: @@ -167,9 +167,6 @@ # Scale larger icons down to this size, set to 0 to disable max_icon_size = 32 - # Paths to default icons. - icon_path = /usr/share/icons/Adwaita/16x16/status/:/usr/share/icons/Adwaita/16x16/devices/ - ### History ### @@ -286,8 +283,8 @@ [urgency_low] # IMPORTANT: colors have to be defined in quotation marks. # Otherwise the "#" and following would be interpreted as a comment. - background = "{{ cookiecutter.special.background }}" - foreground = "{{ cookiecutter.colors.color15 }}" + background = "{{ cookiecutter.base00 }}" + foreground = "{{ cookiecutter.base0F }}" timeout = 10 # Icon for notifications with low urgency, uncomment to enable #icon = /path/to/icon @@ -295,8 +292,8 @@ [urgency_normal] - background = "{{ cookiecutter.special.background }}" - foreground = "{{ cookiecutter.special.foreground }}" + background = "{{ cookiecutter.base00 }}" + foreground = "{{ cookiecutter.base07 }}" timeout = 10 # Icon for notifications with normal urgency, uncomment to enable #icon = /path/to/icon @@ -304,9 +301,9 @@ [urgency_critical] - background = "{{ cookiecutter.special.background }}" - foreground = "{{ cookiecutter.colors.color2 }}" - frame_color = "{{ cookiecutter.colors.color2 }}" + background = "{{ cookiecutter.base00 }}" + foreground = "{{ cookiecutter.base08 }}" + frame_color = "{{ cookiecutter.base08 }}" timeout = 0 # Icon for notifications with critical urgency, uncomment to enable #icon = /path/to/icon diff --git a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/polybar/config b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/polybar/config index ad135594..8191d1f3 100755 --- a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/polybar/config +++ b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/polybar/config @@ -2,11 +2,11 @@ ; However, formats in RGB is fine. ; This is where all of the colors should be placed for those who are lazy to scroll down (like me). [colors] - background = "{{ cookiecutter.special.background }}" - background-light = "{{ cookiecutter.colors.color8 }}" - foreground = "{{ cookiecutter.special.foreground }}" - foreground-light = "{{ cookiecutter.colors.color15 }}" - accent = "{{ cookiecutter.colors.color6 }}" + background = "{{ cookiecutter.base00 }}" + background-light = "{{ cookiecutter.base01 }}" + foreground = "{{ cookiecutter.base06 }}" + foreground-light = "{{ cookiecutter.base07 }}" + accent = "{{ cookiecutter.base08 }}" ; The common style between bars. @@ -24,13 +24,14 @@ module-margin = 1 module-padding = 1 - font-0 = "Iosevka;2" - font-1 = "Fira Code;2" + font-1 = "{{ cookiecutter.font.mono.name }};2" + font-2 = "Iosevka;2" + font-3 = "Fira Code;2" ; Our fallback fonts are mostly used as icon fonts. ; For future references, the version of Font Awesome used here is at v5.13.0. ; I also installed the font myself that I downloaded from the official website (https://fontawesome.com/). - font-2 = "Font Awesome 5 Free,Font Awesome 5 Free Solid:style=Solid;2" + font-4 = "Font Awesome 5 Free,Font Awesome 5 Free Solid:style=Solid;2" ; This creates the illusion as if the modules are in the center. __border-size = 5 @@ -59,7 +60,7 @@ modules-left = bspwm modules-center = date - modules-right = pulseaudio eth memory root-fs + modules-right = pulseaudio eth memory root-fs home-fs [module/root-fs] @@ -73,6 +74,17 @@ label-unmounted = N/A +[module/home-fs] + type = internal/fs + mount-0 = /home + format-mounted-prefix = "" + format-mounted-prefix-margin-right = 1 + format-unmounted-prefix = "" + format-unmounted-prefix-margin-right = 1 + label-mounted = %free% + label-unmounted = N/A + + [module/bspwm] type = internal/bspwm wrapping-scroll = false diff --git a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/dmenu.rasi b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/dmenu.rasi index 7c991b24..9af44580 100755 --- a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/dmenu.rasi +++ b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/dmenu.rasi @@ -8,24 +8,24 @@ * { /* The color swatch */ /* Useful for quick editing of the colors */ - background: {{ cookiecutter.special.background }}; - foreground: {{ cookiecutter.special.foreground }}; - color0: {{ cookiecutter.colors.color0 }}; - color1: {{ cookiecutter.colors.color1 }}; - color2: {{ cookiecutter.colors.color2 }}; - color3: {{ cookiecutter.colors.color3 }}; - color4: {{ cookiecutter.colors.color4 }}; - color5: {{ cookiecutter.colors.color5 }}; - color6: {{ cookiecutter.colors.color6 }}; - color7: {{ cookiecutter.colors.color7 }}; - color8: {{ cookiecutter.colors.color8 }}; - color9: {{ cookiecutter.colors.color9 }}; - color10: {{ cookiecutter.colors.color10 }}; - color11: {{ cookiecutter.colors.color11 }}; - color12: {{ cookiecutter.colors.color12 }}; - color13: {{ cookiecutter.colors.color13 }}; - color14: {{ cookiecutter.colors.color14 }}; - color15: {{ cookiecutter.colors.color15 }}; + background: {{ cookiecutter.base00 }}; + foreground: {{ cookiecutter.base07 }}; + color0: {{ cookiecutter.base00 }}; + color1: {{ cookiecutter.base01 }}; + color2: {{ cookiecutter.base02 }}; + color3: {{ cookiecutter.base03 }}; + color4: {{ cookiecutter.base04 }}; + color5: {{ cookiecutter.base05 }}; + color6: {{ cookiecutter.base06 }}; + color7: {{ cookiecutter.base07 }}; + color8: {{ cookiecutter.base08 }}; + color9: {{ cookiecutter.base09 }}; + color10: {{ cookiecutter.base0A }}; + color11: {{ cookiecutter.base0B }}; + color12: {{ cookiecutter.base0C }}; + color13: {{ cookiecutter.base0D }}; + color14: {{ cookiecutter.base0E }}; + color15: {{ cookiecutter.base0F }}; background-color: @background; border-color: @foreground; diff --git a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-center-menu.rasi b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-center-menu.rasi index a8e70f0b..98bf448f 100755 --- a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-center-menu.rasi +++ b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-center-menu.rasi @@ -1,24 +1,24 @@ * { - /* The color configuration */ - /* Useful for quick editing in case for compiled templates */ - background: {{ cookiecutter.special.background }}; - foreground: {{ cookiecutter.special.foreground }}; - color0: {{ cookiecutter.colors.color0 }}; - color1: {{ cookiecutter.colors.color1 }}; - color2: {{ cookiecutter.colors.color2 }}; - color3: {{ cookiecutter.colors.color3 }}; - color4: {{ cookiecutter.colors.color4 }}; - color5: {{ cookiecutter.colors.color5 }}; - color6: {{ cookiecutter.colors.color6 }}; - color7: {{ cookiecutter.colors.color7 }}; - color8: {{ cookiecutter.colors.color8 }}; - color9: {{ cookiecutter.colors.color9 }}; - color10: {{ cookiecutter.colors.color10 }}; - color11: {{ cookiecutter.colors.color11 }}; - color12: {{ cookiecutter.colors.color12 }}; - color13: {{ cookiecutter.colors.color13 }}; - color14: {{ cookiecutter.colors.color14 }}; - color15: {{ cookiecutter.colors.color15 }}; + /* The color swatch */ + /* Useful for quick editing of the colors */ + background: {{ cookiecutter.base00 }}; + foreground: {{ cookiecutter.base07 }}; + color0: {{ cookiecutter.base00 }}; + color1: {{ cookiecutter.base01 }}; + color2: {{ cookiecutter.base02 }}; + color3: {{ cookiecutter.base03 }}; + color4: {{ cookiecutter.base04 }}; + color5: {{ cookiecutter.base05 }}; + color6: {{ cookiecutter.base06 }}; + color7: {{ cookiecutter.base07 }}; + color8: {{ cookiecutter.base08 }}; + color9: {{ cookiecutter.base09 }}; + color10: {{ cookiecutter.base0A }}; + color11: {{ cookiecutter.base0B }}; + color12: {{ cookiecutter.base0C }}; + color13: {{ cookiecutter.base0D }}; + color14: {{ cookiecutter.base0E }}; + color15: {{ cookiecutter.base0F }}; /* Theme settings */ highlight: bold italic; diff --git a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-mini-sidebar.rasi b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-mini-sidebar.rasi index db27ef6f..d3851569 100755 --- a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-mini-sidebar.rasi +++ b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-mini-sidebar.rasi @@ -1,24 +1,24 @@ * { - /* The color configuration */ - /* Useful for quick editing in case for compiled templates */ - background: {{ cookiecutter.special.background }}; - foreground: {{ cookiecutter.special.foreground }}; - color0: {{ cookiecutter.colors.color0 }}; - color1: {{ cookiecutter.colors.color1 }}; - color2: {{ cookiecutter.colors.color2 }}; - color3: {{ cookiecutter.colors.color3 }}; - color4: {{ cookiecutter.colors.color4 }}; - color5: {{ cookiecutter.colors.color5 }}; - color6: {{ cookiecutter.colors.color6 }}; - color7: {{ cookiecutter.colors.color7 }}; - color8: {{ cookiecutter.colors.color8 }}; - color9: {{ cookiecutter.colors.color9 }}; - color10: {{ cookiecutter.colors.color10 }}; - color11: {{ cookiecutter.colors.color11 }}; - color12: {{ cookiecutter.colors.color12 }}; - color13: {{ cookiecutter.colors.color13 }}; - color14: {{ cookiecutter.colors.color14 }}; - color15: {{ cookiecutter.colors.color15 }}; + /* The color swatch */ + /* Useful for quick editing of the colors */ + background: {{ cookiecutter.base00 }}; + foreground: {{ cookiecutter.base07 }}; + color0: {{ cookiecutter.base00 }}; + color1: {{ cookiecutter.base01 }}; + color2: {{ cookiecutter.base02 }}; + color3: {{ cookiecutter.base03 }}; + color4: {{ cookiecutter.base04 }}; + color5: {{ cookiecutter.base05 }}; + color6: {{ cookiecutter.base06 }}; + color7: {{ cookiecutter.base07 }}; + color8: {{ cookiecutter.base08 }}; + color9: {{ cookiecutter.base09 }}; + color10: {{ cookiecutter.base0A }}; + color11: {{ cookiecutter.base0B }}; + color12: {{ cookiecutter.base0C }}; + color13: {{ cookiecutter.base0D }}; + color14: {{ cookiecutter.base0E }}; + color15: {{ cookiecutter.base0F }}; /* General theme settings */ highlight: bold italic;