diff --git a/hosts/apeturescience/skel/alacritty/alacritty.toml b/hosts/apeturescience/skel/alacritty/alacritty.toml index 20f8bfb..7ff63e0 100644 --- a/hosts/apeturescience/skel/alacritty/alacritty.toml +++ b/hosts/apeturescience/skel/alacritty/alacritty.toml @@ -58,4 +58,4 @@ color = "0x908caa" [[colors.indexed_colors]] index = 21 -color = "0xe0def4" \ No newline at end of file +color = "0xe0def4" diff --git a/hosts/apeturescience/skel/qutebrowser/colours/__init__.py b/hosts/apeturescience/skel/qutebrowser/colours/__init__.py index e69de29..309621c 100644 --- a/hosts/apeturescience/skel/qutebrowser/colours/__init__.py +++ b/hosts/apeturescience/skel/qutebrowser/colours/__init__.py @@ -0,0 +1 @@ +"""Ignore me.""" diff --git a/hosts/apeturescience/skel/qutebrowser/colours/darkmode.py b/hosts/apeturescience/skel/qutebrowser/colours/darkmode.py index 7a1681e..1456abc 100644 --- a/hosts/apeturescience/skel/qutebrowser/colours/darkmode.py +++ b/hosts/apeturescience/skel/qutebrowser/colours/darkmode.py @@ -1,3 +1,9 @@ -def darkmode_on(config, pages): - for p in pages: - config.set("colors.webpage.darkmode.enabled", True, p) +# ruff: noqa: ANN001, FBT003 + +"""Functions to facilitate dark mode configuration.""" + + +def darkmode_on(config, pages: list[str]) -> None: + """Enable dark mode on every page in `pages` using `config`.""" + for page in pages: + config.set("colors.webpage.darkmode.enabled", True, page) diff --git a/hosts/apeturescience/skel/qutebrowser/colours/themes.py b/hosts/apeturescience/skel/qutebrowser/colours/themes.py index 072f496..afda1a8 100644 --- a/hosts/apeturescience/skel/qutebrowser/colours/themes.py +++ b/hosts/apeturescience/skel/qutebrowser/colours/themes.py @@ -1,25 +1,29 @@ -class Palettes: - rose_pine = { - "base00": "#191724", - "base01": "#1f1d2e", - "base02": "#26233a", - "base03": "#6e6a86", - "base04": "#908caa", - "base05": "#e0def4", - "base06": "#e0def4", - "base07": "#524f67", - "base08": "#eb6f92", - "base09": "#f6c177", - "base0A": "#ebbcba", - "base0B": "#31748f", - "base0C": "#9ccfd8", - "base0D": "#c4a7e7", - "base0E": "#f6c177", - "base0F": "#524f67", - } +# ruff: noqa: PLR0915 + +"""Theming utilities (useful with base16).""" + +ROSE_PINE: dict[str, str] = { + "base00": "#191724", + "base01": "#1f1d2e", + "base02": "#26233a", + "base03": "#6e6a86", + "base04": "#908caa", + "base05": "#e0def4", + "base06": "#e0def4", + "base07": "#524f67", + "base08": "#eb6f92", + "base09": "#f6c177", + "base0A": "#ebbcba", + "base0B": "#31748f", + "base0C": "#9ccfd8", + "base0D": "#c4a7e7", + "base0E": "#f6c177", + "base0F": "#524f67", +} -def load_colours(c, palette): +def load_colours(c, palette: dict[str, str]) -> None: + """Load colours from `palette` (must be base16) into `c`.""" c.colors.completion.fg = palette["base05"] c.colors.completion.odd.bg = palette["base01"] c.colors.completion.even.bg = palette["base00"] diff --git a/hosts/apeturescience/skel/qutebrowser/config.py b/hosts/apeturescience/skel/qutebrowser/config.py index 3809c80..73c6ed3 100644 --- a/hosts/apeturescience/skel/qutebrowser/config.py +++ b/hosts/apeturescience/skel/qutebrowser/config.py @@ -1,13 +1,17 @@ -from colours.themes import load_colours, Palettes +# ruff: noqa: INP001 + +"""The configuration module. Used to configure qutebrowser.""" + from colours.darkmode import darkmode_on +from colours.themes import ROSE_PINE, load_colours -def main(): +def main() -> None: + """Pretend this is a docstring.""" # leave this alone! - config.load_autoconfig() # rose-pine - load_colours(c, Palettes.rose_pine) + load_colours(c, ROSE_PINE) darkmode_on(config, ["about:blank"]) diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/__init__.py b/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/__init__.py index e69de29..309621c 100644 --- a/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/__init__.py +++ b/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/__init__.py @@ -0,0 +1 @@ +"""Ignore me.""" diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/darkmode.py b/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/darkmode.py index 7a1681e..1456abc 100644 --- a/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/darkmode.py +++ b/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/darkmode.py @@ -1,3 +1,9 @@ -def darkmode_on(config, pages): - for p in pages: - config.set("colors.webpage.darkmode.enabled", True, p) +# ruff: noqa: ANN001, FBT003 + +"""Functions to facilitate dark mode configuration.""" + + +def darkmode_on(config, pages: list[str]) -> None: + """Enable dark mode on every page in `pages` using `config`.""" + for page in pages: + config.set("colors.webpage.darkmode.enabled", True, page) diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/themes.py b/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/themes.py index 072f496..afda1a8 100644 --- a/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/themes.py +++ b/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/themes.py @@ -1,25 +1,29 @@ -class Palettes: - rose_pine = { - "base00": "#191724", - "base01": "#1f1d2e", - "base02": "#26233a", - "base03": "#6e6a86", - "base04": "#908caa", - "base05": "#e0def4", - "base06": "#e0def4", - "base07": "#524f67", - "base08": "#eb6f92", - "base09": "#f6c177", - "base0A": "#ebbcba", - "base0B": "#31748f", - "base0C": "#9ccfd8", - "base0D": "#c4a7e7", - "base0E": "#f6c177", - "base0F": "#524f67", - } +# ruff: noqa: PLR0915 + +"""Theming utilities (useful with base16).""" + +ROSE_PINE: dict[str, str] = { + "base00": "#191724", + "base01": "#1f1d2e", + "base02": "#26233a", + "base03": "#6e6a86", + "base04": "#908caa", + "base05": "#e0def4", + "base06": "#e0def4", + "base07": "#524f67", + "base08": "#eb6f92", + "base09": "#f6c177", + "base0A": "#ebbcba", + "base0B": "#31748f", + "base0C": "#9ccfd8", + "base0D": "#c4a7e7", + "base0E": "#f6c177", + "base0F": "#524f67", +} -def load_colours(c, palette): +def load_colours(c, palette: dict[str, str]) -> None: + """Load colours from `palette` (must be base16) into `c`.""" c.colors.completion.fg = palette["base05"] c.colors.completion.odd.bg = palette["base01"] c.colors.completion.even.bg = palette["base00"] diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py b/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py index 9cbf91b..12883c6 100644 --- a/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py +++ b/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py @@ -1,13 +1,18 @@ -from colours.themes import load_colours, Palettes +# ruff: noqa: INP001 + +"""The configuration module. Used to configure qutebrowser.""" + from colours.darkmode import darkmode_on +from colours.themes import ROSE_PINE, load_colours -def main(): +def main() -> None: + """Pretend this is a docstring.""" # leave this alone! config.load_autoconfig() # rose-pine - load_colours(c, Palettes.rose_pine) + load_colours(c, ROSE_PINE) darkmode_on(config, ["about:blank"]) @@ -25,7 +30,7 @@ def main(): c.tabs.indicator.width = 0 c.tabs.title.format = "{audio}{relative_index} | {current_title}" - c.fonts.default_size = "12pt" + c.fonts.default_size = "9pt" c.fonts.default_family = "sans-serif" c.url.start_pages = "about:blank" diff --git a/ruff.toml b/ruff.toml index c4035e4..1d14f17 100644 --- a/ruff.toml +++ b/ruff.toml @@ -1,2 +1,3 @@ [lint] -ignore = [ "F821" ] +select = ["ALL"] +ignore = ["F821", "ANN001"] diff --git a/shells/default.nix b/shells/default.nix index d7d65ee..f6c15d3 100644 --- a/shells/default.nix +++ b/shells/default.nix @@ -14,11 +14,16 @@ pre-commit = { check.enable = true; settings.hooks = { - nixfmt-rfc-style = { - enable = true; - }; + nixfmt-rfc-style.enable = true; nil.enable = true; - shellcheck.enable = true; + statix = { + enable = true; + args = [ "fix" ]; + }; + deadnix = { + enable = true; + args = [ "-e" ]; + }; prettier = { enable = true; excludes = [ "flake.lock" ]; @@ -26,14 +31,8 @@ ruff.enable = true; ruff-format.enable = true; shfmt.enable = true; - deadnix = { - enable = true; - args = [ "-e" ]; - }; - statix = { - enable = true; - args = [ "fix" ]; - }; + shellcheck.enable = true; + taplo.enable = true; }; }; diff --git a/statix.toml b/statix.toml index 842f407..fbe25a9 100644 --- a/statix.toml +++ b/statix.toml @@ -1,4 +1,3 @@ disabled = [] nix_version = '2.4' ignore = ['.direnv'] -