diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 52f9c7f9..3a97f25e 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -38,6 +38,5 @@ "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "vimtex": { "branch": "master", "commit": "2e1bbabeb2c34bb17d7bc8cfdf8f95b16dd0db0c" } + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } } diff --git a/.config/nvim/lua/_lazy.lua b/.config/nvim/lua/_lazy.lua index 9e228094..3b2e9541 100644 --- a/.config/nvim/lua/_lazy.lua +++ b/.config/nvim/lua/_lazy.lua @@ -114,12 +114,6 @@ local plugins = { }, -- The haskell lexer "vim-scripts/alex.vim", - { - -- https://github.com/lervag/vimtex#lazynvim - "lervag/vimtex", - lazy = false, - version = "^2", - }, { "nvim-telescope/telescope.nvim", branch = "0.1.x", diff --git a/nix/configurations/vanadium/nixos/display.nix b/nix/configurations/vanadium/nixos/display.nix index 43e9f953..cccc8ef2 100644 --- a/nix/configurations/vanadium/nixos/display.nix +++ b/nix/configurations/vanadium/nixos/display.nix @@ -69,7 +69,7 @@ device, # obtain with `xrandr` brightness, # [0..1] }: - singleton "10_xrandr_brightness" /* bash */ '' + singleton "10_xrandr_brightness" '' ${lib.getExe pkgs.xorg.xrandr} --output ${device} --brightness ${toString brightness} ''; @@ -79,7 +79,7 @@ modelName, # obtain with `ddcutil detect` brightness, # [0..1] }: - singleton "10_ddc_brightness" /* bash */ '' + singleton "10_ddc_brightness" '' ${lib.getExe pkgs.ddcutil} --model ${modelName} setvcp 10 ${ toString (builtins.floor (brightness * 100)) } @@ -90,7 +90,7 @@ modelName, # obtain with `ddcutil detect` contrast, # [0..1] }: - singleton "10_ddc_contrast" /* bash */ '' + singleton "10_ddc_contrast" '' ${lib.getExe pkgs.ddcutil} --model ${modelName} setvcp 12 ${ toString (builtins.floor (contrast * 100)) } diff --git a/nix/packages/by-name/tmux-sessionizer/package.nix b/nix/packages/by-name/tmux-sessionizer/package.nix index 63c7cbc1..63ebfc67 100644 --- a/nix/packages/by-name/tmux-sessionizer/package.nix +++ b/nix/packages/by-name/tmux-sessionizer/package.nix @@ -8,6 +8,24 @@ symlinkJoin, }: let + tmux-register-session = writeShellApplication { + name = "__tmux-register-session"; + runtimeInputs = [ tmux ]; + text = '' + last=/tmp/TMUX_LAST + + # bail if tmux not running + if ! pgrep tmux >/dev/null 2>&1; then + exit 1 + fi + + this="$(tmux display-message -p '#S')" + if [ ! -f "$last" ] || [ "$(cat "$last")" != "$this" ]; then + echo "$this" >"$last" + fi + ''; + }; + tmux-maybe-create = writeShellApplication { name = "__tmux-maybe-create"; runtimeInputs = [ @@ -76,6 +94,7 @@ let esac # effects + ${lib.getExe tmux-register-session} || : ${lib.getExe tmux-maybe-create} "$session_name" "$selected" ${lib.getExe tmux-attach-or-switch} "$session_name" ''; @@ -84,6 +103,7 @@ in symlinkJoin { name = "tmux-sessionizer"; paths = [ + tmux-register-session tmux-maybe-create tmux-attach-or-switch tmux-sessionizer