fixing i3 and make sure select browser is not starting by accident
This commit is contained in:
parent
a5c71711ec
commit
90532b9662
2 changed files with 21 additions and 20 deletions
|
@ -161,6 +161,7 @@ let
|
||||||
case $BROWSER in
|
case $BROWSER in
|
||||||
${lib.concatStringsSep "\n" (flip map browserExecutableList
|
${lib.concatStringsSep "\n" (flip map browserExecutableList
|
||||||
(bin: "${bin.name}) export BIN=${bin}/bin/${bin.name} ;;"))}
|
(bin: "${bin.name}) export BIN=${bin}/bin/${bin.name} ;;"))}
|
||||||
|
*) exit 0 ;;
|
||||||
esac
|
esac
|
||||||
$BIN "$@"
|
$BIN "$@"
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -11,6 +11,15 @@ let
|
||||||
background = theme.base03;
|
background = theme.base03;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# switch to named workspaces
|
||||||
|
i3-wk-switch = pkgs.i3-wk-switch.overrideAttrs (old: {
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "tmfink";
|
||||||
|
repo = "i3-wk-switch";
|
||||||
|
rev = "5f43bb8cbe7938eff476fc534b61c8fb6a700c8f";
|
||||||
|
sha256 = "sha256-DOBPI/wO+S8a6EzWJeVGODXeSixFl7SHTtHAq5DG8GU=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
backgroundCommand = pkgs.writers.writeDash "background" ''
|
backgroundCommand = pkgs.writers.writeDash "background" ''
|
||||||
${pkgs.xorg.xrandr}/bin/xrandr | grep " connected" | \
|
${pkgs.xorg.xrandr}/bin/xrandr | grep " connected" | \
|
||||||
|
@ -208,16 +217,16 @@ in
|
||||||
"${cfg.config.modifier}+Shift+minus" = "move scratchpad";
|
"${cfg.config.modifier}+Shift+minus" = "move scratchpad";
|
||||||
"${cfg.config.modifier}+minus" = "scratchpad show";
|
"${cfg.config.modifier}+minus" = "scratchpad show";
|
||||||
|
|
||||||
"${cfg.config.modifier}+1" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 1";
|
"${cfg.config.modifier}+1" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 1";
|
||||||
"${cfg.config.modifier}+2" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 2";
|
"${cfg.config.modifier}+2" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 2";
|
||||||
"${cfg.config.modifier}+3" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 3";
|
"${cfg.config.modifier}+3" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 3";
|
||||||
"${cfg.config.modifier}+4" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 4";
|
"${cfg.config.modifier}+4" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 4";
|
||||||
"${cfg.config.modifier}+5" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 5";
|
"${cfg.config.modifier}+5" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 5";
|
||||||
"${cfg.config.modifier}+6" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 6";
|
"${cfg.config.modifier}+6" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 6";
|
||||||
"${cfg.config.modifier}+7" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 7";
|
"${cfg.config.modifier}+7" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 7";
|
||||||
"${cfg.config.modifier}+8" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 8";
|
"${cfg.config.modifier}+8" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 8";
|
||||||
"${cfg.config.modifier}+9" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 9";
|
"${cfg.config.modifier}+9" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 9";
|
||||||
"${cfg.config.modifier}+0" = "exec --no-startup-id ${pkgs.i3-wk-switch}/bin/i3-wk-switch 10";
|
"${cfg.config.modifier}+0" = "exec --no-startup-id ${i3-wk-switch}/bin/i3-wk-switch 10";
|
||||||
|
|
||||||
"${cfg.config.modifier}+Shift+1" = "move container to workspace number 1";
|
"${cfg.config.modifier}+Shift+1" = "move container to workspace number 1";
|
||||||
"${cfg.config.modifier}+Shift+2" = "move container to workspace number 2";
|
"${cfg.config.modifier}+Shift+2" = "move container to workspace number 2";
|
||||||
|
@ -239,15 +248,6 @@ in
|
||||||
|
|
||||||
"${cfg.config.modifier}+grave" =
|
"${cfg.config.modifier}+grave" =
|
||||||
let
|
let
|
||||||
i3-wk-switch-pr = pkgs.i3-wk-switch.overrideAttrs (old: {
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "tmfink";
|
|
||||||
repo = "i3-wk-switch";
|
|
||||||
rev = "bef4d50cec9c731259001a10cc03a8e972e72d9d";
|
|
||||||
sha256 = "sha256-jxd7jxQK0ESVrZ8a1o0IBetWHKh73GD7ch1xAMUDAPE=";
|
|
||||||
};
|
|
||||||
|
|
||||||
});
|
|
||||||
script = pkgs.writers.writeBash "select-workspace" ''
|
script = pkgs.writers.writeBash "select-workspace" ''
|
||||||
set -e
|
set -e
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
@ -256,7 +256,7 @@ in
|
||||||
${pkgs.rofi}/bin/rofi -dmenu -p 'Select Workspace' | \
|
${pkgs.rofi}/bin/rofi -dmenu -p 'Select Workspace' | \
|
||||||
while read line
|
while read line
|
||||||
do
|
do
|
||||||
${pkgs.i3}/bin/i3-msg workspace "$line"
|
${i3-wk-switch}/bin/i3-wk-switch "$line"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
|
|
Loading…
Reference in a new issue