From 84bee93e890c5fde502f8c2d2683180e3cf3a950 Mon Sep 17 00:00:00 2001 From: Paul Aumann Date: Thu, 5 Mar 2026 09:40:10 +0100 Subject: [PATCH] stuff --- .config/Code/User/keybindings.json | 20 +++++++ .config/Code/User/settings.json | 5 +- .config/alacritty/alacritty.toml | 12 ++--- .config/alacritty/themes/current.toml | 2 +- .../alacritty/themes/dark/alacritty-0-12.toml | 2 +- .config/alacritty/themes/light/alabaster.toml | 30 +++++++++++ .config/alacritty/themes/light/default.toml | 2 +- .config/hypr/hyprland.conf | 40 ++++++++++---- .config/vicinae/appeareance.jsonc | 11 ++++ .local/share/darkman/alacritty-theme.py | 53 +++++++++++++++++++ 10 files changed, 157 insertions(+), 20 deletions(-) create mode 100644 .config/alacritty/themes/light/alabaster.toml create mode 100755 .local/share/darkman/alacritty-theme.py diff --git a/.config/Code/User/keybindings.json b/.config/Code/User/keybindings.json index 47b18c1..9fab160 100644 --- a/.config/Code/User/keybindings.json +++ b/.config/Code/User/keybindings.json @@ -397,4 +397,24 @@ "key": "alt+g", "command": "-relative-goto.goto" }, + { + "key": "alt+left", + "command": "workbench.action.navigateBack", + "when": "canNavigateBack" + }, + { + "key": "ctrl+alt+-", + "command": "-workbench.action.navigateBack", + "when": "canNavigateBack" + }, + { + "key": "alt+right", + "command": "workbench.action.navigateForward", + "when": "canNavigateForward" + }, + { + "key": "ctrl+shift+-", + "command": "-workbench.action.navigateForward", + "when": "canNavigateForward" + }, ] \ No newline at end of file diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json index 7f3d995..6f9bd01 100644 --- a/.config/Code/User/settings.json +++ b/.config/Code/User/settings.json @@ -1,5 +1,5 @@ { - "workbench.iconTheme": "Default Light Modern Icons", + "workbench.iconTheme": "Monokai Pro Light Icons", "editor.fontFamily": "JetBrains Mono Semibold, Fira Code, Menlo, Monaco, 'Courier New', monospace", "editor.fontSize": 18, "editor.fontWeight": "normal", @@ -128,5 +128,6 @@ "https://json-schema.org/": true, "https://vicinae.com/schemas/config.json": true }, - "workbench.colorTheme": "Monokai Pro", + "workbench.colorTheme": "Monokai Pro Light", + "workbench.editor.editorActionsLocation": "hidden", } \ No newline at end of file diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index cef9bcb..ec9f3a6 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -7,23 +7,23 @@ shape = "Beam" blinking = "On" [font] -size = 16.0 +size = 15.0 [font.bold] -family = "Monaspace Neon" -style = "Regular" +family = "JetBrains Mono" +style = "Medium" [font.glyph_offset] x = 0 y = 0 [font.italic] -family = "Monaspace Neon" +family = "JetBrains Mono" style = "Italic" [font.normal] -family = "Monaspace Neon" -style = "Regular" +family = "JetBrains Mono" +style = "Medium" [font.offset] x = 0 diff --git a/.config/alacritty/themes/current.toml b/.config/alacritty/themes/current.toml index 6031c52..0e38ffc 120000 --- a/.config/alacritty/themes/current.toml +++ b/.config/alacritty/themes/current.toml @@ -1 +1 @@ -dark/default.toml \ No newline at end of file +/home/paul/.config/alacritty/themes/light/default.toml \ No newline at end of file diff --git a/.config/alacritty/themes/dark/alacritty-0-12.toml b/.config/alacritty/themes/dark/alacritty-0-12.toml index d58ad70..c420632 100644 --- a/.config/alacritty/themes/dark/alacritty-0-12.toml +++ b/.config/alacritty/themes/dark/alacritty-0-12.toml @@ -3,7 +3,7 @@ [colors.primary] foreground = "#c5c8c6" -background = "#1d1f21" +background = "#131414" [colors.normal] black = "#1d1f21" diff --git a/.config/alacritty/themes/light/alabaster.toml b/.config/alacritty/themes/light/alabaster.toml new file mode 100644 index 0000000..9a26218 --- /dev/null +++ b/.config/alacritty/themes/light/alabaster.toml @@ -0,0 +1,30 @@ +# Colors (Alabaster) +# author tonsky + +[colors.primary] +background = '#F7F7F7' +foreground = '#434343' + +[colors.cursor] +text = '#F7F7F7' +cursor = '#434343' + +[colors.normal] +black = '#000000' +red = '#AA3731' +green = '#448C27' +yellow = '#CB9000' +blue = '#325CC0' +magenta = '#7A3E9D' +cyan = '#0083B2' +white = '#BBBBBB' + +[colors.bright] +black = '#777777' +red = '#F05050' +green = '#60CB00' +yellow = '#FFBC5D' +blue = '#007ACC' +magenta = '#E64CE6' +cyan = '#00AACB' +white = '#FFFFFF' \ No newline at end of file diff --git a/.config/alacritty/themes/light/default.toml b/.config/alacritty/themes/light/default.toml index 9f36c4a..afc256a 120000 --- a/.config/alacritty/themes/light/default.toml +++ b/.config/alacritty/themes/light/default.toml @@ -1 +1 @@ -google-light.toml \ No newline at end of file +alabaster.toml \ No newline at end of file diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 038de00..a0da992 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -50,6 +50,7 @@ exec-once = dunst exec-once = waybar exec-once = darkman run exec-once = vicinae server +exec-once = udiskie # Open programs on special workspaces exec-once = [ workspace special:term silent] $terminal @@ -113,6 +114,7 @@ general { # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on allow_tearing = false + # Use dwindle per default, changed on a per-workspace basis in the workspace rules below layout = dwindle } @@ -162,13 +164,19 @@ animations { # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more dwindle { - pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + pseudotile = true # Master switch for pseudotiling. preserve_split = true # You probably want this + + smart_split = false # No splitting based on cursor position + force_split = 2 # Always split to right } # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more master { - new_status = master + new_status = slave # New windows are slaves by default + + mfact = 0.7 + orientation = right } # https://wiki.hyprland.org/Configuring/Variables/#misc @@ -230,17 +238,18 @@ $mainMod = SUPER # Sets "Windows" key as main modifier bind = $mainMod, T, exec, $terminal bind = $mainMod, B, exec, $browser bind = $mainMod, Return, exec, $launcher -bind = $mainMod, Q, killactive, -bind = $mainMod, F, fullscreen, -bind = $mainMod, M, splitratio, exact 0.6, +bind = $mainMod, Space, exec, $launcher +bind = $mainMod, Q, killactive +bind = $mainMod, F, fullscreen +bind = $mainMod, M, splitratio, exact 0.6 bind = $mainMod, mouse_down, splitratio, 0.1 bind = $mainMod, mouse_up, splitratio, -0.1 bind = $mainMod, E, exec, $fileManager # bind = $mainMod, V, exec, cliphist list | tofi | cliphist decode | wl-copy bind = $mainMod, V, exec, vicinae vicinae://extensions/vicinae/clipboard/history -bind = $mainMod, X, togglefloating, +bind = $mainMod, X, togglefloating bind = $mainMod, P, pin, active -bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, J, layoutmsg, togglesplit # dwindle bind = $mainMod SHIFT, S, exec, hyprshot -m region bind = $mainMod, PRINT, exec, hyprshot -m window bind = $mainMod SHIFT, B, exec, pkill waybar & hyprctl dispatch exec waybar @@ -375,11 +384,18 @@ windowrule { float = 1 size = 576 1024 } +windowrule { + name = "waydroid-apps" + match:initial_class = waydroid\..* + + float = 1 + size = 576 1024 +} # Vicinae is always floating and exact size windowrule { name = "vicinae" - match:initial_class = vicinae-server + match:initial_class = vicinae float = 1 pin = 1 stay_focused = on @@ -410,6 +426,7 @@ layerrule { blur = on } +# Disabled since vicinae is currently a window, and not a layer. # layerrule { # name = blur_vicinae # match:namespace = vicinae @@ -440,4 +457,9 @@ workspace = special:term, gapsout:64 workspace = special:browser, gapsout:64 workspace = special:music, gapsout:64 workspace = special:todo, gapsout:64 -workspace = special:files, gapsout:64 \ No newline at end of file +workspace = special:files, gapsout:64 + +# Workspace rules to set layouts for specific workspaces (default is currently dwindle) +workspace = 1, layout:master + +workspace = special:term, layout:master \ No newline at end of file diff --git a/.config/vicinae/appeareance.jsonc b/.config/vicinae/appeareance.jsonc index e7b2432..4d07f38 100644 --- a/.config/vicinae/appeareance.jsonc +++ b/.config/vicinae/appeareance.jsonc @@ -18,5 +18,16 @@ // 'top' is recommended as using 'overlay' will make the vicinae window appear on top of IME popovers in some scenarios. "layer": "top" } + }, + "font": { + // The font family to use for the general vicinae UI. + // "auto" (recommended): uses the bundled Inter font + // "system": uses the system/platform default font + // Or specify any font family name (e.g. "Fira Sans") + "normal": { + "family": "Verdana", + // The point size of the font (unlike pixel size, the point size scales with resolution) + "size": 10.5 + } } } \ No newline at end of file diff --git a/.local/share/darkman/alacritty-theme.py b/.local/share/darkman/alacritty-theme.py new file mode 100755 index 0000000..e6f03a2 --- /dev/null +++ b/.local/share/darkman/alacritty-theme.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python3 + +import subprocess +from argparse import ArgumentParser +from pathlib import Path + +if __name__ == "__main__": + parser = ArgumentParser(description="Alacritty theme switcher") + parser.add_argument( + "mode", + help="The mode to switch the Alacritty theme to (e.g., 'dark' or 'light')", + ) + args = parser.parse_args() + + if args.mode not in ["dark", "light"]: + print("Invalid mode. Please choose 'dark' or 'light'.") + exit(1) + + """ + The Alacritty config directory should contain the following files: + └── themes + ├── current.toml -> dark/default.toml + ├── dark + │ └── default.toml + └── light + └── default.toml + + The default.toml files can be symlinks to the actual theme files, so you can easily switch between + different themes by changing the symlink target. + + To change the light/dark theme, we can simply change the current.toml symlink to point to the + appropriate theme file. + """ + + alacritty_config = Path.home() / ".config/alacritty" + themes_dir = alacritty_config / "themes" + current_theme = themes_dir / "current.toml" + target_theme = themes_dir / args.mode / "default.toml" + + if not target_theme.exists(): + print(f"Target theme file not found at {target_theme}") + exit(1) + + if current_theme.exists() and not current_theme.is_symlink(): + print(f"Current theme file {current_theme} is not a symlink. Please fix this manually.") + exit(1) + + if current_theme.exists(): + current_theme.unlink() + + current_theme.symlink_to(target_theme) + + print("Done!") \ No newline at end of file