Compare commits

..

No commits in common. "b5d21b8bb633dc5dce597a8100afb7ee0595020b" and "80954f18fa7e243677ebf82f6ec30debf6da2fa5" have entirely different histories.

4 changed files with 35 additions and 45 deletions

View File

@ -37,7 +37,7 @@ in
MANPAGER = "nvim +Man!";
};
xdg.configFile."nvim/lua/parsers.lua".text = /* lua */ ''
xdg.configFile."nvim/lua/parsers.lua".text = ''
vim.opt.runtimepath:append ("${treesitter-parsers}")
'';

View File

@ -1,8 +1,6 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) getExe getExe';
cfg = config.snowhawk.tmux.sessionizer;
tmuxCfg = config.snowhawk.tmux;
@ -38,36 +36,42 @@ in
config = lib.mkIf enable {
snowhawk.tmux.sessionizer.pkg =
lib.mkDefault (pkgs.writeShellApplication {
name = "tmux-sessionizer";
runtimeInputs = with pkgs; [ tmux fzf findutils coreutils procps ];
text = /* bash */ ''
let
tmux = "${pkgs.tmux}/bin/tmux";
pgrep = "${pkgs.procps}/bin/pgrep";
basename = "${pkgs.coreutils}/bin/basename";
tr = "${pkgs.coreutils}/bin/tr";
fzf = "${pkgs.fzf}/bin/fzf";
find = "${pkgs.findutils}/bin/find";
in
lib.mkDefault (pkgs.writeShellScriptBin "tmux-sessionizer" ''
if [[ $# -eq 1 ]]; then
selected=$1
else
selected=$(find -L ${lib.concatStringsSep " " cfg.paths} -mindepth 1 -maxdepth 1 -type d | fzf)
selected=$(${find} -L ${lib.concatStringsSep " " cfg.paths} -mindepth 1 -maxdepth 1 -type d | ${fzf})
fi
if [[ -z $selected ]]; then
exit 0
fi
selected_name=$(basename "$selected" | tr . _)
tmux_running=$(pgrep tmux)
selected_name=$(${basename} "$selected" | ${tr} . _)
tmux_running=$(${pgrep} tmux)
if [[ -z $TMUX ]] && [[ -z $tmux_running ]]; then
tmux new-session -s "$selected_name" -c "$selected"
${tmux} new-session -s "$selected_name" -c "$selected"
exit 0
fi
if ! tmux has-session -t="$selected_name" 2>/dev/null; then
tmux new-session -ds "$selected_name" -c "$selected"
if ! ${tmux} has-session -t="$selected_name" 2>/dev/null; then
${tmux} new-session -ds "$selected_name" -c "$selected"
fi
tmux switch-client -t "$selected_name"
'';
});
${tmux} switch-client -t "$selected_name"
'');
home.packages = [ cfg.pkg ];
home.packages = [
config.snowhawk.tmux.sessionizer.pkg
];
};
}

View File

@ -1,8 +1,6 @@
{ lib, config, pkgs, ... }:
let
inherit (lib) getExe optionalString;
cfg = config.snowhawk.tmux;
sessionizer = cfg.sessionizer;
in
@ -14,7 +12,7 @@ in
config = lib.mkIf cfg.enable {
programs.tmux = {
enable = true;
shell = getExe pkgs.fish;
shell = "${pkgs.fish}/bin/fish";
mouse = true;
baseIndex = 1;
terminal = "screen-256color";
@ -39,8 +37,8 @@ in
bind '"' split-window -v -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}"
'' + optionalString sessionizer.enable ''
bind-key -r f run-shell "tmux neww ${getExe sessionizer.pkg}"
${lib.optionalString sessionizer.enable ''bind-key -r f run-shell "tmux neww ${sessionizer.pkg}/bin/tmux-sessionizer"''}
'';
};

View File

@ -65,18 +65,6 @@ in
systemctl suspend
'')
(writeShellScriptBin "tv-on" ''
xrandr \
--output DP-0 --primary --mode 1920x1080 --pos 1920x1080 --rotate normal \
--output HDMI-0 --mode 1920x1080 --pos 0x1080 --rotate normal \
--output HDMI-1 --mode 1920x1080 --pos 1920x0 --rotate normal \
--output DP-1 --off \
--output DP-2 --off \
--output DP-3 --off \
--output DP-4 --off \
--output DP-5 --off
'')
feh
imagemagick
uhk-agent