diff --git a/flake.lock b/flake.lock index c4dc02b..3c04faf 100644 --- a/flake.lock +++ b/flake.lock @@ -24,9 +24,7 @@ }, "disko": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": ["nixpkgs"] }, "locked": { "lastModified": 1733168902, @@ -44,10 +42,7 @@ }, "emacs": { "inputs": { - "nixpkgs": [ - "pankomacs", - "nixpkgs" - ], + "nixpkgs": ["pankomacs", "nixpkgs"], "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -82,9 +77,7 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "nixpkgs" - ] + "nixpkgs-lib": ["nixpkgs"] }, "locked": { "lastModified": 1733312601, @@ -154,9 +147,7 @@ "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": ["nixpkgs"], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -175,10 +166,7 @@ }, "gitignore": { "inputs": { - "nixpkgs": [ - "git-hooks-nix", - "nixpkgs" - ] + "nixpkgs": ["git-hooks-nix", "nixpkgs"] }, "locked": { "lastModified": 1709087332, @@ -196,10 +184,7 @@ }, "home-manager": { "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] + "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { "lastModified": 1733484277, @@ -218,10 +203,7 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] + "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { "lastModified": 1733491721, @@ -254,12 +236,7 @@ }, "naersk": { "inputs": { - "nixpkgs": [ - "painless-neovim", - "nvf", - "rnix-lsp", - "nixpkgs" - ] + "nixpkgs": ["painless-neovim", "nvf", "rnix-lsp", "nixpkgs"] }, "locked": { "lastModified": 1655042882, @@ -277,16 +254,8 @@ }, "nil": { "inputs": { - "flake-utils": [ - "painless-neovim", - "nvf", - "flake-utils" - ], - "nixpkgs": [ - "painless-neovim", - "nvf", - "nixpkgs" - ], + "flake-utils": ["painless-neovim", "nvf", "flake-utils"], + "nixpkgs": ["painless-neovim", "nvf", "nixpkgs"], "rust-overlay": "rust-overlay" }, "locked": { @@ -305,11 +274,7 @@ }, "nix-github-actions": { "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] + "nixpkgs": ["chaotic", "jovian", "nixpkgs"] }, "locked": { "lastModified": 1729697500, @@ -593,9 +558,7 @@ }, "painless-neovim": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": ["nixpkgs"], "nvf": "nvf" }, "locked": { @@ -616,9 +579,7 @@ "pankomacs": { "inputs": { "emacs": "emacs", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": ["nixpkgs"], "parts": "parts" }, "locked": { @@ -638,10 +599,7 @@ }, "parts": { "inputs": { - "nixpkgs-lib": [ - "pankomacs", - "nixpkgs" - ] + "nixpkgs-lib": ["pankomacs", "nixpkgs"] }, "locked": { "lastModified": 1730504689, @@ -2550,12 +2508,7 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": [ - "painless-neovim", - "nvf", - "nil", - "nixpkgs" - ] + "nixpkgs": ["painless-neovim", "nvf", "nil", "nixpkgs"] }, "locked": { "lastModified": 1726453838, @@ -2633,9 +2586,7 @@ }, "wallpkgs": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": ["nixpkgs"], "systems": "systems_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 2ad3a5c..9270acc 100644 --- a/flake.nix +++ b/flake.nix @@ -83,6 +83,12 @@ check.enable = true; settings.hooks = { alejandra.enable = true; + nil.enable = true; + shellcheck.enable = true; + prettier.enable = true; + ruff.enable = true; + ruff-format.enable = true; + shfmt.enable = true; deadnix = { enable = true; args = ["-e"]; @@ -91,7 +97,6 @@ enable = true; args = ["fix"]; }; - nil.enable = true; }; }; devShells.default = config.pre-commit.devShell; diff --git a/hosts/python/configs/qutebrowser/config.py b/hosts/python/configs/qutebrowser/config.py index 4ff86c4..42eecaa 100644 --- a/hosts/python/configs/qutebrowser/config.py +++ b/hosts/python/configs/qutebrowser/config.py @@ -1,4 +1,4 @@ config.load_autoconfig() -config.set('colors.webpage.preferred_color_scheme', 'dark') -config.source('gruvbox.py') +config.set("colors.webpage.preferred_color_scheme", "dark") +config.source("gruvbox.py") diff --git a/hosts/python/configs/qutebrowser/gruvbox.py b/hosts/python/configs/qutebrowser/gruvbox.py index 7c96968..bf178fa 100644 --- a/hosts/python/configs/qutebrowser/gruvbox.py +++ b/hosts/python/configs/qutebrowser/gruvbox.py @@ -6,8 +6,8 @@ # Gruvbox dark, hard scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) bg0_hard = "#1d2021" -bg0_soft = '#32302f' -bg0_normal = '#282828' +bg0_soft = "#32302f" +bg0_normal = "#282828" bg0 = bg0_normal bg1 = "#3c3836" @@ -73,7 +73,9 @@ c.colors.completion.item.selected.bg = bg4 c.colors.completion.item.selected.border.top = bg2 # Bottom border color of the selected completion item. -c.colors.completion.item.selected.border.bottom = c.colors.completion.item.selected.border.top +c.colors.completion.item.selected.border.bottom = ( + c.colors.completion.item.selected.border.top +) # Foreground color of the matched text in the selected completion item. c.colors.completion.item.selected.match.fg = bright_orange @@ -99,12 +101,12 @@ c.colors.contextmenu.disabled.fg = fg3 c.colors.contextmenu.menu.bg = bg0 # Foreground color of the context menu. If set to null, the Qt default is used. -c.colors.contextmenu.menu.fg = fg2 +c.colors.contextmenu.menu.fg = fg2 # Background color of the context menu’s selected item. If set to null, the Qt default is used. c.colors.contextmenu.selected.bg = bg2 -#Foreground color of the context menu’s selected item. If set to null, the Qt default is used. +# Foreground color of the context menu’s selected item. If set to null, the Qt default is used. c.colors.contextmenu.selected.fg = c.colors.contextmenu.menu.fg ### Downloads @@ -133,7 +135,7 @@ c.colors.downloads.error.fg = bright_red c.colors.hints.fg = bg0 # Background color for hints. -c.colors.hints.bg = 'rgba(250, 191, 47, 200)' # bright_yellow +c.colors.hints.bg = "rgba(250, 191, 47, 200)" # bright_yellow # Font color for the matched part of hints. c.colors.hints.match.fg = bg4 @@ -184,7 +186,7 @@ c.colors.messages.info.border = c.colors.messages.info.bg c.colors.prompts.fg = fg2 # Border used around UI elements in prompts. -c.colors.prompts.border = f'1px solid {bg1}' +c.colors.prompts.border = f"1px solid {bg1}" # Background color for prompts. c.colors.prompts.bg = bg3 diff --git a/hosts/python/configs/river/init b/hosts/python/configs/river/init index fc03211..7f0f49a 100755 --- a/hosts/python/configs/river/init +++ b/hosts/python/configs/river/init @@ -1,7 +1,7 @@ #!/bin/sh riverctl spawn kanshi -riverctl spawn "wbg ~/.local/share/wallpapers/01.jpg" +riverctl spawn "wbg $HOME/.local/share/wallpapers/01.jpg" riverctl spawn "waybar" riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" @@ -11,7 +11,7 @@ riverctl map normal Super+Shift Return spawn kitty riverctl map normal Super P spawn "rofi -show drun" riverctl map normal Super Q close riverctl map normal Super+Shift E exit -riverctl map normal Super+Shift C spawn "~/.config/river/init" +riverctl map normal Super+Shift C spawn "$HOME/.config/river/init" riverctl map normal Super J focus-view next riverctl map normal Super K focus-view previous riverctl map normal Super+Shift J swap next @@ -41,40 +41,38 @@ riverctl map-pointer normal Super BTN_LEFT move-view riverctl map-pointer normal Super BTN_RIGHT resize-view riverctl map-pointer normal Super BTN_MIDDLE toggle-float -for i in $(seq 1 9) -do - tags=$((1 << ($i - 1))) - riverctl map normal Super $i set-focused-tags $tags - riverctl map normal Super+Shift $i set-view-tags $tags - riverctl map normal Super+Control $i toggle-focused-tags $tags - riverctl map normal Super+Shift+Control $i toggle-view-tags $tags +for i in $(seq 1 9); do + tags=$((1 << (i - 1))) + riverctl map normal Super "$i" set-focused-tags "$tags" + riverctl map normal Super+Shift "$i" set-view-tags "$tags" + riverctl map normal Super+Control "$i" toggle-focused-tags "$tags" + riverctl map normal Super+Shift+Control "$i" toggle-view-tags "$tags" done all_tags=$(((1 << 32) - 1)) -riverctl map normal Super 0 set-focused-tags $all_tags -riverctl map normal Super+Shift 0 set-view-tags $all_tags +riverctl map normal Super 0 set-focused-tags "$all_tags" +riverctl map normal Super+Shift 0 set-view-tags "$all_tags" riverctl map normal Super Space toggle-float riverctl map normal Super F toggle-fullscreen -riverctl map normal Super Up send-layout-cmd rivertile "main-location top" +riverctl map normal Super Up send-layout-cmd rivertile "main-location top" riverctl map normal Super Right send-layout-cmd rivertile "main-location right" -riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom" -riverctl map normal Super Left send-layout-cmd rivertile "main-location left" +riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom" +riverctl map normal Super Left send-layout-cmd rivertile "main-location left" riverctl declare-mode passthrough riverctl map normal Super F11 enter-mode passthrough riverctl map passthrough Super F11 enter-mode normal -for mode in normal locked -do - riverctl map $mode None XF86Eject spawn 'eject -T' - riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5' - riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5' - riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute' - riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause' - riverctl map $mode None XF86AudioPlay spawn 'playerctl play-pause' - riverctl map $mode None XF86AudioPrev spawn 'playerctl previous' - riverctl map $mode None XF86AudioNext spawn 'playerctl next' - riverctl map $mode None XF86MonBrightnessUp spawn 'brightnessctl set +5%' - riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 5%-' +for mode in normal locked; do + riverctl map "$mode" None XF86Eject spawn 'eject -T' + riverctl map "$mode" None XF86AudioRaiseVolume spawn 'pamixer -i 5' + riverctl map "$mode" None XF86AudioLowerVolume spawn 'pamixer -d 5' + riverctl map "$mode" None XF86AudioMute spawn 'pamixer --toggle-mute' + riverctl map "$mode" None XF86AudioMedia spawn 'playerctl play-pause' + riverctl map "$mode" None XF86AudioPlay spawn 'playerctl play-pause' + riverctl map "$mode" None XF86AudioPrev spawn 'playerctl previous' + riverctl map "$mode" None XF86AudioNext spawn 'playerctl next' + riverctl map "$mode" None XF86MonBrightnessUp spawn 'brightnessctl set +5%' + riverctl map "$mode" None XF86MonBrightnessDown spawn 'brightnessctl set 5%-' done # hacky way of making everything have borders diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..c4035e4 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,2 @@ +[lint] +ignore = [ "F821" ]