Skip to content

Commit

Permalink
Experiment with zellij
Browse files Browse the repository at this point in the history
  • Loading branch information
Philipp Geier committed Sep 23, 2021
1 parent 8bc3d88 commit 744ac7f
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 5 deletions.
7 changes: 7 additions & 0 deletions configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@
elmPackages.elm-format
elmPackages.elm-language-server
tmux
zellij
mtm
notcurses
dmenu
rofi
# firefox
Expand Down Expand Up @@ -233,6 +236,7 @@
p7zip
w3m
ranger
lsix
tree
vim
thermald
Expand Down Expand Up @@ -671,6 +675,9 @@
gammastep
geoclue2 # for gammastep
wf-recorder
grim
slurp
swappy

pavucontrol
volnoti
Expand Down
12 changes: 11 additions & 1 deletion nixpkgs/.config/nixpkgs/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,16 @@
ponymix
pasystray

grim
slurp
swappy

font-awesome

kakoune
ranger
w3m
lsix
fasd
keepass
fzf
Expand All @@ -53,6 +59,9 @@

fish
tmux
mtm
zellij
notcurses
vim
vscode
zathura
Expand All @@ -62,12 +71,13 @@

spotify
gimp
okular

firefox-wayland
chromium
pavucontrol
pcmanfm
nemo
cinnamon.nemo

# numix-solarized-gtk-theme
# zafiro-icons
Expand Down
1 change: 1 addition & 0 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ stow -t $TARGET terminator
stow -t $TARGET termite
stow -t $TARGET kitty
stow -t $TARGET tmux
stow -t $TARGET zellij
#stow -t $TARGET stack
#stow -t $TARGET i3blocks
stow -t $TARGET zathura
Expand Down
1 change: 1 addition & 0 deletions setupSD.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ stow -t $TARGET direnv
#stow -t $TARGET termite
stow -t $TARGET kitty
stow -t $TARGET tmux
stow -t $TARGET zellij
#stow -t $TARGET stack
#stow -t $TARGET i3blocks
stow -t $TARGET zathura
Expand Down
8 changes: 7 additions & 1 deletion sway/.config/sway/config
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ input type:touchpad {
bindsym $mod+Shift+Return exec $term tmux new-session -t Default
bindsym $mod+n exec $term tmux new-session -A -s 1 -t G1
bindsym $mod+Shift+n exec $term tmux new-session -t G1
# bindsym $mod+Return exec $term zellij-setup-or-attach Default
# bindsym $mod+Shift+Return exec $term zellij
# bindsym $mod+n exec $term zellij-setup-or-attach G1
# # bindsym $mod+Shift+n exec $term zellij-setup-or-attach G1

# Kill focused window
bindsym $mod+Shift+q kill
Expand All @@ -113,8 +117,10 @@ input type:touchpad {
bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'

# bindsym $mod+Shift+p exec swaynag -t green -m '' -Z 'Lock' 'swaylock' -Z 'Reboot' 'systemctl reboot' -Z 'Poweroff' 'systemctl poweroff' -Z 'Halt' 'systemctl Halt' -Z 'Hybernate' 'systemctl hybernate' -Z 'Suspend' 'systemctl suspend' -Z 'Hybrid sleep' 'systemctl hybrid-sleep'
bindsym $mod+Shift+p exec nwgbar
bindsym $mod+Shift+r exec nwgbar
bindsym $mod+Shift+g exec swaylock
bindsym $mod+Shift+p exec grim -g "$(slurp)" - | swappy -f -
bindsym $mod+Shift+a exec grim - | swappy -f -
#
# Moving around:
#
Expand Down
2 changes: 1 addition & 1 deletion swaylock/.config/swaylock/config
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ layout-text-color=fdf6e3
# layout-bg-color=586e75
layout-border-color=586e75
layout-bg-color=073642
grace=2
grace=5
grace-no-mouse
grace-no-touch
fade-in=0.2
Expand Down
4 changes: 2 additions & 2 deletions tmux/.tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
set -g status-right '#{prefix_highlight} | %a %Y-%m-%d %H:%M'

## set the default TERM
set -g default-terminal screen
# set -g default-terminal screen

#Environment for kakoune
set -g update-environment 'KAKSESSION DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY TERM'
#set-option update-environment 'KAKSESSION DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY TERM'
## determine if we should enable 256-colour support
if "[[ ${TERM} =~ 256color || ${TERM} == fbterm ]]" 'set -g default-terminal screen-256color'
# if "[[ ${TERM} =~ 256color || ${TERM} == fbterm ]]" 'set -g default-terminal screen-256color'

# Plugin manager
run '~/.tmux/plugins/tpm/tpm'
Expand Down
4 changes: 4 additions & 0 deletions zellij/.config/zellij/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
simplified_ui: false
no_pane_frames: true
default_shell: fish

3 changes: 3 additions & 0 deletions zellij/.local/bin/.zellij-fzf.kak.IhGYsO
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
zellij-setup-or-attach (zellij list-sessions | fzf --print-query | tail -
n 1 | tr -dc '[:alnum:]\n\r')
Empty file added zellij/.local/bin/zellij-fzf
Empty file.
13 changes: 13 additions & 0 deletions zellij/.local/bin/zellij-setup-or-attach
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh
if [ ! -z "$1" ]
then
exists=$(zellij list-sessions | egrep -o "^$1$")
if [ ! -z "$exists" ]
then
zellij attach $1 --force
else
zellij -s $1 setup
fi
else
zellij
fi

0 comments on commit 744ac7f

Please sign in to comment.