diff --git a/README.md b/README.md index 102fcad..3494208 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ This repo contains my preferred configurations for: Installs various CLI utilities based on OS availability. Supports Arch, Debian, Fedora, and macOS (brew). I recommend quickly reading what you're getting. -### `archiso/install_arch` +### `install_arch` Dependencies diff --git a/fish/dot-config/fish/conf.d/define_global_variables.fish b/fish/dot-config/fish/conf.d/define_global_variables.fish index 13a65ce..28ddab7 100644 --- a/fish/dot-config/fish/conf.d/define_global_variables.fish +++ b/fish/dot-config/fish/conf.d/define_global_variables.fish @@ -14,8 +14,6 @@ set -gx PNPM_HOME $HOME/.local/share/pnpm set -gx LIBVIRT_DEFAULT_URI 'qemu:///system' -set -gx SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket - if test (uname) = Darwin set -gx ANDROID_HOME $HOME/Library/Android/Sdk else diff --git a/fish/dot-config/fish/conf.d/import_sources.fish b/fish/dot-config/fish/conf.d/import_sources.fish index 1b9a8d8..580613f 100644 --- a/fish/dot-config/fish/conf.d/import_sources.fish +++ b/fish/dot-config/fish/conf.d/import_sources.fish @@ -1,3 +1,5 @@ +ssh_agent_startup + test -e /opt/homebrew/bin/brew and /opt/homebrew/bin/brew shellenv | source - diff --git a/fish/dot-config/fish/functions/commit.fish b/fish/dot-config/fish/functions/commit.fish index 14e7ee8..6f8f6fe 100644 --- a/fish/dot-config/fish/functions/commit.fish +++ b/fish/dot-config/fish/functions/commit.fish @@ -1,3 +1,3 @@ -function commit -d 'Generate commit message for staged changes using LMC' - git diff --staged | lmc --new --git-message --stdin --model qwen3.6-35b-a3b +function commit -d 'Commit staged changes using Opencode' + opencode run Commit the staged changes with conventional style. end diff --git a/install_utils b/install_utils index f54741c..5e7bc18 100755 --- a/install_utils +++ b/install_utils @@ -37,13 +37,12 @@ base_pkgs=( zoxide git-delta stow - mise ) # OS specific arrays mac_pkgs=("${base_pkgs[@]}" fd yazi) -arch_pkgs=("${base_pkgs[@]}" fd yazi ttf-nerd-fonts-symbols ttf-nerd-fonts-symbols-common ttf-nerd-fonts-symbols-mono usage) -debian_pkgs=("${base_pkgs[@]}" fd-find) +arch_pkgs=("${base_pkgs[@]}" fd yazi ttf-nerd-fonts-symbols ttf-nerd-fonts-symbols-common ttf-nerd-fonts-symbols-mono) +debian_pkgs=("${base_pkgs[@]}" fd-find extrepo) fedora_pkgs=("${base_pkgs[@]}" fd-find) case "$distro" in @@ -81,16 +80,12 @@ debian | ubuntu) log 'Installing packages with APT' sudo apt-get --quiet --yes update sudo apt-get --quiet --yes upgrade - sudo apt-get --quiet --yes install extrepo - sudo extrepo enable mise - sudo apt-get --quiet --yes update sudo apt-get --quiet --yes install "${debian_pkgs[@]}" ;; fedora | rhel | rocky | almalinux | centos) log 'Installing packages with DNF' - sudo dnf --assumeyes upgrade - sudo dnf --assumeyes copr enable jdxcode/mise - sudo dnf --assumeyes install --skip-broken "${fedora_pkgs[@]}" + sudo dnf upgrade --assumeyes + sudo dnf install --assumeyes --skip-broken "${fedora_pkgs[@]}" ;; *) echo 'Your OS is unsupported. Supported: Arch, Debian, Fedora, Mac (Brew)' diff --git a/nvim/dot-config/nvim/lua/plugins/editor.lua b/nvim/dot-config/nvim/lua/plugins/editor.lua index 28794e2..cb222e5 100644 --- a/nvim/dot-config/nvim/lua/plugins/editor.lua +++ b/nvim/dot-config/nvim/lua/plugins/editor.lua @@ -85,4 +85,21 @@ return { vim.g["pencil#map#suspend_af"] = "K" end, }, + { + "folke/zen-mode.nvim", + opts = { + window = { backdrop = 0.95, options = { number = false } }, + plugins = { twilight = { enabled = false } }, + }, + keys = { + { "z", "ZenMode", desc = "Zen Mode", silent = true }, + }, + }, + { + "folke/twilight.nvim", + opts = {}, + keys = { + { "l", "Twilight", desc = "Twilight", silent = true }, + }, + }, } diff --git a/sway/dot-config/sway/config b/sway/dot-config/sway/config index ffbcb66..5f99c88 100644 --- a/sway/dot-config/sway/config +++ b/sway/dot-config/sway/config @@ -60,10 +60,6 @@ gaps inner 8 # You can also configure each device individually. # Read `man 5 sway-input` for more information about this section. -input type:pointer { - accel_profile "flat" -} - ### Key bindings # # Basics: @@ -172,8 +168,7 @@ input type:pointer { bindsym $mod+f fullscreen # Toggle the current focus between tiling and floating mode - bindsym $mod+Shift+space floating toggle; move position center - bindsym $mod+Control+space floating enable; move position center; resize set 65 ppt 100 ppt + bindsym $mod+Shift+space floating toggle # Swap focus between the tiling area and the floating area bindsym $mod+Mod1+space focus mode_toggle @@ -228,12 +223,12 @@ bindsym $mod+r mode "resize" bindsym --locked XF86AudioLowerVolume exec $ipc volume-down bindsym --locked XF86AudioMute exec $ipc volume-mute - # Special keys to control media - bindsym --locked XF86AudioPlay exec $ipc media toggle - bindsym --locked XF86AudioPause exec $ipc media pause - bindsym --locked XF86AudioPrev exec $ipc media previous - bindsym --locked XF86AudioNext exec $ipc media next - bindsym --locked XF86AudioStop exec $ipc media stop + # Special keys to control media via playerctl + bindsym --locked XF86AudioPlay exec playerctl play-pause + bindsym --locked XF86AudioPause exec playerctl play-pause + bindsym --locked XF86AudioPrev exec playerctl previous + bindsym --locked XF86AudioNext exec playerctl next + bindsym --locked XF86AudioStop exec playerctl stop # Special keys to adjust brightness via brightnessctl bindsym --locked XF86MonBrightnessUp exec $ipc brightness-up diff --git a/wezterm/dot-wezterm.lua b/wezterm/dot-wezterm.lua index 7e3154b..528d18d 100644 --- a/wezterm/dot-wezterm.lua +++ b/wezterm/dot-wezterm.lua @@ -10,6 +10,8 @@ if is_darwin() then config.default_prog = { "/opt/homebrew/bin/fish", "-l" } end +config.window_decorations = "RESIZE" + config.color_scheme = 'Kanagawa (Gogh)' config.window_background_opacity = is_darwin() and 0.85 or 0.95