From 1549f55dfecb9fcf913ef049c68303f6617ac1aa Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Sat, 6 Jan 2024 00:00:00 +0700 Subject: [PATCH] Remove tmux and qutebrowser config (not used anymore) More changes: - alacritty: switch config to TOML format - options: - Go back to specify 1 variant of CJK fonts - Update user_agent - fish: update Nord theme to be more aligned with upstream - cava: update config to use pipewire as the default backend - container: pull kcli container images - packages/go: add regal, go-licenses (and remove some unused linters) --- TODO.md | 5 +- group_vars/all/fonts.yml | 12 +- group_vars/all/options.yml | 2 - group_vars/all/user.yml | 2 +- requirements/assert.yml | 4 - roles/config/files/fish/Nord.theme | 46 +-- roles/config/files/fish/Onedark.theme | 12 +- roles/config/files/qutebrowser/base16-nord.py | 300 --------------- .../files/qutebrowser/base16-onedark.py | 300 --------------- roles/config/tasks/alacritty.yml | 2 +- roles/config/tasks/main.jsonnet | 4 - roles/config/tasks/main.yml | 10 +- roles/config/tasks/mpv.yml | 30 +- roles/config/tasks/qutebrowser.yml | 23 -- roles/config/tasks/tmux.yml | 19 - roles/config/templates/alacritty/alacritty.j2 | 346 ++++-------------- roles/config/templates/cava/config.j2 | 100 +++-- roles/config/templates/fish/aliases.j2 | 7 - roles/config/templates/fish/env.j2 | 1 + roles/config/templates/fontconfig/fonts.j2 | 24 +- roles/config/templates/foot/foot.j2 | 8 +- roles/config/templates/qutebrowser/config.j2 | 209 ----------- roles/config/templates/tmux/tmux.j2 | 51 --- roles/config/templates/waybar/style_sway.j2 | 2 +- roles/containers/defaults/main.yml | 1 + roles/containers/tasks/apptainer.jsonnet | 2 +- roles/containers/tasks/podman.jsonnet | 26 +- roles/containers/tasks/podman.yml | 15 +- roles/containers/templates/kcli.j2 | 15 + roles/packages/tasks/go-packages.jsonnet | 8 +- roles/packages/tasks/go-packages.yml | 38 +- roles/theme/defaults/main.yml | 2 +- 32 files changed, 274 insertions(+), 1352 deletions(-) delete mode 100644 roles/config/files/qutebrowser/base16-nord.py delete mode 100644 roles/config/files/qutebrowser/base16-onedark.py delete mode 100644 roles/config/tasks/qutebrowser.yml delete mode 100644 roles/config/tasks/tmux.yml delete mode 100644 roles/config/templates/qutebrowser/config.j2 delete mode 100644 roles/config/templates/tmux/tmux.j2 create mode 100644 roles/containers/templates/kcli.j2 diff --git a/TODO.md b/TODO.md index 24b9f56..cc5cae1 100644 --- a/TODO.md +++ b/TODO.md @@ -27,7 +27,7 @@ Plans for the future of this dotfiles. ## Cosmetic -- [ ] GTK/Icons/Cursor theme, Sarasa font bootstraping +- [ ] GTK/Icons/Cursor theme, Sarasa font bootstrapping - [ ] Waybar config file for River - [ ] [catppuccin](https://github.com/catppuccin/catppuccin) theme - [ ] Remove `pipewire-pulse` entirely (is there alternative to pavucontrol for pipewire??) @@ -36,8 +36,7 @@ Plans for the future of this dotfiles. - [ ] waybar: pulseaudio module -> wireplumber module (wait for more features, e.g. scrolling) - [ ] html2text, html2org - [ ] Build podman container images with ansible-bender -- [ ] Add `target-determinator` and `aspect-cli` to packages (or containers, - with underlying `bazel`) +- [ ] Add `target-determinator` and `aspect-cli` to packages (or containers, with underlying `bazel`) ## Sandboxing diff --git a/group_vars/all/fonts.yml b/group_vars/all/fonts.yml index 98b1255..4ba51a8 100644 --- a/group_vars/all/fonts.yml +++ b/group_vars/all/fonts.yml @@ -1,15 +1,11 @@ --- -cjk_term_font: - - Sarasa Term J +cjk_term_font: Sarasa Term J -cjk_monospace_font: - - Sarasa Mono J +cjk_monospace_font: Sarasa Mono J -cjk_sans_font: - - Sarasa Fixed J +cjk_sans_font: Sarasa Fixed J -cjk_serif_font: - - Sarasa Fixed Slab J +cjk_serif_font: Sarasa Fixed Slab J term_font: IosevkaTerm Nerd Font diff --git a/group_vars/all/options.yml b/group_vars/all/options.yml index 8b82a82..2705998 100644 --- a/group_vars/all/options.yml +++ b/group_vars/all/options.yml @@ -11,8 +11,6 @@ screenshot: grim notification: dunst -multiplexer: zellij - # TODO: mopidy backends orther than local files music_daemon: mpd diff --git a/group_vars/all/user.yml b/group_vars/all/user.yml index 3f886a1..9ce9383 100644 --- a/group_vars/all/user.yml +++ b/group_vars/all/user.yml @@ -3,6 +3,6 @@ user_name: Hoang Nguyen user_email: folliekazetani@protonmail.com -user_agent: Mozilla/5.0 (Windows NT 10.0; rv:102.0) Gecko/20100101 Firefox/102.0 +user_agent: Mozilla/5.0 (Windows NT 10.0; rv:109.0) Gecko/20100101 Firefox/115.0 user_gpg_signature: B0567C20730E9B11 diff --git a/requirements/assert.yml b/requirements/assert.yml index ca7858b..c03d52c 100644 --- a/requirements/assert.yml +++ b/requirements/assert.yml @@ -17,10 +17,6 @@ notification: - mako - fnott -multiplexer: - - zellij - - tmux - wallpaper_engine: - swww - swaybg diff --git a/roles/config/files/fish/Nord.theme b/roles/config/files/fish/Nord.theme index 1d638e8..5c29559 100644 --- a/roles/config/files/fish/Nord.theme +++ b/roles/config/files/fish/Nord.theme @@ -1,38 +1,38 @@ fish_color_autosuggestion 4c566a -fish_color_cancel -r -fish_color_command 81a1c1 -fish_color_comment 434c5e -fish_color_cwd green -fish_color_cwd_root red -fish_color_end 88c0d0 -fish_color_error ebcb8b -fish_color_escape 8fbcbb -fish_color_history_current --bold -fish_color_host normal -fish_color_host_remote +fish_color_cancel --reverse +fish_color_command 88c0d0 +fish_color_comment 4c566a --italics +fish_color_cwd 5e81ac +fish_color_cwd_root bf616a +fish_color_end 81a1c1 +fish_color_error bf616a +fish_color_escape ebcb8b +fish_color_history_current eceff4 --bold +fish_color_host a3be8c +fish_color_host_remote ebcb8b fish_color_keyword 81a1c1 fish_color_match --background=brblue fish_color_normal normal -fish_color_operator 8fbcbb -fish_color_option eceff4 +fish_color_operator 81a1c1 +fish_color_option 8fbcbb fish_color_param eceff4 fish_color_quote a3be8c -fish_color_redirection b48ead -fish_color_search_match 'bryellow' '--background=brblack' -fish_color_selection 'white' '--bold' '--background=brblack' -fish_color_status red -fish_color_user brgreen +fish_color_redirection b48ead --bold +fish_color_search_match --bold --background=434c5e +fish_color_selection eceff4 --bold --background=434c5e +fish_color_status bf616a +fish_color_user a3be8c fish_color_valid_path --underline fish_pager_color_background -fish_pager_color_completion normal -fish_pager_color_description 'EBCB8B' 'yellow' -fish_pager_color_prefix 'normal' '--bold' '--underline' -fish_pager_color_progress 'brwhite' '--background=cyan' +fish_pager_color_completion eceff4 +fish_pager_color_description ebcb8b --italics +fish_pager_color_prefix normal --bold --underline +fish_pager_color_progress 3b4252 --background=d08770 fish_pager_color_secondary_background fish_pager_color_secondary_completion fish_pager_color_secondary_description fish_pager_color_secondary_prefix -fish_pager_color_selected_background --background=brblack +fish_pager_color_selected_background --background=434c5e fish_pager_color_selected_completion fish_pager_color_selected_description fish_pager_color_selected_prefix diff --git a/roles/config/files/fish/Onedark.theme b/roles/config/files/fish/Onedark.theme index 7869b5f..4a5827b 100644 --- a/roles/config/files/fish/Onedark.theme +++ b/roles/config/files/fish/Onedark.theme @@ -1,5 +1,5 @@ fish_color_autosuggestion 4b5263 -fish_color_cancel -r +fish_color_cancel --reverse fish_color_command c678dd fish_color_comment 3e4452 fish_color_cwd green @@ -18,16 +18,16 @@ fish_color_option bbc2cf fish_color_param bbc2cf fish_color_quote 98c379 fish_color_redirection 56b6c2 -fish_color_search_match 'bryellow' '--background=brblack' -fish_color_selection 'white' '--bold' '--background=brblack' +fish_color_search_match bryellow --background=brblack +fish_color_selection bbc2cf --bold --background=brblack fish_color_status red fish_color_user brgreen fish_color_valid_path --underline fish_pager_color_background fish_pager_color_completion normal -fish_pager_color_description 'E5C07B' 'yellow' -fish_pager_color_prefix 'white' '--bold' '--underline' -fish_pager_color_progress 'brwhite' '--background=cyan' +fish_pager_color_description e5c07b +fish_pager_color_prefix bbc2cf --bold --underline +fish_pager_color_progress brwhite --background=cyan fish_pager_color_secondary_background fish_pager_color_secondary_completion fish_pager_color_secondary_description diff --git a/roles/config/files/qutebrowser/base16-nord.py b/roles/config/files/qutebrowser/base16-nord.py deleted file mode 100644 index 14519e8..0000000 --- a/roles/config/files/qutebrowser/base16-nord.py +++ /dev/null @@ -1,300 +0,0 @@ -# base16-qutebrowser (https://github.com/theova/base16-qutebrowser) -# Base16 qutebrowser template by theova -# Nord scheme by arcticicestudio - -base00 = "#2E3440" -base01 = "#3B4252" -base02 = "#434C5E" -base03 = "#4C566A" -base04 = "#D8DEE9" -base05 = "#E5E9F0" -base06 = "#ECEFF4" -base07 = "#8FBCBB" -base08 = "#BF616A" -base09 = "#D08770" -base0A = "#EBCB8B" -base0B = "#A3BE8C" -base0C = "#88C0D0" -base0D = "#81A1C1" -base0E = "#B48EAD" -base0F = "#5E81AC" - -# set qutebrowser colors - -# Text color of the completion widget. May be a single color to use for -# all columns or a list of three colors, one for each column. -c.colors.completion.fg = base05 - -# Background color of the completion widget for odd rows. -c.colors.completion.odd.bg = base00 - -# Background color of the completion widget for even rows. -c.colors.completion.even.bg = base00 - -# Foreground color of completion widget category headers. -c.colors.completion.category.fg = base0A - -# Background color of the completion widget category headers. -c.colors.completion.category.bg = base00 - -# Top border color of the completion widget category headers. -c.colors.completion.category.border.top = base00 - -# Bottom border color of the completion widget category headers. -c.colors.completion.category.border.bottom = base00 - -# Foreground color of the selected completion item. -c.colors.completion.item.selected.fg = base00 - -# Background color of the selected completion item. -c.colors.completion.item.selected.bg = base0A - -# Top border color of the selected completion item. -c.colors.completion.item.selected.border.top = base02 - -# Bottom border color of the selected completion item. -c.colors.completion.item.selected.border.bottom = base02 - -# Foreground color of the matched text in the selected completion item. -c.colors.completion.item.selected.match.fg = base0B - -# Foreground color of the matched text in the completion. -c.colors.completion.match.fg = base0B - -# Color of the scrollbar handle in the completion view. -c.colors.completion.scrollbar.fg = base05 - -# Color of the scrollbar in the completion view. -c.colors.completion.scrollbar.bg = base00 - -# Background color of disabled items in the context menu. -c.colors.contextmenu.disabled.bg = base01 - -# Foreground color of disabled items in the context menu. -c.colors.contextmenu.disabled.fg = base04 - -# Background color of the context menu. If set to null, the Qt default is used. -c.colors.contextmenu.menu.bg = base00 - -# Foreground color of the context menu. If set to null, the Qt default is used. -c.colors.contextmenu.menu.fg = base05 - -# Background color of the context menu’s selected item. If set to null, the Qt default is used. -c.colors.contextmenu.selected.bg = base02 - -#Foreground color of the context menu’s selected item. If set to null, the Qt default is used. -c.colors.contextmenu.selected.fg = base05 - -# Background color for the download bar. -c.colors.downloads.bar.bg = base00 - -# Color gradient start for download text. -c.colors.downloads.start.fg = base00 - -# Color gradient start for download backgrounds. -c.colors.downloads.start.bg = base0D - -# Color gradient end for download text. -c.colors.downloads.stop.fg = base00 - -# Color gradient stop for download backgrounds. -c.colors.downloads.stop.bg = base0C - -# Foreground color for downloads with errors. -c.colors.downloads.error.fg = base08 - -# Font color for hints. -c.colors.hints.fg = base00 - -# Background color for hints. Note that you can use a `rgba(...)` value -# for transparency. -c.colors.hints.bg = base0A - -# Font color for the matched part of hints. -c.colors.hints.match.fg = base05 - -# Text color for the keyhint widget. -c.colors.keyhint.fg = base05 - -# Highlight color for keys to complete the current keychain. -c.colors.keyhint.suffix.fg = base05 - -# Background color of the keyhint widget. -c.colors.keyhint.bg = base00 - -# Foreground color of an error message. -c.colors.messages.error.fg = base00 - -# Background color of an error message. -c.colors.messages.error.bg = base08 - -# Border color of an error message. -c.colors.messages.error.border = base08 - -# Foreground color of a warning message. -c.colors.messages.warning.fg = base00 - -# Background color of a warning message. -c.colors.messages.warning.bg = base0E - -# Border color of a warning message. -c.colors.messages.warning.border = base0E - -# Foreground color of an info message. -c.colors.messages.info.fg = base05 - -# Background color of an info message. -c.colors.messages.info.bg = base00 - -# Border color of an info message. -c.colors.messages.info.border = base00 - -# Foreground color for prompts. -c.colors.prompts.fg = base05 - -# Border used around UI elements in prompts. -c.colors.prompts.border = base00 - -# Background color for prompts. -c.colors.prompts.bg = base00 - -# Background color for the selected item in filename prompts. -c.colors.prompts.selected.bg = base02 - -# Foreground color for the selected item in filename prompts. -c.colors.prompts.selected.fg = base06 - -# Foreground color of the statusbar. -c.colors.statusbar.normal.fg = base0B - -# Background color of the statusbar. -c.colors.statusbar.normal.bg = base00 - -# Foreground color of the statusbar in insert mode. -c.colors.statusbar.insert.fg = base00 - -# Background color of the statusbar in insert mode. -c.colors.statusbar.insert.bg = base0D - -# Foreground color of the statusbar in passthrough mode. -c.colors.statusbar.passthrough.fg = base00 - -# Background color of the statusbar in passthrough mode. -c.colors.statusbar.passthrough.bg = base0C - -# Foreground color of the statusbar in private browsing mode. -c.colors.statusbar.private.fg = base0E - -# Background color of the statusbar in private browsing mode. -c.colors.statusbar.private.bg = base01 - -# Foreground color of the statusbar in command mode. -c.colors.statusbar.command.fg = base05 - -# Background color of the statusbar in command mode. -c.colors.statusbar.command.bg = base00 - -# Foreground color of the statusbar in private browsing + command mode. -c.colors.statusbar.command.private.fg = base05 - -# Background color of the statusbar in private browsing + command mode. -c.colors.statusbar.command.private.bg = base00 - -# Foreground color of the statusbar in caret mode. -c.colors.statusbar.caret.fg = base00 - -# Background color of the statusbar in caret mode. -c.colors.statusbar.caret.bg = base0E - -# Foreground color of the statusbar in caret mode with a selection. -c.colors.statusbar.caret.selection.fg = base00 - -# Background color of the statusbar in caret mode with a selection. -c.colors.statusbar.caret.selection.bg = base0D - -# Background color of the progress bar. -c.colors.statusbar.progress.bg = base0D - -# Default foreground color of the URL in the statusbar. -c.colors.statusbar.url.fg = base05 - -# Foreground color of the URL in the statusbar on error. -c.colors.statusbar.url.error.fg = base08 - -# Foreground color of the URL in the statusbar for hovered links. -c.colors.statusbar.url.hover.fg = base05 - -# Foreground color of the URL in the statusbar on successful load -# (http). -c.colors.statusbar.url.success.http.fg = base0C - -# Foreground color of the URL in the statusbar on successful load -# (https). -c.colors.statusbar.url.success.https.fg = base0B - -# Foreground color of the URL in the statusbar when there's a warning. -c.colors.statusbar.url.warn.fg = base0E - -# Background color of the tab bar. -c.colors.tabs.bar.bg = base00 - -# Color gradient start for the tab indicator. -c.colors.tabs.indicator.start = base0D - -# Color gradient end for the tab indicator. -c.colors.tabs.indicator.stop = base0C - -# Color for the tab indicator on errors. -c.colors.tabs.indicator.error = base08 - -# Foreground color of unselected odd tabs. -c.colors.tabs.odd.fg = base05 - -# Background color of unselected odd tabs. -c.colors.tabs.odd.bg = base01 - -# Foreground color of unselected even tabs. -c.colors.tabs.even.fg = base05 - -# Background color of unselected even tabs. -c.colors.tabs.even.bg = base00 - -# Background color of pinned unselected even tabs. -c.colors.tabs.pinned.even.bg = base0C - -# Foreground color of pinned unselected even tabs. -c.colors.tabs.pinned.even.fg = base07 - -# Background color of pinned unselected odd tabs. -c.colors.tabs.pinned.odd.bg = base0B - -# Foreground color of pinned unselected odd tabs. -c.colors.tabs.pinned.odd.fg = base07 - -# Background color of pinned selected even tabs. -c.colors.tabs.pinned.selected.even.bg = base02 - -# Foreground color of pinned selected even tabs. -c.colors.tabs.pinned.selected.even.fg = base05 - -# Background color of pinned selected odd tabs. -c.colors.tabs.pinned.selected.odd.bg = base02 - -# Foreground color of pinned selected odd tabs. -c.colors.tabs.pinned.selected.odd.fg = base05 - -# Foreground color of selected odd tabs. -c.colors.tabs.selected.odd.fg = base05 - -# Background color of selected odd tabs. -c.colors.tabs.selected.odd.bg = base02 - -# Foreground color of selected even tabs. -c.colors.tabs.selected.even.fg = base05 - -# Background color of selected even tabs. -c.colors.tabs.selected.even.bg = base02 - -# Background color for webpages if unset (or empty to use the theme's -# color). -# c.colors.webpage.bg = base00 diff --git a/roles/config/files/qutebrowser/base16-onedark.py b/roles/config/files/qutebrowser/base16-onedark.py deleted file mode 100644 index 4fc7588..0000000 --- a/roles/config/files/qutebrowser/base16-onedark.py +++ /dev/null @@ -1,300 +0,0 @@ -# base16-qutebrowser (https://github.com/theova/base16-qutebrowser) -# Base16 qutebrowser template by theova -# OneDark scheme by Lalit Magant (http://github.com/tilal6991) - -base00 = "#282c34" -base01 = "#353b45" -base02 = "#3e4451" -base03 = "#545862" -base04 = "#565c64" -base05 = "#abb2bf" -base06 = "#b6bdca" -base07 = "#c8ccd4" -base08 = "#e06c75" -base09 = "#d19a66" -base0A = "#e5c07b" -base0B = "#98c379" -base0C = "#56b6c2" -base0D = "#61afef" -base0E = "#c678dd" -base0F = "#be5046" - -# set qutebrowser colors - -# Text color of the completion widget. May be a single color to use for -# all columns or a list of three colors, one for each column. -c.colors.completion.fg = base05 - -# Background color of the completion widget for odd rows. -c.colors.completion.odd.bg = base00 - -# Background color of the completion widget for even rows. -c.colors.completion.even.bg = base00 - -# Foreground color of completion widget category headers. -c.colors.completion.category.fg = base0A - -# Background color of the completion widget category headers. -c.colors.completion.category.bg = base00 - -# Top border color of the completion widget category headers. -c.colors.completion.category.border.top = base00 - -# Bottom border color of the completion widget category headers. -c.colors.completion.category.border.bottom = base00 - -# Foreground color of the selected completion item. -c.colors.completion.item.selected.fg = base00 - -# Background color of the selected completion item. -c.colors.completion.item.selected.bg = base0A - -# Top border color of the selected completion item. -c.colors.completion.item.selected.border.top = base02 - -# Bottom border color of the selected completion item. -c.colors.completion.item.selected.border.bottom = base02 - -# Foreground color of the matched text in the selected completion item. -c.colors.completion.item.selected.match.fg = base0B - -# Foreground color of the matched text in the completion. -c.colors.completion.match.fg = base0B - -# Color of the scrollbar handle in the completion view. -c.colors.completion.scrollbar.fg = base05 - -# Color of the scrollbar in the completion view. -c.colors.completion.scrollbar.bg = base00 - -# Background color of disabled items in the context menu. -c.colors.contextmenu.disabled.bg = base01 - -# Foreground color of disabled items in the context menu. -c.colors.contextmenu.disabled.fg = base04 - -# Background color of the context menu. If set to null, the Qt default is used. -c.colors.contextmenu.menu.bg = base00 - -# Foreground color of the context menu. If set to null, the Qt default is used. -c.colors.contextmenu.menu.fg = base05 - -# Background color of the context menu’s selected item. If set to null, the Qt default is used. -c.colors.contextmenu.selected.bg = base02 - -#Foreground color of the context menu’s selected item. If set to null, the Qt default is used. -c.colors.contextmenu.selected.fg = base05 - -# Background color for the download bar. -c.colors.downloads.bar.bg = base00 - -# Color gradient start for download text. -c.colors.downloads.start.fg = base00 - -# Color gradient start for download backgrounds. -c.colors.downloads.start.bg = base0D - -# Color gradient end for download text. -c.colors.downloads.stop.fg = base00 - -# Color gradient stop for download backgrounds. -c.colors.downloads.stop.bg = base0C - -# Foreground color for downloads with errors. -c.colors.downloads.error.fg = base08 - -# Font color for hints. -c.colors.hints.fg = base00 - -# Background color for hints. Note that you can use a `rgba(...)` value -# for transparency. -c.colors.hints.bg = base0A - -# Font color for the matched part of hints. -c.colors.hints.match.fg = base05 - -# Text color for the keyhint widget. -c.colors.keyhint.fg = base05 - -# Highlight color for keys to complete the current keychain. -c.colors.keyhint.suffix.fg = base05 - -# Background color of the keyhint widget. -c.colors.keyhint.bg = base00 - -# Foreground color of an error message. -c.colors.messages.error.fg = base00 - -# Background color of an error message. -c.colors.messages.error.bg = base08 - -# Border color of an error message. -c.colors.messages.error.border = base08 - -# Foreground color of a warning message. -c.colors.messages.warning.fg = base00 - -# Background color of a warning message. -c.colors.messages.warning.bg = base0E - -# Border color of a warning message. -c.colors.messages.warning.border = base0E - -# Foreground color of an info message. -c.colors.messages.info.fg = base05 - -# Background color of an info message. -c.colors.messages.info.bg = base00 - -# Border color of an info message. -c.colors.messages.info.border = base00 - -# Foreground color for prompts. -c.colors.prompts.fg = base05 - -# Border used around UI elements in prompts. -c.colors.prompts.border = base00 - -# Background color for prompts. -c.colors.prompts.bg = base00 - -# Background color for the selected item in filename prompts. -c.colors.prompts.selected.bg = base02 - -# Foreground color for the selected item in filename prompts. -c.colors.prompts.selected.fg = base06 - -# Foreground color of the statusbar. -c.colors.statusbar.normal.fg = base0B - -# Background color of the statusbar. -c.colors.statusbar.normal.bg = base00 - -# Foreground color of the statusbar in insert mode. -c.colors.statusbar.insert.fg = base00 - -# Background color of the statusbar in insert mode. -c.colors.statusbar.insert.bg = base0D - -# Foreground color of the statusbar in passthrough mode. -c.colors.statusbar.passthrough.fg = base00 - -# Background color of the statusbar in passthrough mode. -c.colors.statusbar.passthrough.bg = base0C - -# Foreground color of the statusbar in private browsing mode. -c.colors.statusbar.private.fg = base0E - -# Background color of the statusbar in private browsing mode. -c.colors.statusbar.private.bg = base01 - -# Foreground color of the statusbar in command mode. -c.colors.statusbar.command.fg = base05 - -# Background color of the statusbar in command mode. -c.colors.statusbar.command.bg = base00 - -# Foreground color of the statusbar in private browsing + command mode. -c.colors.statusbar.command.private.fg = base05 - -# Background color of the statusbar in private browsing + command mode. -c.colors.statusbar.command.private.bg = base00 - -# Foreground color of the statusbar in caret mode. -c.colors.statusbar.caret.fg = base00 - -# Background color of the statusbar in caret mode. -c.colors.statusbar.caret.bg = base0E - -# Foreground color of the statusbar in caret mode with a selection. -c.colors.statusbar.caret.selection.fg = base00 - -# Background color of the statusbar in caret mode with a selection. -c.colors.statusbar.caret.selection.bg = base0D - -# Background color of the progress bar. -c.colors.statusbar.progress.bg = base0D - -# Default foreground color of the URL in the statusbar. -c.colors.statusbar.url.fg = base05 - -# Foreground color of the URL in the statusbar on error. -c.colors.statusbar.url.error.fg = base08 - -# Foreground color of the URL in the statusbar for hovered links. -c.colors.statusbar.url.hover.fg = base05 - -# Foreground color of the URL in the statusbar on successful load -# (http). -c.colors.statusbar.url.success.http.fg = base0C - -# Foreground color of the URL in the statusbar on successful load -# (https). -c.colors.statusbar.url.success.https.fg = base0B - -# Foreground color of the URL in the statusbar when there's a warning. -c.colors.statusbar.url.warn.fg = base0E - -# Background color of the tab bar. -c.colors.tabs.bar.bg = base00 - -# Color gradient start for the tab indicator. -c.colors.tabs.indicator.start = base0D - -# Color gradient end for the tab indicator. -c.colors.tabs.indicator.stop = base0C - -# Color for the tab indicator on errors. -c.colors.tabs.indicator.error = base08 - -# Foreground color of unselected odd tabs. -c.colors.tabs.odd.fg = base05 - -# Background color of unselected odd tabs. -c.colors.tabs.odd.bg = base01 - -# Foreground color of unselected even tabs. -c.colors.tabs.even.fg = base05 - -# Background color of unselected even tabs. -c.colors.tabs.even.bg = base00 - -# Background color of pinned unselected even tabs. -c.colors.tabs.pinned.even.bg = base0C - -# Foreground color of pinned unselected even tabs. -c.colors.tabs.pinned.even.fg = base07 - -# Background color of pinned unselected odd tabs. -c.colors.tabs.pinned.odd.bg = base0B - -# Foreground color of pinned unselected odd tabs. -c.colors.tabs.pinned.odd.fg = base07 - -# Background color of pinned selected even tabs. -c.colors.tabs.pinned.selected.even.bg = base02 - -# Foreground color of pinned selected even tabs. -c.colors.tabs.pinned.selected.even.fg = base05 - -# Background color of pinned selected odd tabs. -c.colors.tabs.pinned.selected.odd.bg = base02 - -# Foreground color of pinned selected odd tabs. -c.colors.tabs.pinned.selected.odd.fg = base05 - -# Foreground color of selected odd tabs. -c.colors.tabs.selected.odd.fg = base05 - -# Background color of selected odd tabs. -c.colors.tabs.selected.odd.bg = base02 - -# Foreground color of selected even tabs. -c.colors.tabs.selected.even.fg = base05 - -# Background color of selected even tabs. -c.colors.tabs.selected.even.bg = base02 - -# Background color for webpages if unset (or empty to use the theme's -# color). -# c.colors.webpage.bg = base00 diff --git a/roles/config/tasks/alacritty.yml b/roles/config/tasks/alacritty.yml index a51116d..31b56bc 100644 --- a/roles/config/tasks/alacritty.yml +++ b/roles/config/tasks/alacritty.yml @@ -8,6 +8,6 @@ - name: alacritty | Copy config template: src: alacritty/alacritty.j2 - dest: '{{ xdg_dir.config_home }}/alacritty.yml' + dest: '{{ xdg_dir.config_home }}/alacritty/alacritty.toml' force: true mode: '644' diff --git a/roles/config/tasks/main.jsonnet b/roles/config/tasks/main.jsonnet index fcf6ab0..dcf2b11 100644 --- a/roles/config/tasks/main.jsonnet +++ b/roles/config/tasks/main.jsonnet @@ -6,8 +6,6 @@ local task(name) = // Handle special cases + if std.member(['fuzzel', 'wofi', 'rofi'], name) then { tags: 'launcher', when: 'launcher == "' + name + '"' } - else if std.member(['zellij', 'tmux'], name) then - { tags: 'multiplexer', when: 'multiplexer == "' + name + '"' } else if std.member(['imv'], name) then { tags: name, when: 'image_viewer == "' + name + '"' } else if std.member(['fish', 'bash', 'nushell', 'xonsh'], name) then @@ -53,7 +51,6 @@ local modules = [ 'nushell', 'nvim', 'pyradio', - 'qutebrowser', 'ripgrep', 'river', 'rofi', @@ -61,7 +58,6 @@ local modules = [ 'superd', 'swappy', 'sway', - 'tmux', 'translate-shell', 'vifm', 'waybar', diff --git a/roles/config/tasks/main.yml b/roles/config/tasks/main.yml index 1354279..346b6ae 100644 --- a/roles/config/tasks/main.yml +++ b/roles/config/tasks/main.yml @@ -160,9 +160,6 @@ - import_tasks: pyradio.yml name: Configure pyradio tags: pyradio -- import_tasks: qutebrowser.yml - name: Configure qutebrowser - tags: qutebrowser - import_tasks: ripgrep.yml name: Configure ripgrep tags: ripgrep @@ -185,10 +182,6 @@ - import_tasks: sway.yml name: Configure sway tags: sway -- import_tasks: tmux.yml - name: Configure tmux - tags: multiplexer - when: multiplexer == "tmux" - import_tasks: translate-shell.yml name: Configure translate-shell tags: translate-shell @@ -224,5 +217,4 @@ tags: zathura - import_tasks: zellij.yml name: Configure zellij - tags: multiplexer - when: multiplexer == "zellij" + tags: zellij diff --git a/roles/config/tasks/mpv.yml b/roles/config/tasks/mpv.yml index 93fc8ee..9c1af94 100644 --- a/roles/config/tasks/mpv.yml +++ b/roles/config/tasks/mpv.yml @@ -80,21 +80,21 @@ dest: '{{ xdg_dir.config_home }}/mpv/script-opts/thumbfast.conf' mode: '644' -- name: mpv | Install and configure autosubsync-mpv script - tags: [mpv-extend, mpv-subsync] - block: - - name: mpv | Clone autosubsync-mpv repository - git: - depth: 1 - repo: https://github.com/joaquintorres/autosubsync-mpv.git - dest: '{{ xdg_dir.config_home }}/mpv/scripts/autosubsync' - - - name: mpv | Copy autosubsync configuration - template: - src: mpv/autosubsync.j2 - dest: '{{ xdg_dir.config_home }}/mpv/script-opts/autosubsync.conf' - force: true - mode: '644' +# - name: mpv | Install and configure autosubsync-mpv script +# tags: [mpv-extend, mpv-subsync] +# block: +# - name: mpv | Clone autosubsync-mpv repository +# git: +# depth: 1 +# repo: https://github.com/joaquintorres/autosubsync-mpv.git +# dest: '{{ xdg_dir.config_home }}/mpv/scripts/autosubsync' +# +# - name: mpv | Copy autosubsync configuration +# template: +# src: mpv/autosubsync.j2 +# dest: '{{ xdg_dir.config_home }}/mpv/script-opts/autosubsync.conf' +# force: true +# mode: '644' - name: mpv | Install mpv-gif script get_url: diff --git a/roles/config/tasks/qutebrowser.yml b/roles/config/tasks/qutebrowser.yml deleted file mode 100644 index 20a8986..0000000 --- a/roles/config/tasks/qutebrowser.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: qutebrowser | Create config directory - file: - path: '{{ xdg_dir.config_home }}/qutebrowser' - state: directory - mode: '755' - -- name: qutebrowser | Copy themes - copy: - src: 'qutebrowser/{{ item }}' - dest: '{{ xdg_dir.config_home }}/qutebrowser/{{ item }}' - force: true - mode: '644' - loop: - - base16-nord.py - - base16-onedark.py - -- name: qutebrowser | Copy config - template: - src: qutebrowser/config.j2 - dest: '{{ xdg_dir.config_home }}/qutebrowser/config.py' - force: true - mode: '644' diff --git a/roles/config/tasks/tmux.yml b/roles/config/tasks/tmux.yml deleted file mode 100644 index 44f2681..0000000 --- a/roles/config/tasks/tmux.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: tmux | Create config directory - file: - path: '{{ xdg_dir.config_home }}/tmux' - state: directory - mode: '755' - -- name: tmux | Copy config - template: - src: tmux/tmux.j2 - dest: '{{ xdg_dir.config_home }}/tmux/tmux.conf' - force: true - mode: '644' - -- name: tmux | Install tpm - git: - depth: 1 - repo: https://github.com/tmux-plugins/tpm.git - dest: '{{ xdg_dir.config_home }}/tmux/plugins/tpm' diff --git a/roles/config/templates/alacritty/alacritty.j2 b/roles/config/templates/alacritty/alacritty.j2 index 96864c7..4d5cc17 100644 --- a/roles/config/templates/alacritty/alacritty.j2 +++ b/roles/config/templates/alacritty/alacritty.j2 @@ -1,296 +1,86 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator. -# https://github.com/alacritty/alacritty/raw/master/alacritty.yml +live_config_reload = false -env: - TERM: alacritty +[window] +padding = { x = 2, y = 2 } +decorations = "None" +opacity = {{ ui_opacity }} +# blur = true +decorations_theme_variant = "Dark" -window: - padding: - x: 2 - y: 2 +[scrolling] +history = 50000 +multiplier = 5 - dynamic_padding: false +[font] +size = {{ font_size }} - decorations: none +[font.normal] +family = "{{ term_font }}" +style = "Regular" - opacity: {{ ui_opacity }} +[font.bold] +family = "{{ term_font }}" +style = "Bold" - startup_mode: Windowed +[font.italic] +family = "{{ term_font }}" +style = "Italic" - title: Alacritty +[font.bold_italic] +family = "{{ term_font }}" +style = "Bold Italic" - dynamic_title: true +[colors.primary] +foreground = "{{ colors.foreground }}" +background = "{{ colors.background }}" - class: - instance: Alacritty - general: Alacritty +[colors.cursor] +text = "{{ colors.background }}" +cursor = "{{ colors.foreground }}" - decorations_theme_variant: Dark +[colors.vi_mode_cursor] +text = "{{ colors.background }}" +cursor = "{{ colors.foreground }}" -scrolling: - history: 50000 +[colors.search] +matches = { foreground = "{{ colors.background }}", background = "{{ colors.blue }}" } +focused_match = { foreground = "{{ colors.background }}", background = "{{ colors.yellow }}" } - multiplier: 5 +[colors.hints] +start = { foreground = "{{ colors.background }}", background = "{{ colors.green }}" } +end = { foreground = "{{ colors.green }}", background = "{{ colors.background }}" } -font: - normal: - family: {{ term_font }} - style: Regular +[colors.footer_bar] +foreground = "{{ colors.background }}" +background = "{{ colors.foreground }}" - bold: - family: {{ term_font }} - style: Bold +[colors.normal] +black = "{{ colors.color0 }}" +red = "{{ colors.color1 }}" +green = "{{ colors.color2 }}" +yellow = "{{ colors.color3 }}" +blue = "{{ colors.color4 }}" +magenta = "{{ colors.color5 }}" +cyan = "{{ colors.color6 }}" +white = "{{ colors.color7 }}" - italic: - family: {{ term_font }} - style: Italic +[colors.bright] +black = "{{ colors.color8 }}" +red = "{{ colors.color9 }}" +green = "{{ colors.color10 }}" +yellow = "{{ colors.color11 }}" +blue = "{{ colors.color12 }}" +magenta = "{{ colors.color13 }}" +cyan = "{{ colors.color14 }}" +white = "{{ colors.color15 }}" - bold_italic: - family: {{ term_font }} - style: Bold Italic +[bell] +animation = "EaseOutExpo" +color = "{{ colors.foreground }}" - size: {{ font_size }} +[cursor] +style = { shape = "Beam" } +vi_mode_style = { shape = "Block" } - offset: - x: 0 - y: 0 - - glyph_offset: - x: 0 - y: 0 - - builtin_box_drawing: true - -draw_bold_text_with_bright_colors: false - -colors: - primary: - background: '{{ colors.background }}' - foreground: '{{ colors.foreground }}' - - cursor: - text: '{{ colors.background }}' - cursor: '{{ colors.foreground }}' - - vi_mode_cursor: - text: '{{ colors.background }}' - cursor: '{{ colors.foreground }}' - - search: - matches: - foreground: '{{ colors.background }}' - background: '{{ colors.blue }}' - focused_match: - foreground: '{{ colors.background }}' - background: '{{ colors.yellow }}' - - footer_bar: - background: '{{ colors.foreground }}' - foreground: '{{ colors.background }}' - - # Keyboard regex hints - hints: - start: - foreground: '{{ colors.background }}' - background: '{{ colors.green }}' - - end: - foreground: '{{ colors.green }}' - background: '{{ colors.background }}' - - # By default, these will use the opposing primary color. - #line_indicator: - # foreground: None - # background: None - - selection: - text: CellBackground - background: CellForeground - - normal: - black: '{{ colors.color0 }}' - red: '{{ colors.color1 }}' - green: '{{ colors.color2 }}' - yellow: '{{ colors.color3 }}' - blue: '{{ colors.color4 }}' - magenta: '{{ colors.color5 }}' - cyan: '{{ colors.color6 }}' - white: '{{ colors.color7 }}' - - bright: - black: '{{ colors.color8 }}' - red: '{{ colors.color9 }}' - green: '{{ colors.color10 }}' - yellow: '{{ colors.color11 }}' - blue: '{{ colors.color12 }}' - magenta: '{{ colors.color13 }}' - cyan: '{{ colors.color14 }}' - white: '{{ colors.color15 }}' - - transparent_background_colors: false - -bell: - animation: EaseOutExpo - - duration: 0 - - color: '{{ colors.foreground }}' - - command: None - -selection: - semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" - - save_to_clipboard: false - -cursor: - style: - shape: Beam - - blinking: Off - - vi_mode_style: Block - - blink_interval: 750 - - blink_timeout: 5 - - unfocused_hollow: true - - thickness: 0.15 - -live_config_reload: false - -#shell: -# program: /bin/bash -# args: -# - --login - -working_directory: None - -ipc_socket: true - -mouse: - double_click: { threshold: 300 } - triple_click: { threshold: 300 } - - hide_when_typing: false - -hints: - alphabet: "jfkdls;ahgurieowpq" - - enabled: - - regex: "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\ - [^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+" - hyperlinks: true - command: /usr/bin/xdg-open - post_processing: true - mouse: - enabled: true - mods: None - binding: - key: U - mods: Control|Shift - -mouse_bindings: - - { mouse: Right, action: ExpandSelection } - - { mouse: Right, mods: Control, action: ExpandSelection } - - { mouse: Middle, mode: ~Vi, action: PasteSelection } - -key_bindings: - - { key: Paste, action: Paste } - - { key: Copy, action: Copy } - - { key: L, mods: Control, action: ClearLogNotice } - - { key: L, mods: Control, mode: ~Vi|~Search, chars: "\x0c" } - - { key: PageUp, mods: Shift, mode: ~Alt, action: ScrollPageUp, } - - { key: PageDown, mods: Shift, mode: ~Alt, action: ScrollPageDown } - - { key: Home, mods: Shift, mode: ~Alt, action: ScrollToTop, } - - { key: End, mods: Shift, mode: ~Alt, action: ScrollToBottom } - - # Vi Mode - - { key: Space, mods: Shift|Control, mode: ~Search, action: ToggleViMode } - - { key: Space, mods: Shift|Control, mode: Vi|~Search, action: ScrollToBottom } - - { key: Escape, mode: Vi|~Search, action: ClearSelection } - - { key: I, mode: Vi|~Search, action: ToggleViMode } - - { key: I, mode: Vi|~Search, action: ScrollToBottom } - - { key: C, mods: Control, mode: Vi|~Search, action: ToggleViMode } - - { key: Y, mods: Control, mode: Vi|~Search, action: ScrollLineUp } - - { key: E, mods: Control, mode: Vi|~Search, action: ScrollLineDown } - - { key: G, mode: Vi|~Search, action: ScrollToTop } - - { key: G, mods: Shift, mode: Vi|~Search, action: ScrollToBottom } - - { key: B, mods: Control, mode: Vi|~Search, action: ScrollPageUp } - - { key: F, mods: Control, mode: Vi|~Search, action: ScrollPageDown } - - { key: U, mods: Control, mode: Vi|~Search, action: ScrollHalfPageUp } - - { key: D, mods: Control, mode: Vi|~Search, action: ScrollHalfPageDown } - - { key: Y, mode: Vi|~Search, action: Copy } - - { key: Y, mode: Vi|~Search, action: ClearSelection } - - { key: Copy, mode: Vi|~Search, action: ClearSelection } - - { key: V, mode: Vi|~Search, action: ToggleNormalSelection } - - { key: V, mods: Shift, mode: Vi|~Search, action: ToggleLineSelection } - - { key: V, mods: Control, mode: Vi|~Search, action: ToggleBlockSelection } - - { key: V, mods: Alt, mode: Vi|~Search, action: ToggleSemanticSelection } - - { key: Return, mode: Vi|~Search, action: Open } - - { key: Z, mode: Vi|~Search, action: CenterAroundViCursor } - - { key: K, mode: Vi|~Search, action: Up } - - { key: J, mode: Vi|~Search, action: Down } - - { key: H, mode: Vi|~Search, action: Left } - - { key: L, mode: Vi|~Search, action: Right } - - { key: Up, mode: Vi|~Search, action: Up } - - { key: Down, mode: Vi|~Search, action: Down } - - { key: Left, mode: Vi|~Search, action: Left } - - { key: Right, mode: Vi|~Search, action: Right } - - { key: Key0, mode: Vi|~Search, action: First } - - { key: Key4, mods: Shift, mode: Vi|~Search, action: Last } - - { key: Key6, mods: Shift, mode: Vi|~Search, action: FirstOccupied } - - { key: H, mods: Shift, mode: Vi|~Search, action: High } - - { key: M, mods: Shift, mode: Vi|~Search, action: Middle } - - { key: L, mods: Shift, mode: Vi|~Search, action: Low } - - { key: B, mode: Vi|~Search, action: SemanticLeft } - - { key: W, mode: Vi|~Search, action: SemanticRight } - - { key: E, mode: Vi|~Search, action: SemanticRightEnd } - - { key: B, mods: Shift, mode: Vi|~Search, action: WordLeft } - - { key: W, mods: Shift, mode: Vi|~Search, action: WordRight } - - { key: E, mods: Shift, mode: Vi|~Search, action: WordRightEnd } - - { key: Key5, mods: Shift, mode: Vi|~Search, action: Bracket } - - { key: Slash, mode: Vi|~Search, action: SearchForward } - - { key: Slash, mods: Shift, mode: Vi|~Search, action: SearchBackward } - - { key: N, mode: Vi|~Search, action: SearchNext } - - { key: N, mods: Shift, mode: Vi|~Search, action: SearchPrevious } - - # Search Mode - - { key: Return, mode: Search|Vi, action: SearchConfirm } - - { key: Escape, mode: Search, action: SearchCancel } - - { key: C, mods: Control, mode: Search, action: SearchCancel } - - { key: U, mods: Control, mode: Search, action: SearchClear } - - { key: W, mods: Control, mode: Search, action: SearchDeleteWord } - - { key: P, mods: Control, mode: Search, action: SearchHistoryPrevious } - - { key: N, mods: Control, mode: Search, action: SearchHistoryNext } - - { key: Up, mode: Search, action: SearchHistoryPrevious } - - { key: Down, mode: Search, action: SearchHistoryNext } - - { key: Return, mode: Search|~Vi, action: SearchFocusNext } - - { key: Return, mods: Shift, mode: Search|~Vi, action: SearchFocusPrevious } - - # (Windows, Linux, and BSD only) - - { key: V, mods: Control|Shift, mode: ~Vi, action: Paste } - - { key: C, mods: Control|Shift, action: Copy } - - { key: F, mods: Control|Shift, mode: ~Search, action: SearchForward } - - { key: B, mods: Control|Shift, mode: ~Search, action: SearchBackward } - - { key: C, mods: Control|Shift, mode: Vi|~Search, action: ClearSelection } - - { key: Insert, mods: Shift, action: PasteSelection } - - { key: Key0, mods: Control, action: ResetFontSize } - - { key: Equals, mods: Control, action: IncreaseFontSize } - - { key: Plus, mods: Control, action: IncreaseFontSize } - - { key: NumpadAdd, mods: Control, action: IncreaseFontSize } - - { key: Minus, mods: Control, action: DecreaseFontSize } - - { key: NumpadSubtract, mods: Control, action: DecreaseFontSize } - -debug: - render_timer: false - - persistent_logging: false - - log_level: Warn - - print_events: false - - highlight_damage: false +[mouse] +hide_when_typing = true diff --git a/roles/config/templates/cava/config.j2 b/roles/config/templates/cava/config.j2 index 76080db..19a01b0 100644 --- a/roles/config/templates/cava/config.j2 +++ b/roles/config/templates/cava/config.j2 @@ -1,6 +1,3 @@ -## Configuration file for CAVA. Default values are commented out. Use either ';' or '#' for commenting. - - [general] # Accepts only non-negative values. @@ -14,15 +11,14 @@ # 200 means double height. Accepts only non-negative values. ; sensitivity = 100 -# The number of bars (0-200). 0 sets it to auto (fill up console). +# The number of bars (0-512). 0 sets it to auto (fill up console). # Bars' width and space between bars in number of characters. +# For SDL width and space between bars is in pixels, defaults are: ; bars = 0 ; bar_width = 2 ; bar_spacing = 1 - -# For SDL width and space between bars is in pixels, defaults are: -; bar_width = 20 -; bar_spacing = 5 +# bar_height is only used for output in "noritake" format +; bar_height = 32 # Lower and higher cutoff frequencies for lowest and highest bars @@ -40,55 +36,79 @@ [input] -# Audio capturing method. Possible methods are: 'pulse', 'alsa', 'fifo', 'sndio' or 'shmem' -# Defaults to 'pulse', 'alsa' or 'fifo', in that order, dependent on what support cava was built with. +# Audio capturing method. Possible methods are: 'fifo', 'portaudio', 'pipewire', 'alsa', 'pulse', 'sndio', 'oss' or 'shmem' +# Defaults to 'oss', 'sndio', 'pipewire', 'pulse', 'alsa', 'portaudio' or 'fifo', in that order, dependent on what support cava was built with. +# On Mac it defaults to 'portaudio' or 'fifo' +# On windows this is automatic and no input settings are needed. # # All input methods uses the same config variable 'source' # to define where it should get the audio. # -# For pulseaudio 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink +# For pulseaudio and pipewire 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink # (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them). # +# For pipewire 'source' will be the object name or object.serial of the device to capture from. +# Both input and output devices are supported. +# # For alsa 'source' will be the capture device. # For fifo 'source' will be the path to fifo-file. # For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address -; method = pulse -; source = auto +# +# For sndio 'source' will be a monitor sub-device, e.g. 'snd/0.monitor'. Default: 'default', in which case a device +# should be specified with the environment variable AUDIODEVICE, e.g. on the commandline: AUDIODEVICE=snd/0.monitor cava. +# +# For oss 'source' will be the path to a audio device, e.g. '/dev/dsp2'. Default: '/dev/dsp', i.e. the default audio device. +# README.md contains further information on how to setup CAVA for OSS on FreeBSD. +# +method = pipewire +source = auto -; method = alsa -; source = hw:Loopback,1 - -; method = fifo -; source = /tmp/mpd.fifo +# The sample rate and format can be configured for some input methods. Currently +# the following methods support such a configuration: 'fifo', 'pipewire' and 'oss'. +# Other methods ignore these settings. +# +# For 'oss' they are only preferred values, i.e. if the values are not supported +# by the chosen audio device, the device will use other supported values instead. +# Example: 48000 and 32, but the device only supports 44100 and 16, then it will +# use 44100 and 16. +# ; sample_rate = 44100 ; sample_bits = 16 -; method = shmem -; source = /squeezelite-AA:BB:CC:DD:EE:FF - -; method = portaudio -; source = auto - - [output] -# Output method. Can be 'ncurses', 'noncurses', 'raw' or 'sdl'. -# 'noncurses' uses a custom framebuffer technique and prints only changes -# from frame to frame in the terminal. 'ncurses' is default if supported. +# Output method. Can be 'ncurses', 'noncurses', 'raw', 'noritake', 'sdl' +# or 'sdl_glsl'. +# 'noncurses' (default) uses a buffer and cursor movements to only print +# changes from frame to frame in the terminal. Uses less resources and is less +# prone to tearing (vsync issues) than 'ncurses'. # # 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data # stream of the bar heights that can be used to send to other applications. # 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above. # +# 'noritake' outputs a bitmap in the format expected by a Noritake VFD display +# in graphic mode. It only support the 3000 series graphical VFDs for now. +# # 'sdl' uses the Simple DirectMedia Layer to render in a graphical context. -; method = ncurses +# 'sdl_glsl' uses SDL to create an OpenGL context. Write your own shaders or +# use one of the predefined ones. +; method = noncurses + +# Orientation of the visualization. Can be 'bottom', 'top', 'left' or 'right'. +# Default is 'bottom'. Other orientations are only supported on sdl and ncruses +# output. Note: many fonts have weird glyphs for 'top' and 'right' characters, +# which can make ncurses not look right. +; orientation = bottom # Visual channels. Can be 'stereo' or 'mono'. # 'stereo' mirrors both channels with low frequencies in center. # 'mono' outputs left to right lowest to highest frequencies. # 'mono_option' set mono to either take input from 'left', 'right' or 'average'. +# set 'reverse' to 1 to display frequencies the other way around. ; channels = stereo ; mono_option = average +; reverse = 0 # Raw output target. A fifo will be created if target does not exist. ; raw_target = /dev/stdout @@ -112,6 +132,28 @@ ; sdl_height = 500 ; sdl_x = -1 ; sdl_y= -1 +; sdl_full_screen = 0 + +# set label on bars on the x-axis. Can be 'frequency' or 'none'. Default: 'none' +# 'frequency' displays the lower cut off frequency of the bar above. +# Only supported on ncurses and noncurses output. +; xaxis = none + +# enable alacritty synchronized updates. 1 = on, 0 = off +# removes flickering in alacritty terminal emulator. +# defaults to off since the behaviour in other terminal emulators is unknown +; alacritty_sync = 0 + +# Shaders for sdl_glsl, located in $HOME/.config/cava/shaders +; vertex_shader = pass_through.vert +; fragment_shader = bar_spectrum.frag + +; for glsl output mode, keep rendering even if no audio +; continuous_rendering = 0 + +# disable console blank (screen saver) in tty +# (Not supported on FreeBSD) +; disable_blanking = 0 [color] diff --git a/roles/config/templates/fish/aliases.j2 b/roles/config/templates/fish/aliases.j2 index 4052618..bfbc46e 100644 --- a/roles/config/templates/fish/aliases.j2 +++ b/roles/config/templates/fish/aliases.j2 @@ -1,12 +1,10 @@ # DevOps life abbr ap ansible-playbook abbr ad ansible-doc -abbr av ansible-vault abbr h helm abbr k kubectl abbr kx kubectx abbr kn kubens -abbr t terraform abbr p pulumi # remap @@ -15,11 +13,6 @@ alias mv 'mv -vi' alias rm 'rm -vr' alias mkdir 'mkdir -vp' alias cargo 'cargo auditable' -{% if multiplexer == 'tmux' %} - -# true color in tmux pane -abbr tmux 'TERM=screen-256color command tmux' -{% endif %} # neovim abbr v nvim diff --git a/roles/config/templates/fish/env.j2 b/roles/config/templates/fish/env.j2 index 626e90d..a300289 100644 --- a/roles/config/templates/fish/env.j2 +++ b/roles/config/templates/fish/env.j2 @@ -66,6 +66,7 @@ set -gx LESSOPEN "|bat %s" set -gx LESSHISTFILE - set -gx PAGER less set -gx MANPAGER "less -R --use-color -Dd+b -Du+g -DS+kc" +# set -gx MANPAGER "nvim +Man!" # what fish uses to open fish_config settings set -gx BROWSER xdg-open diff --git a/roles/config/templates/fontconfig/fonts.j2 b/roles/config/templates/fontconfig/fonts.j2 index 40458d6..d465452 100644 --- a/roles/config/templates/fontconfig/fonts.j2 +++ b/roles/config/templates/fontconfig/fonts.j2 @@ -24,27 +24,21 @@ sans-serif {{ sans_font }} -{% for font in cjk_sans_font %} - {{ font }} -{% endfor %} + {{ cjk_sans_font }} serif {{ serif_font }} -{% for font in cjk_serif_font %} - {{ font }} -{% endfor %} + {{ cjk_serif_font }} monospace {{ monospace_font }} -{% for font in cjk_monospace_font %} - {{ font }} -{% endfor %} + {{ cjk_monospace_font }} @@ -58,9 +52,7 @@ Droid Sans Ubuntu Roboto -{% for font in cjk_sans_font %} - {{ font }} -{% endfor %} + {{ cjk_sans_font }} NotoSansCJK Source Han Sans JP IPAPGothic @@ -76,9 +68,7 @@ FreeSerif Droid Serif Roboto Slab -{% for font in cjk_serif_font %} - {{ font }} -{% endfor %} + {{ cjk_serif_font }} IPAPMincho @@ -92,9 +82,7 @@ Ubuntu Mono Droid Sans Mono Roboto Mono -{% for font in cjk_monospace_font %} - {{ font }} -{% endfor %} + {{ cjk_monospace_font }} IPAGothic diff --git a/roles/config/templates/foot/foot.j2 b/roles/config/templates/foot/foot.j2 index 19030ae..63224f3 100644 --- a/roles/config/templates/foot/foot.j2 +++ b/roles/config/templates/foot/foot.j2 @@ -1,10 +1,10 @@ # Configuration file for foot terminal # See foot.ini(5) -font={{ term_font }}:style=Regular:size={{ font_size }}, {{ cjk_term_font | product([':style=Regular:size=' ~ font_size]) | map('join') | join(', ') }} -font-bold={{ term_font }}:style=Bold:size={{ font_size }}, {{ cjk_term_font | product([':style=Bold:size=' ~ font_size]) | map('join') | join(', ') }} -font-italic={{ term_font }}:style=Italic:size={{ font_size }}, {{ cjk_term_font | product([':style=Italic:size=' ~ font_size]) | map('join') | join(', ') }} -font-bold-italic={{ term_font }}:style=Bold Italic:size={{ font_size }}, {{ cjk_term_font | product([':style=Bold Italic:size=' ~ font_size]) | map('join') | join(', ') }} +font={{ term_font }}:style=Regular:size={{ font_size }}, {{ cjk_term_font }}:style=Regular:size={{ font_size }} +font-bold={{ term_font }}:style=Bold:size={{ font_size }}, {{ cjk_term_font }}:style=Bold:size={{ font_size }} +font-italic={{ term_font }}:style=Italic:size={{ font_size }}, {{ cjk_term_font }}:style=Italic:size={{ font_size }} +font-bold-italic={{ term_font }}:style=Bold Italic:size={{ font_size }}, {{ cjk_term_font }}:style=Bold Italic:size={{ font_size }} underline-offset=2px diff --git a/roles/config/templates/qutebrowser/config.j2 b/roles/config/templates/qutebrowser/config.j2 deleted file mode 100644 index e197354..0000000 --- a/roles/config/templates/qutebrowser/config.j2 +++ /dev/null @@ -1,209 +0,0 @@ -# Don't load settings configured in autoconfig.yml -config.load_autoconfig(False) -config.source('base16-{{ theme }}.py') - -# Settings ───────────────────────────────────────────────────────────── -# Darkmode -# c.colors.webpage.darkmode.enabled = True -c.colors.webpage.preferred_color_scheme = 'dark' - -# Confirm on quit -c.confirm_quit = ['downloads', 'multiple-tabs'] - -# Default encoding to use for websites -c.content.default_encoding = 'utf-8' - -# No autoplay -c.content.autoplay = False - -# Block canvas reading -c.content.canvas_reading = False - -# Cookies -c.content.cookies.accept = 'no-3rdparty' -# c.content.cookies.store = False - -# Screen sharing -c.content.desktop_capture = False - -# Caching dns -c.content.dns_prefetch = False - -# Geo location requests -c.content.geolocation = False - -# Headers -c.content.headers.accept_language = 'en-US,en;q=0.5' -c.content.headers.custom = {"accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8"} -c.content.headers.do_not_track = True -c.content.headers.referer = 'same-domain' - -# From current TorBrowser -c.content.headers.user_agent = '{{ user_agent }}' - -# Additional adblocking -c.content.blocking.enabled = True -c.content.blocking.method = 'adblock' -c.content.blocking.adblock.lists = ["https://easylist.to/easylist/easylist.txt", - "https://easylist.to/easylist/easyprivacy.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/annoyances.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt", - "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt", - "https://www.fanboy.co.nz/fanboy-problematic-sites.txt", - "https://www.fanboy.co.nz/enhancedstats.txt", - "https://www.fanboy.co.nz/fanboy-antifacebook.txt", - "https://www.fanboy.co.nz/fanboy-antifonts.txt", - "https://secure.fanboy.co.nz/fanboy-annoyance.txt", - "https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_2_English/filter.txt", - "https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_3_Spyware/filter.txt", - "https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_4_Social/filter.txt", - "https://raw.githubusercontent.com/AdguardTeam/FiltersRegistry/master/filters/filter_14_Annoyances/filter.txt", - "https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/AnnoyancesFilter/sections/antiadblock.txt"] - -# Hyperlink auditing -c.content.hyperlink_auditing = False - -# JavaScript -c.content.javascript.alert = True -c.content.javascript.can_access_clipboard = False -c.content.javascript.can_close_tabs = False -c.content.javascript.can_open_tabs_automatically = False -c.content.javascript.enabled = False - -# No recording -c.content.media.audio_capture = False -c.content.media.audio_video_capture = False -c.content.media.video_capture = False - -# Mouse lock -c.content.mouse_lock = False - -# No notification -c.content.notifications.enabled = False - -# No request for persistent storage -c.content.persistent_storage = False - -# Reduce animation -c.content.prefers_reduced_motion = True - -# Incognito -c.content.private_browsing = True - -# Don't allow to register protocol handlers -c.content.register_protocol_handler = False - -# SSL -c.content.tls.certificate_errors = 'ask-block-thirdparty' - -# Disable WebGL -c.content.webgl = False - -# WebRTC -c.content.webrtc_ip_handling_policy = 'disable-non-proxied-udp' - -# XSS auditing -c.content.xss_auditing = False - -# Use pdfjs to view PDF files in the browser -c.content.pdfjs = False - -# Download location -c.downloads.location.directory = '$HOME/Downloads' -c.downloads.location.remember = False - -# The default editor is gvim -c.editor.command = ['{{ terminal_emulators[0] }}', '-e', 'nvim', '{file}', '-c', 'normal {line}G{column0}l'] -c.editor.encoding = 'utf-8' -c.editor.remove_file = True - -# The default files/folder picker is ranger -c.fileselect.handler = 'external' -c.fileselect.folder.command = ['{{ terminal_emulators[0] }}', '-e', 'vifm', '--choose-dir', '{}'] -c.fileselect.single_file.command = \ - c.fileselect.multiple_files.command = \ - ['{{ terminal_emulators[0] }}', '-e', 'vifm', '--choose-files', '{}'] - -# Fonts -c.fonts.completion.category = '{{ font_size }}pt {{ monospace_font }}' -c.fonts.completion.entry = '{{ font_size }}pt {{ monospace_font }}' -c.fonts.contextmenu = '{{ font_size }}pt {{ monospace_font }}' -c.fonts.default_family = ['{{ sans_font }}', 'Noto Sans'] -c.fonts.default_size = '{{ font_size }}pt' -c.fonts.prompts = 'default_size sans-serif' -c.fonts.statusbar = '{{ font_size }}pt {{ monospace_font }}' -c.fonts.tabs.selected = 'bold {{ font_size }}pt {{ monospace_font }}' -c.fonts.tabs.unselected = 'italic {{ font_size }}pt {{ monospace_font }}' - -# Hints -c.hints.uppercase = True - -# Scroll bar -c.scrolling.bar = 'overlay' - -# Tabs -c.tabs.last_close = 'default-page' -c.tabs.new_position.related = 'next' -c.tabs.new_position.stacking = True -c.tabs.new_position.unrelated = 'prev' -c.tabs.show = 'multiple' -c.tabs.title.alignment = 'center' -c.tabs.title.format = '{audio}{index}: {current_title} [{scroll_pos}]' - -# urls -c.url.start_pages = 'qute://help' -c.url.default_page = 'qute://help' -c.url.open_base_url = True -c.url.searchengines = {'DEFAULT': 'https://search.disroot.org/?category_general=on&q={}', - '!ddg': 'https://www.duckduckgo.com/?q={}', - '!searx1': 'https://searx.be/?category_general=on&q={}', - '!sp': 'https://startpage.com/do/search?query={}', - '!qwant': 'https://www.qwant.com/?q={}', - '!so': 'http://stackoverflow.com/search?q={}', - '!github': 'https://github.com/search?utf8=\u2713&q={}', - '!gitlab': 'https://gitlab.com/explore?utf8=\u2713&sort=latest_activity_desc&name={}', - '!mdn': 'https://developer.mozilla.org/en-US/search?q={}', - '!devhints': 'https://devhints.io/{}', - '!gentoo': 'https://wiki.gentoo.org/index.php?title=Special%3ASearch&profile=default&fulltext=Search&search={}', - '!arch': 'https://wiki.archlinux.org/index.php?search={}', - '!wiki': 'https://en.wikipedia.org/wiki/{}', - '!osm': 'https://www.openstreetmap.org/search?query={}', - '!gi': 'https://www.google.com/search?tbm=isch&q={}', - '!urban': 'https://www.urbandictionary.com/define.php?term={}', - '!thesaurus': 'https://www.thesaurus.com/browse/{}', - '!vocab': 'https://www.vocabulary.com/dictionary/{}', - '!twitter': 'https://twitter.com/search?q={}', - '!yt': 'https://www.youtube.com/results?search_query={}', - '!odysee': 'https://odysee.com/$/search?q={}', - '!archive': 'https://archive.org/search.php?query={}', - '!alto': 'https://alternativeto.net/browse/search?q={}'} - -# Searching inside web pages -c.search.ignore_case = 'smart' -c.search.incremental = True -c.search.wrap = True -c.search.wrap_messages = True - -# Chromium related settings -c.qt.chromium.sandboxing = 'enable-all' -c.qt.chromium.process_model = 'process-per-site-instance' - -# How to open links from external programs -c.new_instance_open_target_window = 'last-opened' -c.new_instance_open_target = 'tab' - -# Prompt -c.prompt.filebrowser = True -c.prompt.radius = 4 - -# Spellchecking -c.spellcheck.languages = ['en-US', 'vi-VN', 'ru-RU'] - -# Bindings ───────────────────────────────────────────────────────────── -config.bind(',m', 'hint links spawn mpv {hint-url}') -config.bind(',y', 'hint links spawn {{ terminal_emulators[0] }} -e yt-dlp {hint-url}') -config.bind(',t', 'config-cycle tabs.show multiple never') -config.bind(',s', 'config-cycle statusbar.show always never') diff --git a/roles/config/templates/tmux/tmux.j2 b/roles/config/templates/tmux/tmux.j2 deleted file mode 100644 index 8a3171d..0000000 --- a/roles/config/templates/tmux/tmux.j2 +++ /dev/null @@ -1,51 +0,0 @@ -# delay between prefix and command -set -s escape-time 0 - -# start with 1 instead of 0 -set -g base-index 1 -set -g pane-base-index 1 - -# increase scrollback buffer size -set -g history-limit 50000 - -# tmux messages are displayed for 4 seconds -set -g display-time 4000 - -# refresh 'status-left' and 'status-right' more often -set -g status-interval 5 - -# upgrade $TERM for 24-bit colors -set -g default-terminal "screen-256color" -set-option -ga terminal-overrides ",screen-256color:Tc" - -# no vim keys -_- -set -g status-keys emacs - -# focus events enabled for terminals that support them -set -g focus-events on - -# enable mouse -set -g mouse on - -# super useful when using "grouped sessions" and multi-monitor setup -setw -g aggressive-resize on - -# Plugins ───────────────────────────────────────────────────────────── -# Custom plugins' settings -set -g @prefix_highlight_show_copy_mode 'on' -set -g @prefix_highlight_show_sync_mode 'on' -set -g @prefix_highlight_prefix_prompt 'Wait' -set -g @prefix_highlight_copy_prompt 'Copy' -set -g @prefix_highlight_sync_prompt 'Sync' -set -g @tmux_nordone_theme '{{ theme }}' - -# Load plugins -set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'https://git.disroot.org/FollieHiyuki/tmux-nordone' -set -g @plugin 'tmux-plugins/tmux-prefix-highlight' -set -g @plugin 'tmux-plugins/tmux-pain-control' -set -g @plugin 'tmux-plugins/tmux-copycat' -set -g @plugin 'tmux-plugins/tmux-yank' -set -g @plugin 'sainnhe/tmux-fzf' - -run '{{ xdg_dir.config_home }}/tmux/plugins/tpm/tpm' diff --git a/roles/config/templates/waybar/style_sway.j2 b/roles/config/templates/waybar/style_sway.j2 index b6dbe9b..598c5e2 100644 --- a/roles/config/templates/waybar/style_sway.j2 +++ b/roles/config/templates/waybar/style_sway.j2 @@ -63,7 +63,7 @@ #waybar { background: @background; color: @light; - font-family: {{ term_font }}, {{ cjk_monospace_font | join(', ') }}; + font-family: {{ term_font }}, {{ cjk_monospace_font }}; font-size: {{ font_size }}pt; font-weight: bold; } diff --git a/roles/containers/defaults/main.yml b/roles/containers/defaults/main.yml index fbccc58..d0782c8 100644 --- a/roles/containers/defaults/main.yml +++ b/roles/containers/defaults/main.yml @@ -2,3 +2,4 @@ ltex_ls_version: 16.0.0 marksman_version: 2023-10-30 translate_shell_version: 0.9.7.1 +kcli_version: '24.01' diff --git a/roles/containers/tasks/apptainer.jsonnet b/roles/containers/tasks/apptainer.jsonnet index 59190d9..c349de7 100644 --- a/roles/containers/tasks/apptainer.jsonnet +++ b/roles/containers/tasks/apptainer.jsonnet @@ -71,7 +71,7 @@ local docker_images = image: 'docker.io/asciidoctor/docker-asciidoctor', tag: '1.58.0', - // Other asciidoctor-* executables (extentions) will be symlinked into this one + // Other asciidoctor-* executables (extensions) will be symlinked into this one command: '"$(basename "$0")"', }, { diff --git a/roles/containers/tasks/podman.jsonnet b/roles/containers/tasks/podman.jsonnet index a3b3a93..05c8478 100644 --- a/roles/containers/tasks/podman.jsonnet +++ b/roles/containers/tasks/podman.jsonnet @@ -60,7 +60,7 @@ local special_containers = [ { local name = 'vagrant', - name: 'podman | Create ' + name + 'shim', + name: 'podman | Create ' + name + ' shim', tags: name, vars: { vagrant_image_repository: 'docker.io/vagrantlibvirt/vagrant-libvirt', @@ -78,6 +78,30 @@ local special_containers = [ copy_script(name), ], }, + { + local name = 'kcli', + + name: 'podman | Install ' + name + ' scripts', + tags: name, + block: [ + { + name: 'podman | Create ' + name + ' shim', + template: { + src: name + '.j2', + dest: '{{ xdg_dir.bin_home }}/' + name, + mode: '755', + }, + }, + { + name: 'podman | Symlink kweb script to ' + name, + file: { + src: './' + name, + dest: '{{ xdg_dir.bin_home }}/kweb', + state: 'link', + }, + }, + ], + }, ]; // Images to be built in a uniform way diff --git a/roles/containers/tasks/podman.yml b/roles/containers/tasks/podman.yml index aa7ce51..ffd3195 100644 --- a/roles/containers/tasks/podman.yml +++ b/roles/containers/tasks/podman.yml @@ -80,8 +80,21 @@ dest: '{{ xdg_dir.bin_home }}/vagrant' mode: "755" src: vagrant.j2 - name: podman | Create vagrantshim + name: podman | Create vagrant shim tags: vagrant vars: vagrant_image_repository: docker.io/vagrantlibvirt/vagrant-libvirt vagrant_image_tag: latest-slim +- block: + - name: podman | Create kcli shim + template: + dest: '{{ xdg_dir.bin_home }}/kcli' + mode: "755" + src: kcli.j2 + - file: + dest: '{{ xdg_dir.bin_home }}/kweb' + src: ./kcli + state: link + name: podman | Symlink kweb script to kcli + name: podman | Install kcli scripts + tags: kcli diff --git a/roles/containers/templates/kcli.j2 b/roles/containers/templates/kcli.j2 new file mode 100644 index 0000000..0d73d64 --- /dev/null +++ b/roles/containers/templates/kcli.j2 @@ -0,0 +1,15 @@ +#!/bin/sh + +# Ref: https://kcli.readthedocs.io/en/latest/#container-install-method +exec podman run \ + --rm -it \ + --entrypoint="" \ + -p 9000:9000 \ + -v "$HOME"/.kcli:/root/.kcli \ + -v "$HOME"/.ssh:/root/.ssh:ro \ + -v "$HOME"/.kube:/root/.kube:ro \ + -v /var/lib/libvirt/images:/var/lib/libvirt/images \ + -v /var/run/libvirt:/var/run/libvirt \ + -v "$PWD":/workdir \ + quay.io/karmab/kcli:{{ kcli_version }} \ + /usr/local/bin/"$(basename "$0")" "$@" diff --git a/roles/packages/tasks/go-packages.jsonnet b/roles/packages/tasks/go-packages.jsonnet index 4c53c55..5d41076 100644 --- a/roles/packages/tasks/go-packages.jsonnet +++ b/roles/packages/tasks/go-packages.jsonnet @@ -20,10 +20,6 @@ local packages = { name: 'gofumpt', url: 'mvdan.cc/gofumpt' }, { name: 'gomodifytags', url: 'github.com/fatih/gomodifytags' }, { name: 'goimports', url: 'golang.org/x/tools/cmd/goimports' }, - { name: 'cueimports', url: 'github.com/asdine/cueimports/cmd/cueimports' }, - { name: 'protolint', url: 'github.com/yoheimuta/protolint/cmd/protolint' }, - { name: 'protoc-gen-lint', url: 'github.com/ckaznocha/protoc-gen-lint' }, // this is a protoc plugin, so requires protoc installed - { name: 'editorconfig-checker', url: 'github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker' }, { name: 'dockle', url: 'github.com/goodwithtech/dockle/cmd/dockle' }, { name: 'yamlfmt', url: 'github.com/google/yamlfmt/cmd/yamlfmt' }, ] @@ -75,6 +71,8 @@ local packages = { name: 'konstraint', url: 'github.com/plexsystems/konstraint' }, { name: 'diffoci', url: 'github.com/reproducible-containers/diffoci/cmd/diffoci' }, { name: 'buildkit-nix', url: 'github.com/reproducible-containers/buildkit-nix/cmd/buildkit-nix' }, + { name: 'regal', url: 'github.com/styrainc/regal' }, + { name: 'go-licenses', url: 'github.com/google/go-licenses' }, // Nifty Pulumi stuff { name: 'crd2pulumi', url: 'github.com/pulumi/crd2pulumi', tags: ['pulumi-addons'] }, @@ -84,7 +82,7 @@ local packages = { name: 'pulumictl', url: 'github.com/pulumi/pulumictl/cmd/pulumictl', tags: ['pulumi-addons'] }, { name: 'pulumi-trace-tool', url: 'github.com/pulumi/pulumi-trace-tool', tags: ['pulumi-addons'] }, - // TODO: make an Alpine package when stablized and less feature locked down + // TODO: make an Alpine package when stabilized and less feature locked down // (e.g. can customize themes, fonts, ...) { name: 'd2', url: 'oss.terrastruct.com/d2' }, diff --git a/roles/packages/tasks/go-packages.yml b/roles/packages/tasks/go-packages.yml index ad2c748..764635f 100644 --- a/roles/packages/tasks/go-packages.yml +++ b/roles/packages/tasks/go-packages.yml @@ -72,34 +72,6 @@ tags: - goimports - linters -- command: - cmd: /usr/bin/go install -ldflags "-s -w" github.com/asdine/cueimports/cmd/cueimports@latest - removes: /usr/bin/go - name: packages | Install cueimports - tags: - - cueimports - - linters -- command: - cmd: /usr/bin/go install -ldflags "-s -w" github.com/yoheimuta/protolint/cmd/protolint@latest - removes: /usr/bin/go - name: packages | Install protolint - tags: - - protolint - - linters -- command: - cmd: /usr/bin/go install -ldflags "-s -w" github.com/ckaznocha/protoc-gen-lint@latest - removes: /usr/bin/go - name: packages | Install protoc-gen-lint - tags: - - protoc-gen-lint - - linters -- command: - cmd: /usr/bin/go install -ldflags "-s -w" github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@latest - removes: /usr/bin/go - name: packages | Install editorconfig-checker - tags: - - editorconfig-checker - - linters - command: cmd: /usr/bin/go install -ldflags "-s -w" github.com/goodwithtech/dockle/cmd/dockle@latest removes: /usr/bin/go @@ -351,6 +323,16 @@ removes: /usr/bin/go name: packages | Install buildkit-nix tags: buildkit-nix +- command: + cmd: /usr/bin/go install -ldflags "-s -w" github.com/styrainc/regal@latest + removes: /usr/bin/go + name: packages | Install regal + tags: regal +- command: + cmd: /usr/bin/go install -ldflags "-s -w" github.com/google/go-licenses@latest + removes: /usr/bin/go + name: packages | Install go-licenses + tags: go-licenses - command: cmd: /usr/bin/go install -ldflags "-s -w" github.com/pulumi/crd2pulumi@latest removes: /usr/bin/go diff --git a/roles/theme/defaults/main.yml b/roles/theme/defaults/main.yml index 8d8bfb4..f8fabcc 100644 --- a/roles/theme/defaults/main.yml +++ b/roles/theme/defaults/main.yml @@ -4,7 +4,7 @@ wallpaper_dir: '{{ ansible_user_dir }}/Pictures/Wallpapers' # Fonts that are not covered by system packages font_versions: iosevka: 28.0.3 - sarasa-gothic: 1.0.2 + sarasa-gothic: 1.0.3 kvantum_themes: - name: Nordic