From 7676dff9eba273873f2c9e609191726dbd3e299c Mon Sep 17 00:00:00 2001 From: Jake Pullen Date: Wed, 9 Sep 2026 11:54:24 +0100 Subject: [PATCH] sync --- .bashrc | 11 +- env.sh | 18 +-- fastfetch/config.jsonc | 7 + ...rchy-upgrade-to-quattro.20260815113159.bak | 123 ++++++++++++++++++ git/config | 28 ++++ git/gitconfig | 1 + hypr/.luarc.json | 11 ++ hypr/autostart.lua | 2 + hypr/bindings.lua | 31 +++++ hypr/hypridle.conf.bak.1778426015 | 28 ++++ hypr/hyprland.conf | 2 +- hypr/hyprland.lua | 29 +++++ hypr/hyprsunset.conf | 4 +- ...rchy-upgrade-to-quattro.20260815113159.bak | 14 ++ hypr/input.lua | 65 +++++++++ hypr/looknfeel.lua | 50 +++++++ hypr/monitors.conf | 6 +- hypr/monitors.lua | 15 +++ 18 files changed, 425 insertions(+), 20 deletions(-) create mode 100644 fastfetch/config.jsonc.omarchy-upgrade-to-quattro.20260815113159.bak create mode 100644 git/config create mode 100644 hypr/.luarc.json create mode 100644 hypr/autostart.lua create mode 100644 hypr/bindings.lua create mode 100644 hypr/hypridle.conf.bak.1778426015 create mode 100644 hypr/hyprland.lua create mode 100644 hypr/hyprsunset.conf.omarchy-upgrade-to-quattro.20260815113159.bak create mode 100644 hypr/input.lua create mode 100644 hypr/looknfeel.lua create mode 100644 hypr/monitors.lua diff --git a/.bashrc b/.bashrc index 8b55ffa..3f6b958 100644 --- a/.bashrc +++ b/.bashrc @@ -3,7 +3,16 @@ # All the default Omarchy aliases and functions # (don't mess with these directly, just overwrite them here!) -source ~/.local/share/omarchy/default/bash/rc +# /etc/omarchy.conf is written by omarchy-dev-link. When absent, force the +# package default instead of preserving a stale inherited dev-link value before +# we decide which rc file to source. +if [[ -f /etc/omarchy.conf ]]; then + source /etc/omarchy.conf + export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}" +else + export OMARCHY_PATH=/usr/share/omarchy +fi +source "$OMARCHY_PATH/default/bash/rc" # Add your own exports, aliases, and functions here. # diff --git a/env.sh b/env.sh index 19a40a5..76b2d71 100644 --- a/env.sh +++ b/env.sh @@ -1,18 +1,10 @@ -# LM Studio -export PATH="$PATH:/home/jake/.lmstudio/bin" - -# Github Copilot CLI -export COPILOT_PROVIDER_BASE_URL="http://framework.tawny-bellatrix.ts.net:1234/v1" -export COPILOT_PROVIDER_TYPE="openai" #default -export COPILOT_PROVIDER_API_KEY="local" -export COPILOT_PROVIDER_WIRE_API="completions" #default -export COPILOT_MODEL="qwen3.5" -export COPILOT_PROVIDER_MODEL_ID="qwen3.5" -export COPILOT_PROVIDER_WIRE_MODEL="qwen3.5" -# export COPILOT_PROVIDER_MAX_PROMPT_TOKENS="" Maximum prompt tokens -# export COPILOT_PROVIDER_MAX_OUTPUT_TOKENS="" Maximum output tokens +# Dagster +# export DAGSTER_HOME=/home/jake/.dagster_home # others export EDITOR=nvim export SYSTEMD_EDITOR=nvim export VISUAL=nvim + +export OPENAI_API_BASE="http://localhost:11434/v1" +export OPENAI_API_KEY="ollama" # Any non-empty string works diff --git a/fastfetch/config.jsonc b/fastfetch/config.jsonc index 0eeb12d..5094316 100644 --- a/fastfetch/config.jsonc +++ b/fastfetch/config.jsonc @@ -1,5 +1,12 @@ { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "source": "arch", + "color": { + "1": "green", + "2": "blue", + } + }, "modules": [ { "type": "custom", diff --git a/fastfetch/config.jsonc.omarchy-upgrade-to-quattro.20260815113159.bak b/fastfetch/config.jsonc.omarchy-upgrade-to-quattro.20260815113159.bak new file mode 100644 index 0000000..0eeb12d --- /dev/null +++ b/fastfetch/config.jsonc.omarchy-upgrade-to-quattro.20260815113159.bak @@ -0,0 +1,123 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "modules": [ + { + "type": "custom", + "format": "\u001b[90m┌───────────────────Hardware───────────────────┐", + }, + { + "type": "host", + "key": " PC", + "keyColor": "green", + }, + { + "type": "cpu", + "key": "│ ├", + "showPeCoreCount": true, + "keyColor": "green", + }, + { + "type": "gpu", + "key": "│ ├", + "detectionMethod": "pci", + "keyColor": "green", + }, + { + "type": "display", + "key": "│ ├󱄄", + "keyColor": "green", + }, + { + "type": "disk", + "key": "│ ├󰋊", + "keyColor": "green", + }, + { + "type": "memory", + "key": "│ ├", + "keyColor": "green", + }, + { + "type": "custom", + "format": "\u001b[90m└──────────────────────────────────────────────┘", + }, + { + "type": "custom", + "format": "\u001b[90m┌───────────────────Software───────────────────┐", + }, + { + "type": "os", + "keyColor": "blue", + }, + { + "type": "kernel", + "key": "│ ├", + "keyColor": "blue", + }, + { + "type": "wm", + "key": "│ ├", + "keyColor": "blue", + }, + { + "type": "de", + "key": " DE", + "keyColor": "blue", + }, + { + "type": "terminal", + "key": "│ ├", + "keyColor": "blue", + }, + { + "type": "packages", + "key": "│ ├󰏖", + "keyColor": "blue", + }, + { + "type": "wmtheme", + "key": "│ ├󰉼", + "keyColor": "blue", + }, + { + "type": "command", + "key": "│ ├󰸌", + "keyColor": "blue", + "text": "theme=$(omarchy-theme-current); echo -e \"$theme \\e[38m●\\e[37m●\\e[36m●\\e[35m●\\e[34m●\\e[33m●\\e[32m●\\e[31m●\"", + }, + { + "type": "terminalfont", + "key": "└ └", + "keyColor": "blue", + }, + { + "type": "custom", + "format": "\u001b[90m└──────────────────────────────────────────────┘", + }, + { + "type": "custom", + "format": "\u001b[90m┌─────────────Age / Uptime / Update────────────┐", + }, + { + "type": "command", + "key": "󱦟 OS Age", + "keyColor": "magenta", + "text": "echo $(( ($(date +%s) - $(stat -c %W /)) / 86400 )) days", + }, + { + "type": "uptime", + "key": "󱫐 Uptime", + "keyColor": "magenta", + }, + { + "type": "command", + "key": " Update", + "keyColor": "magenta", + "text": "updated=$(omarchy-version-pkgs); echo \"$updated\"", + }, + { + "type": "custom", + "format": "\u001b[90m└──────────────────────────────────────────────┘", + }, + ], +} diff --git a/git/config b/git/config new file mode 100644 index 0000000..0f8e979 --- /dev/null +++ b/git/config @@ -0,0 +1,28 @@ +# See https://git-scm.com/docs/git-config + +[alias] + co = checkout + br = branch + ci = commit + st = status +[init] + defaultBranch = master +[pull] + rebase = true # Rebase (instead of merge) on pull +[push] + autoSetupRemote = true # Automatically set upstream branch on push +[diff] + algorithm = histogram # Clearer diffs on moved/edited lines + colorMoved = plain # Highlight moved blocks in diffs + mnemonicPrefix = true # More intuitive refs in diff output +[commit] + verbose = true # Include diff comment in commit message template +[column] + ui = auto # Output in columns when possible +[branch] + sort = -committerdate # Sort branches by most recent commit first +[tag] + sort = -version:refname # Sort version numbers as you would expect +[rerere] + enabled = true # Record and reuse conflict resolutions + autoupdate = true # Apply stored conflict resolutions automatically diff --git a/git/gitconfig b/git/gitconfig index 59cae90..d75ee3e 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -79,6 +79,7 @@ [safe] directory = /mnt/nas/hosted_git/DnD.git directory = /mnt/nas/hosted_git/dungeon_masters_vault.git + directory = /opt/dagster/home-instance/jobs/data_pipeline_for_YNAB [gpg] format = ssh diff --git a/hypr/.luarc.json b/hypr/.luarc.json new file mode 100644 index 0000000..afb4466 --- /dev/null +++ b/hypr/.luarc.json @@ -0,0 +1,11 @@ +{ + "workspace": { + "library": [ + "/usr/share/hypr/stubs" + ], + "checkThirdParty": false + }, + "diagnostics": { + "globals": ["hl", "o"] + } +} diff --git a/hypr/autostart.lua b/hypr/autostart.lua new file mode 100644 index 0000000..de1a69a --- /dev/null +++ b/hypr/autostart.lua @@ -0,0 +1,2 @@ +-- Extra autostart processes. +-- o.launch_on_start("my-service") diff --git a/hypr/bindings.lua b/hypr/bindings.lua new file mode 100644 index 0000000..8f26c8d --- /dev/null +++ b/hypr/bindings.lua @@ -0,0 +1,31 @@ +-- Keep only your personal keybinding overrides here. Add new bindings or +-- unbind defaults before replacing them. + +-- See current bindings and descriptions: +-- omarchy menu keybindings --print + +-- To disable every Omarchy default binding, set this in +-- ~/.config/hypr/hyprland.lua before require("default.hypr.omarchy"), then add +-- only the bindings you want below: +-- omarchy_default_bindings = false + +-- To disable all preinstalled app/webapp bindings, set: +-- omarchy_preinstalled_bindings = false + +-- Add a new binding. +-- o.bind("SUPER + SHIFT + R", "SSH", "alacritty -e ssh your-server") + +-- Change an existing binding by unbinding it first, then binding the key again. +-- This example changes SUPER+SPACE from the launcher to the Omarchy root menu. +-- hl.unbind("SUPER + SPACE") +-- o.bind("SUPER + SPACE", "Omarchy menu", "omarchy-menu toggle root") + +-- Disable a default binding without replacing it. +-- hl.unbind("SUPER + SHIFT + B") + +-- Logitech MX Keys examples: +-- o.bind("SUPER + SHIFT + S", nil, "omarchy-capture-screenshot") +-- o.bind("SUPER + H", nil, "voxtype record toggle") +-- o.bind("SUPER + PERIOD", nil, "omarchy-shell shell toggle omarchy.emojis") + +o.bind("SUPER + D", "Discord", "discord") diff --git a/hypr/hypridle.conf.bak.1778426015 b/hypr/hypridle.conf.bak.1778426015 new file mode 100644 index 0000000..122af7d --- /dev/null +++ b/hypr/hypridle.conf.bak.1778426015 @@ -0,0 +1,28 @@ +general { + lock_cmd = omarchy-system-lock # lock screen and 1password + before_sleep_cmd = loginctl lock-session # lock before suspend. + after_sleep_cmd = sleep 1 && hyprctl dispatch dpms on # delay for PAM readiness, then turn on display. + inhibit_sleep = 3 # wait until screen is locked +} + +listener { + timeout = 150 # 2.5min + on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already) +} + +listener { + timeout = 300 # 5min + on-timeout = loginctl lock-session # lock screen when timeout has passed +} + +listener { + timeout = 330 # 5.5min + on-timeout = brightnessctl -sd '*::kbd_backlight' set 0 # save state and turn off keyboard backlight + on-resume = brightnessctl -rd '*::kbd_backlight' # restore keyboard backlight +} + +listener { + timeout = 600 # 10min + on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed + on-resume = hyprctl dispatch dpms on && brightnessctl -r # screen on when activity is detected +} diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index f24a9e3..1e0bacc 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -10,7 +10,7 @@ source = ~/.local/share/omarchy/default/hypr/envs.conf source = ~/.local/share/omarchy/default/hypr/looknfeel.conf source = ~/.local/share/omarchy/default/hypr/input.conf source = ~/.local/share/omarchy/default/hypr/windows.conf -source = ~/.config/omarchy/current/theme/hyprland.conf +source = ~/.local/state/omarchy/current/theme/hyprland.conf # Change your own setup in these files (and overwrite any settings from defaults!) source = ~/.config/hypr/monitors.conf diff --git a/hypr/hyprland.lua b/hypr/hyprland.lua new file mode 100644 index 0000000..45c9b66 --- /dev/null +++ b/hypr/hyprland.lua @@ -0,0 +1,29 @@ +-- Learn how to configure Hyprland: https://wiki.hypr.land/Configuring/Start/ + +-- Omarchy's bootstrap keeps path setup out of this user config. +dofile((os.getenv("OMARCHY_PATH") or "/usr/share/omarchy") .. "/default/hypr/bootstrap.lua") + +-- Disable all Omarchy default bindings. Add your own in hypr/bindings.lua. +-- omarchy_default_bindings = false +-- +-- Or disable only bindings for Omarchy's preinstalled apps/web apps while +-- keeping core window-manager bindings: +-- omarchy_preinstalled_bindings = false + +-- Load Omarchy defaults. +require("default.hypr.omarchy") + +-- Put your personal overrides in these files. They're loaded after Omarchy's +-- defaults so package updates can improve the defaults without rewriting your +-- ~/.config/hypr files. +require("hypr.monitors") +require("hypr.input") +require("hypr.bindings") +require("hypr.looknfeel") +require("hypr.autostart") + +-- Toggle config flags dynamically. +require("default.hypr.toggles") + +-- Add any other personal Hyprland configuration below. +-- o.window("qemu", { workspace = "5" }) diff --git a/hypr/hyprsunset.conf b/hypr/hyprsunset.conf index c4d0f8d..a3ba208 100644 --- a/hypr/hyprsunset.conf +++ b/hypr/hyprsunset.conf @@ -5,8 +5,8 @@ profile { identity = true } -# To enable auto switch to nightlight, set in your .config/hypr/autostart: -# exec-once = uwsm app -- hyprsunset +# To enable auto switch to nightlight, add to your .config/hypr/autostart.lua: +# o.launch_on_start("hyprsunset") # and use the following: # profile { # time = 20:00 diff --git a/hypr/hyprsunset.conf.omarchy-upgrade-to-quattro.20260815113159.bak b/hypr/hyprsunset.conf.omarchy-upgrade-to-quattro.20260815113159.bak new file mode 100644 index 0000000..c4d0f8d --- /dev/null +++ b/hypr/hyprsunset.conf.omarchy-upgrade-to-quattro.20260815113159.bak @@ -0,0 +1,14 @@ +# Makes hyprsunset do nothing to the screen by default +# Without this, the default applies some tint to the monitor +profile { + time = 07:00 + identity = true +} + +# To enable auto switch to nightlight, set in your .config/hypr/autostart: +# exec-once = uwsm app -- hyprsunset +# and use the following: +# profile { +# time = 20:00 +# temperature = 4000 +# } diff --git a/hypr/input.lua b/hypr/input.lua new file mode 100644 index 0000000..0bf6ae4 --- /dev/null +++ b/hypr/input.lua @@ -0,0 +1,65 @@ +-- Keep only your personal input overrides here. Uncommented settings below +-- replace Omarchy's defaults. + +-- Keyboard layout and options. +-- See https://wiki.hypr.land/Configuring/Basics/Variables/#input +-- Restore standard Caps Lock (Omarchy's default turns it into the compose key +-- and moves Caps Lock to both Shifts). +hl.config({ + input = { + kb_options = "terminate:ctrl_alt_bksp", + }, +}) + +-- hl.config({ +-- input = { +-- -- Use multiple keyboard layouts and switch between them with Left Alt + Right Alt. +-- kb_layout = "us,dk,eu", +-- kb_options = "compose:caps,shift:both_capslock_cancel,grp:alts_toggle", +-- +-- -- Use a specific keyboard variant if needed (e.g. intl for international keyboards). +-- kb_variant = "intl", +-- +-- -- Change speed of keyboard repeat. +-- repeat_rate = 40, +-- repeat_delay = 250, +-- +-- -- Start with numlock on by default. +-- numlock_by_default = true, +-- +-- -- Increase sensitivity for mouse/trackpad (default: 0). +-- sensitivity = 0.35, +-- +-- -- Turn off mouse acceleration (default: adaptive). +-- accel_profile = "flat", +-- +-- touchpad = { +-- -- Use natural (inverse) scrolling. +-- natural_scroll = true, +-- +-- -- Use two-finger clicks for right-click instead of lower-right corner. +-- clickfinger_behavior = true, +-- +-- -- Control the speed of your scrolling. +-- scroll_factor = 0.4, +-- +-- -- Enable the touchpad while typing. +-- disable_while_typing = false, +-- +-- -- Left-click-and-drag with three fingers. +-- drag_3fg = 1, +-- }, +-- }, +-- }) + +-- App-specific touchpad scroll speeds. +-- o.window("(Alacritty|kitty|foot)", { scroll_touchpad = 1.5 }) +-- o.window("com.mitchellh.ghostty", { scroll_touchpad = 0.2 }) + +-- Enable touchpad gestures for changing workspaces. +-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Gestures/ +-- hl.gesture({ fingers = 3, direction = "horizontal", action = "workspace" }) + +-- Enable touchpad gestures for moving focus (helpful on scrolling layout). +-- hl.gesture({ fingers = 3, direction = "left", action = function() hl.dispatch(hl.dsp.focus({ direction = "l" })) end }) +-- hl.gesture({ fingers = 3, direction = "right", action = function() hl.dispatch(hl.dsp.focus({ direction = "r" })) end }) diff --git a/hypr/looknfeel.lua b/hypr/looknfeel.lua new file mode 100644 index 0000000..069ecba --- /dev/null +++ b/hypr/looknfeel.lua @@ -0,0 +1,50 @@ +-- Change the default Omarchy look'n'feel. + +-- https://wiki.hypr.land/Configuring/Basics/Variables/#general +hl.config({ + general = { + -- No gaps between windows or borders. + gaps_in = 1, + gaps_out = 0, + border_size = 0, + + -- Change to niri-like side-scrolling layout. + -- layout = "scrolling", + }, +}) + +-- https://wiki.hypr.land/Configuring/Basics/Variables/#decoration +-- hl.config({ +-- decoration = { +-- -- Use round window corners. +-- rounding = 8, +-- +-- -- Dim unfocused windows (0.0 = no dim, 1.0 = fully dimmed). +-- dim_inactive = true, +-- dim_strength = 0.15, +-- }, +-- }) + +-- https://wiki.hypr.land/Configuring/Basics/Variables/#animations +-- hl.config({ +-- animations = { +-- -- Disable all animations. +-- enabled = false, +-- }, +-- }) + +-- https://wiki.hypr.land/Configuring/Basics/Variables/#layout +-- hl.config({ +-- layout = { +-- -- Avoid overly wide single-window layouts on wide screens. +-- single_window_aspect_ratio = { 1, 1 }, +-- }, +-- }) + +-- https://wiki.hypr.land/Configuring/Layouts/Scrolling-Layout/ +-- hl.config({ +-- scrolling = { +-- -- See only one column per screen instead of two. +-- column_width = 0.97, +-- }, +-- }) diff --git a/hypr/monitors.conf b/hypr/monitors.conf index dc314f2..076b523 100644 --- a/hypr/monitors.conf +++ b/hypr/monitors.conf @@ -3,9 +3,9 @@ # Format: monitor = [port], resolution, position, scale env = GDK_SCALE,1 -monitor = , preferred, auto, 1 -# monitor = DP-4, 3840x2160@60, 0x0, 1 -# monitor = DP-1, 2560x2880@60, 3840x0, 1 +# monitor = , preferred, auto, 1 +monitor = DP-4, 3840x2160@60, 0x0, 1 +monitor = DP-1, 2560x2880@60, 3840x0, 1 # Portrait/rotated secondary monitor (transform: 1 = 90°, 3 = 270°) # monitor = DP-2, preferred, auto, 1, transform, 1 diff --git a/hypr/monitors.lua b/hypr/monitors.lua new file mode 100644 index 0000000..90cbb81 --- /dev/null +++ b/hypr/monitors.lua @@ -0,0 +1,15 @@ +-- See https://wiki.hypr.land/Configuring/Basics/Monitors/ +-- List current monitors and supported resolutions with: hyprctl monitors all + +local omarchy_gdk_scale = 1 +local omarchy_monitor_scale = 1 + +hl.env("GDK_SCALE", tostring(omarchy_gdk_scale)) +hl.monitor({ output = "DP-4", mode = "preferred", position = "0x0", scale = omarchy_monitor_scale }) +hl.monitor({ output = "DP-1", mode = "preferred", position = "3840x0", scale = omarchy_monitor_scale }) + +-- Configure a specific monitor. +-- hl.monitor({ output = "DP-2", mode = "2560x1440@144", position = "0x0", scale = 1 }) + +-- Portrait/rotated secondary monitor (transform: 1 = 90°, 3 = 270°). +-- hl.monitor({ output = "DP-2", mode = "preferred", position = "auto", scale = 1, transform = 1 })