feat: lint and format across EVERYTHING

This commit is contained in:
Artur Manuel 2024-12-11 15:48:30 +00:00
commit 145901b173
6 changed files with 59 additions and 101 deletions

81
flake.lock generated
View file

@ -24,9 +24,7 @@
}, },
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["nixpkgs"]
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1733168902, "lastModified": 1733168902,
@ -44,10 +42,7 @@
}, },
"emacs": { "emacs": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["pankomacs", "nixpkgs"],
"pankomacs",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
@ -82,9 +77,7 @@
}, },
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": ["nixpkgs"]
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1733312601,
@ -154,9 +147,7 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": ["nixpkgs"],
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
@ -175,10 +166,7 @@
}, },
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["git-hooks-nix", "nixpkgs"]
"git-hooks-nix",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1709087332,
@ -196,10 +184,7 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["chaotic", "nixpkgs"]
"chaotic",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1733484277, "lastModified": 1733484277,
@ -218,10 +203,7 @@
"jovian": { "jovian": {
"inputs": { "inputs": {
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": [ "nixpkgs": ["chaotic", "nixpkgs"]
"chaotic",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1733491721, "lastModified": 1733491721,
@ -254,12 +236,7 @@
}, },
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["painless-neovim", "nvf", "rnix-lsp", "nixpkgs"]
"painless-neovim",
"nvf",
"rnix-lsp",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1655042882, "lastModified": 1655042882,
@ -277,16 +254,8 @@
}, },
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": ["painless-neovim", "nvf", "flake-utils"],
"painless-neovim", "nixpkgs": ["painless-neovim", "nvf", "nixpkgs"],
"nvf",
"flake-utils"
],
"nixpkgs": [
"painless-neovim",
"nvf",
"nixpkgs"
],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
@ -305,11 +274,7 @@
}, },
"nix-github-actions": { "nix-github-actions": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["chaotic", "jovian", "nixpkgs"]
"chaotic",
"jovian",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1729697500, "lastModified": 1729697500,
@ -593,9 +558,7 @@
}, },
"painless-neovim": { "painless-neovim": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["nixpkgs"],
"nixpkgs"
],
"nvf": "nvf" "nvf": "nvf"
}, },
"locked": { "locked": {
@ -616,9 +579,7 @@
"pankomacs": { "pankomacs": {
"inputs": { "inputs": {
"emacs": "emacs", "emacs": "emacs",
"nixpkgs": [ "nixpkgs": ["nixpkgs"],
"nixpkgs"
],
"parts": "parts" "parts": "parts"
}, },
"locked": { "locked": {
@ -638,10 +599,7 @@
}, },
"parts": { "parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": ["pankomacs", "nixpkgs"]
"pankomacs",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1730504689,
@ -2550,12 +2508,7 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["painless-neovim", "nvf", "nil", "nixpkgs"]
"painless-neovim",
"nvf",
"nil",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1726453838, "lastModified": 1726453838,
@ -2633,9 +2586,7 @@
}, },
"wallpkgs": { "wallpkgs": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["nixpkgs"],
"nixpkgs"
],
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {

View file

@ -83,6 +83,12 @@
check.enable = true; check.enable = true;
settings.hooks = { settings.hooks = {
alejandra.enable = true; alejandra.enable = true;
nil.enable = true;
shellcheck.enable = true;
prettier.enable = true;
ruff.enable = true;
ruff-format.enable = true;
shfmt.enable = true;
deadnix = { deadnix = {
enable = true; enable = true;
args = ["-e"]; args = ["-e"];
@ -91,7 +97,6 @@
enable = true; enable = true;
args = ["fix"]; args = ["fix"];
}; };
nil.enable = true;
}; };
}; };
devShells.default = config.pre-commit.devShell; devShells.default = config.pre-commit.devShell;

View file

@ -1,4 +1,4 @@
config.load_autoconfig() config.load_autoconfig()
config.set('colors.webpage.preferred_color_scheme', 'dark') config.set("colors.webpage.preferred_color_scheme", "dark")
config.source('gruvbox.py') config.source("gruvbox.py")

View file

@ -6,8 +6,8 @@
# Gruvbox dark, hard scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) # Gruvbox dark, hard scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
bg0_hard = "#1d2021" bg0_hard = "#1d2021"
bg0_soft = '#32302f' bg0_soft = "#32302f"
bg0_normal = '#282828' bg0_normal = "#282828"
bg0 = bg0_normal bg0 = bg0_normal
bg1 = "#3c3836" bg1 = "#3c3836"
@ -73,7 +73,9 @@ c.colors.completion.item.selected.bg = bg4
c.colors.completion.item.selected.border.top = bg2 c.colors.completion.item.selected.border.top = bg2
# Bottom border color of the selected completion item. # 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. # Foreground color of the matched text in the selected completion item.
c.colors.completion.item.selected.match.fg = bright_orange 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 c.colors.contextmenu.menu.bg = bg0
# Foreground color of the context menu. If set to null, the Qt default is used. # 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 menus selected item. If set to null, the Qt default is used. # Background color of the context menus selected item. If set to null, the Qt default is used.
c.colors.contextmenu.selected.bg = bg2 c.colors.contextmenu.selected.bg = bg2
#Foreground color of the context menus selected item. If set to null, the Qt default is used. # Foreground color of the context menus selected item. If set to null, the Qt default is used.
c.colors.contextmenu.selected.fg = c.colors.contextmenu.menu.fg c.colors.contextmenu.selected.fg = c.colors.contextmenu.menu.fg
### Downloads ### Downloads
@ -133,7 +135,7 @@ c.colors.downloads.error.fg = bright_red
c.colors.hints.fg = bg0 c.colors.hints.fg = bg0
# Background color for hints. # 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. # Font color for the matched part of hints.
c.colors.hints.match.fg = bg4 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 c.colors.prompts.fg = fg2
# Border used around UI elements in prompts. # 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. # Background color for prompts.
c.colors.prompts.bg = bg3 c.colors.prompts.bg = bg3

View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
riverctl spawn kanshi 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 "waybar"
riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" 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 P spawn "rofi -show drun"
riverctl map normal Super Q close riverctl map normal Super Q close
riverctl map normal Super+Shift E exit 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 J focus-view next
riverctl map normal Super K focus-view previous riverctl map normal Super K focus-view previous
riverctl map normal Super+Shift J swap next 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_RIGHT resize-view
riverctl map-pointer normal Super BTN_MIDDLE toggle-float riverctl map-pointer normal Super BTN_MIDDLE toggle-float
for i in $(seq 1 9) for i in $(seq 1 9); do
do tags=$((1 << (i - 1)))
tags=$((1 << ($i - 1))) riverctl map normal Super "$i" set-focused-tags "$tags"
riverctl map normal Super $i set-focused-tags $tags riverctl map normal Super+Shift "$i" set-view-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+Control $i toggle-focused-tags $tags riverctl map normal Super+Shift+Control "$i" toggle-view-tags "$tags"
riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
done done
all_tags=$(((1 << 32) - 1)) all_tags=$(((1 << 32) - 1))
riverctl map normal Super 0 set-focused-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+Shift 0 set-view-tags "$all_tags"
riverctl map normal Super Space toggle-float riverctl map normal Super Space toggle-float
riverctl map normal Super F toggle-fullscreen 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 Right send-layout-cmd rivertile "main-location right"
riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom" 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 Left send-layout-cmd rivertile "main-location left"
riverctl declare-mode passthrough riverctl declare-mode passthrough
riverctl map normal Super F11 enter-mode passthrough riverctl map normal Super F11 enter-mode passthrough
riverctl map passthrough Super F11 enter-mode normal riverctl map passthrough Super F11 enter-mode normal
for mode in normal locked for mode in normal locked; do
do riverctl map "$mode" None XF86Eject spawn 'eject -T'
riverctl map $mode None XF86Eject spawn 'eject -T' riverctl map "$mode" None XF86AudioRaiseVolume spawn 'pamixer -i 5'
riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5' riverctl map "$mode" None XF86AudioLowerVolume spawn 'pamixer -d 5'
riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5' riverctl map "$mode" None XF86AudioMute spawn 'pamixer --toggle-mute'
riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute' riverctl map "$mode" None XF86AudioMedia spawn 'playerctl play-pause'
riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause' riverctl map "$mode" None XF86AudioPlay 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 XF86AudioPrev spawn 'playerctl previous' riverctl map "$mode" None XF86AudioNext spawn 'playerctl next'
riverctl map $mode None XF86AudioNext spawn 'playerctl next' riverctl map "$mode" None XF86MonBrightnessUp spawn 'brightnessctl set +5%'
riverctl map $mode None XF86MonBrightnessUp spawn 'brightnessctl set +5%' riverctl map "$mode" None XF86MonBrightnessDown spawn 'brightnessctl set 5%-'
riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 5%-'
done done
# hacky way of making everything have borders # hacky way of making everything have borders

2
ruff.toml Normal file
View file

@ -0,0 +1,2 @@
[lint]
ignore = [ "F821" ]