diff --git a/defaults/main.yaml b/defaults/main.yaml index 632d38d..2188936 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,7 +1,6 @@ --- home_base_color_hue: 219 home_xft_dpi: 96 -home_urxvt_font_pixelsize: 12 home_copy_pulseaudio_cookie: false home_desktop: false home_access_to_hosts: [] @@ -69,6 +68,17 @@ workspaces: {} i3_hide_bar: false i3_hide_border_one_window: false +i3_font: pango:{{i3_pango_font}} +i3_pango_font: "{{terminal_font}}" + +xfce4_terminal_font: "{{terminal_font}}" + +terminal_font: "{{terminal_font_name}} {{terminal_font_size}}" +terminal_font_name: Monospace +terminal_font_size: 12 + +home_urxvt_font_pixelsize: "{{terminal_font_size}}" + home_xhosts_allow: [] pulseaudio_load_system_config: true diff --git a/tasks/main.yaml b/tasks/main.yaml index c1797ac..90fc6cc 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -16,9 +16,13 @@ - block: - import_tasks: i3.yaml + tags: + - i3 - import_tasks: workspaces.yaml - import_tasks: background.yaml - import_tasks: xfce4-terminal.yaml + tags: + - xfce4-terminal - import_tasks: rofi.yaml - import_tasks: screenlayout.yaml - import_tasks: x11.yaml diff --git a/templates/i3/i3.config.j2 b/templates/i3/i3.config.j2 index fd192ba..02d88b4 100644 --- a/templates/i3/i3.config.j2 +++ b/templates/i3/i3.config.j2 @@ -8,19 +8,7 @@ {% set on_focus_workspace = "exec --no-startup-id ~/bin/on-focus-workspace" %} ### Font -#font pango:DejaVu Sans Mono 12 -#font pango:DejaVu Sans Mono, Terminus Bold Semi-Condensed 11 -#font pango:Droid Sans Mono Dotted 12 -#font pango:DroidSansMono 13 -#font pango:Sans 13 -#font pango:hermit 12 -#font pango:Inconsolata 14 -font pango:monospace 10 -#font pango:SourceCodePro-SemiBold 11 -#font pango:Source Code Pro for Powerline, FontAwesome Regular, Icons 9 -#font pango:Terminus 14px -#font pango:UbuntuMono-regular 12 - +font {{i3_font}} ### Modifier Key diff --git a/templates/xfce4-terminal/terminalrc.j2 b/templates/xfce4-terminal/terminalrc.j2 index 2dc809e..ec2d53c 100644 --- a/templates/xfce4-terminal/terminalrc.j2 +++ b/templates/xfce4-terminal/terminalrc.j2 @@ -30,5 +30,4 @@ TitleMode=TERMINAL_TITLE_REPLACE ScrollingBar=TERMINAL_SCROLLBAR_NONE BackgroundImageShading=0,530000 ScrollingUnlimited=TRUE -FontName=Monospace 10 - +FontName=Monospace 12