From 749f79c4b6964c8895972249d80977235946778a Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Tue, 10 Feb 2026 20:07:39 -0500 Subject: [PATCH] misc cleanups --- config/nvim/init.lua | 68 +++++++++++++++------------------ config/nvim/lua/plugins/fzf.lua | 2 +- fonts | 1 - home/modules/editor.nix | 3 ++ home/modules/shell.nix | 5 --- home/modules/ui.nix | 2 +- hosts/xps15/configuration.nix | 1 + scripts/ctl | 20 +++++----- scripts/hypr | 23 ++++------- todo.md | 11 ++++++ 10 files changed, 63 insertions(+), 73 deletions(-) delete mode 120000 fonts create mode 100644 todo.md diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 92020a3..c7428e6 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -13,54 +13,46 @@ function _G.bmap(mapping, opts) _G.map(mapping, vim.tbl_extend('force', opts or {}, { buffer = 0 })) end +local disabled_plugins = { + '2html_plugin', + 'bugreport', + 'getscript', + 'getscriptPlugin', + 'gzip', + 'logipat', + 'netrw', + 'netrwFileHandlers', + 'netrwPlugin', + 'netrwSettings', + 'optwin', + 'rplugin', + 'rrhelper', + 'synmenu', + 'tar', + 'tarPlugin', + 'tohtml', + 'tutor', + 'vimball', + 'vimballPlugin', + 'zip', + 'zipPlugin', +} + +for _, plugin in ipairs(disabled_plugins) do + vim.g['loaded_' .. plugin] = 1 +end + local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' if not vim.uv.fs_stat(lazypath) then vim.fn.system({ 'git', 'clone', - 'git@github.com:folke/lazy.nvim.git', + 'https://github.com/folke/lazy.nvim.git', lazypath, }) end vim.opt.rtp:prepend(lazypath) require('lazy').setup('plugins', { - git = { url_format = 'git@github.com:%s.git' }, change_detection = { enabled = false }, - performance = { - cache = { - enabled = true, - }, - reset_packpath = true, - rtp = { - reset = true, - disabled_plugins = { - 'gzip', - 'netrwPlugin', - 'tarPlugin', - 'tohtml', - 'tutor', - 'zipPlugin', - '2html_plugin', - 'getscript', - 'getscriptPlugin', - 'logipat', - 'netrw', - 'netrwSettings', - 'netrwFileHandlers', - 'tar', - 'tarPlugin', - 'rrhelper', - 'vimball', - 'vimballPlugin', - 'zip', - 'zipPlugin', - 'tutor', - 'rplugin', - 'synmenu', - 'optwin', - 'bugreport', - }, - }, - }, }) diff --git a/config/nvim/lua/plugins/fzf.lua b/config/nvim/lua/plugins/fzf.lua index 848105e..24779b0 100644 --- a/config/nvim/lua/plugins/fzf.lua +++ b/config/nvim/lua/plugins/fzf.lua @@ -67,7 +67,7 @@ return { { 'fr', 'FzfLua resume' }, { 'fs', - 'FzfLua files cwd=~/.local/bin/scripts', + 'FzfLua files cwd=~/.config/nix/scripts', }, { 'GB', 'FzfLua git_branches' }, { 'Gb', 'FzfLua git_worktrees' }, diff --git a/fonts b/fonts deleted file mode 120000 index b53964f..0000000 --- a/fonts +++ /dev/null @@ -1 +0,0 @@ -/nix/store/sp0mz2yc3344ncbnaphfsapx67ankmn8-home-manager-files/.local/share/fonts \ No newline at end of file diff --git a/home/modules/editor.nix b/home/modules/editor.nix index ae12074..558056a 100644 --- a/home/modules/editor.nix +++ b/home/modules/editor.nix @@ -43,6 +43,9 @@ # runtime/tools nodejs websocat + luarocks + tree-sitter + (texlive.combine { inherit (texlive) scheme-small latexindent; }) ]; }; diff --git a/home/modules/shell.nix b/home/modules/shell.nix index ed2019d..3a43d12 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -102,7 +102,6 @@ in home.sessionPath = [ "${config.home.homeDirectory}/.local/bin" - "${config.home.homeDirectory}/.local/bin/scripts" ] ++ lib.optionals rust [ "${config.xdg.dataHome}/cargo/bin" ] ++ lib.optionals go [ "${config.xdg.dataHome}/go/bin" ] @@ -169,10 +168,6 @@ in ''; }; - home.file.".zshenv".text = '' - export THEME="${config.theme}" - ''; - programs.zsh = { enable = true; dotDir = "${config.xdg.configHome}/zsh"; diff --git a/home/modules/ui.nix b/home/modules/ui.nix index 06f94ca..06d2ca3 100644 --- a/home/modules/ui.nix +++ b/home/modules/ui.nix @@ -537,7 +537,7 @@ in home.activation.linkWaybarTheme = lib.hm.dag.entryAfter [ "writeBoundary" ] '' target="${config.xdg.configHome}/waybar/themes/theme.css" - [ -L "$target" ] || $DRY_RUN_CMD ln -sf "${config.xdg.configHome}/waybar/themes/${config.theme}.css" "$target" + $DRY_RUN_CMD ln -sf "${config.xdg.configHome}/waybar/themes/${config.theme}.css" "$target" ''; xdg.configFile."X11".source = diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix index be360ca..b876b55 100644 --- a/hosts/xps15/configuration.nix +++ b/hosts/xps15/configuration.nix @@ -72,6 +72,7 @@ enable = true; shellInit = '' export ZDOTDIR="$HOME/.config/zsh" + export THEME="midnight" ''; }; programs.hyprland.enable = true; diff --git a/scripts/ctl b/scripts/ctl index 2e6ba10..223f387 100755 --- a/scripts/ctl +++ b/scripts/ctl @@ -72,29 +72,27 @@ keyboard) esac ;; audio) - require pactl + require wpctl pw-dump jq case "$2" in out) - sinks="$(pactl list short sinks | awk '{print $1": "$2}')" + sinks="$(pw-dump | jq -r '.[] | select(.info.props."media.class" == "Audio/Sink") | "\(.id)\t\(.info.props."node.description" // .info.props."node.name" // "unknown")"')" [ -z "$sinks" ] && exit 0 - count="$(printf "%s\n" "$sinks" | wc -l)" if [ "$XDG_SESSION_TYPE" = x11 ]; then - choice="$(printf "%s\n" "$sinks" | dmenu -i -l "$count" -p "select sink:" | cut -d: -f1)" + choice="$(printf "%s\n" "$sinks" | awk -F'\t' '{print $1": "$2}' | dmenu -i -p "select sink:" | cut -d: -f1)" else - choice="$(printf "%s\n" "$sinks" | rofi -dmenu -i -lines "$count" -p "select sink" | cut -d: -f1)" + choice="$(printf "%s\n" "$sinks" | awk -F'\t' '{print $1": "$2}' | rofi -dmenu -i -p "select sink" | cut -d: -f1)" fi - [ "$choice" ] && pactl set-default-sink "$choice" + [ "$choice" ] && wpctl set-default "$choice" ;; in) - sources="$(pactl list short sources | awk '{print $1": "$2}')" + sources="$(pw-dump | jq -r '.[] | select(.info.props."media.class" == "Audio/Source") | "\(.id)\t\(.info.props."node.description" // .info.props."node.name" // "unknown")"')" [ -z "$sources" ] && exit 0 - count="$(printf "%s\n" "$sources" | wc -l)" if [ "$XDG_SESSION_TYPE" = x11 ]; then - choice="$(printf "%s\n" "$sources" | dmenu -i -l "$count" -p "select source:" | cut -d: -f1)" + choice="$(printf "%s\n" "$sources" | awk -F'\t' '{print $1": "$2}' | dmenu -i -p "select source:" | cut -d: -f1)" else - choice="$(printf "%s\n" "$sources" | rofi -dmenu -i -lines "$count" -p "select source" | cut -d: -f1)" + choice="$(printf "%s\n" "$sources" | awk -F'\t' '{print $1": "$2}' | rofi -dmenu -i -p "select source" | cut -d: -f1)" fi - [ "$choice" ] && pactl set-default-source "$choice" + [ "$choice" ] && wpctl set-default "$choice" ;; *) echo "Usage: ctl audio {in|out}" >&2 diff --git a/scripts/hypr b/scripts/hypr index bcb32c7..03a09b9 100755 --- a/scripts/hypr +++ b/scripts/hypr @@ -66,26 +66,20 @@ brightness) esac ;; volume) - require pactl notify-send - SINK="@DEFAULT_SINK@" + require wpctl notify-send + SINK="@DEFAULT_AUDIO_SINK@" VOL_STEP=5 - get_vol() { pactl get-sink-volume "$SINK" | awk 'NR==1{print $5+0}'; } + get_vol() { wpctl get-volume "$SINK" | awk '{printf "%d", $2 * 100}'; } case "$1" in up) - vol=$(get_vol) - [ "$vol" -lt 100 ] && vol=$((vol + VOL_STEP)) - [ "$vol" -gt 100 ] && vol=100 - pactl set-sink-volume "$SINK" "${vol}%" + wpctl set-volume "$SINK" "${VOL_STEP}%+" --limit 1.0 ;; down) - vol=$(get_vol) - vol=$((vol - VOL_STEP)) - [ "$vol" -lt 0 ] && vol=0 - pactl set-sink-volume "$SINK" "${vol}%" + wpctl set-volume "$SINK" "${VOL_STEP}%-" ;; toggle) - pactl set-sink-mute "$SINK" toggle + wpctl set-mute "$SINK" toggle ;; *) echo "Invalid subcommand: $1" >&2 @@ -93,11 +87,8 @@ volume) ;; esac - muted=$(pactl get-sink-mute "$SINK" | awk '{print $2}') vol=$(get_vol) - [ "$vol" -gt 100 ] && vol=100 - - if [ "$muted" = "yes" ]; then + if wpctl get-volume "$SINK" | grep -q MUTED; then notify-send -u low -t 2500 -r 5556 "volume: ${vol}% (muted)" else notify-send -u low -t 2500 -r 5556 "volume: ${vol}%" diff --git a/todo.md b/todo.md new file mode 100644 index 0000000..e11db98 --- /dev/null +++ b/todo.md @@ -0,0 +1,11 @@ +# todo + +tmux colorschemes + +everything else + +auto setup + +using nix shell + +audio